diff options
| author | Nagarjuna Kristam <nkristam@nvidia.com> | 2012-06-04 10:00:53 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-06-20 14:30:50 -0700 |
| commit | afdea81a3395e0e7a85b0711d2a612f14d52d333 (patch) | |
| tree | c2cc12fefc3b6113d53b303e0b8b987fbae9e4f9 /arch/arm/configs | |
| parent | aaf1ed5147b77710129ed3021dc2912360dc29ef (diff) | |
arm: tegra: use rfkill-gpio driver to register bluetooth rfkill
rfkill-gpio driver is available in linux delivery as a generic rfkill driver.
use rfkill-gpio driver to perform bluetooth RFKILL gpio activities, instead of
bcm4329 rfkill driver.
Bug 993990
Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com>
Change-Id: I654b93f099431029177913605d15ad921df07833
Reviewed-on: http://git-master/r/108499
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/tegra3_android_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm/configs/tegra_android_defconfig | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig index 809542ded05f..a2b7cc13ee85 100644 --- a/arch/arm/configs/tegra3_android_defconfig +++ b/arch/arm/configs/tegra3_android_defconfig @@ -180,6 +180,7 @@ CONFIG_NL80211_TESTMODE=y CONFIG_LIB80211=m CONFIG_MAC80211=m CONFIG_RFKILL=y +CONFIG_RFKILL_GPIO=y CONFIG_CAIF=y CONFIG_NFC=y CONFIG_PN544_NFC=y @@ -191,7 +192,7 @@ CONFIG_AD525X_DPOT_I2C=y CONFIG_APDS9802ALS=y CONFIG_SENSORS_NCT1008=y CONFIG_UID_STAT=y -CONFIG_BCM4329_RFKILL=y +# CONFIG_BCM4329_RFKILL is not set CONFIG_TEGRA_CRYPTO_DEV=y CONFIG_MAX1749_VIBRATOR=y CONFIG_EEPROM_AT24=y diff --git a/arch/arm/configs/tegra_android_defconfig b/arch/arm/configs/tegra_android_defconfig index 3d1780ca2c4e..eb6abec87b70 100644 --- a/arch/arm/configs/tegra_android_defconfig +++ b/arch/arm/configs/tegra_android_defconfig @@ -170,6 +170,7 @@ CONFIG_BT_HCIUART_LL=y CONFIG_BT_BLUESLEEP=y CONFIG_CFG80211=y CONFIG_RFKILL=y +CONFIG_RFKILL_GPIO=y # CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_BLK_DEV_LOOP=y CONFIG_MISC_DEVICES=y @@ -178,7 +179,7 @@ CONFIG_AD525X_DPOT_I2C=y CONFIG_APDS9802ALS=y CONFIG_SENSORS_NCT1008=y CONFIG_UID_STAT=y -CONFIG_BCM4329_RFKILL=y +# CONFIG_BCM4329_RFKILL is not set CONFIG_TEGRA_CRYPTO_DEV=y CONFIG_MAX1749_VIBRATOR=y CONFIG_MPU_SENSORS_TIMERIRQ=y |