ARM: tegra: configs: disable bluez and enable bluedroid_pm

Disable kernel bluez as it is not used in JB MR1
enable bluedroid_pm driver
cleanup defconfigs

Bug 1169531

Change-Id: Ia5b2ea0128fa5bfe320cdcee951f82a1ab210d07
Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com>
Reviewed-on: http://git-master/r/165358
Reviewed-by: Mrutyunjay Sawant <msawant@nvidia.com>
Tested-by: Mrutyunjay Sawant <msawant@nvidia.com>

2 files changed, 4 insertions, 34 deletions

diff --git a/arch/arm/configs/tegra11_android_defconfig b/arch/arm/configs/tegra11_android_defconfig
index 8224af72dbc8..3f026e71a495 100644
--- a/arch/arm/configs/tegra11_android_defconfig
+++ b/arch/arm/configs/tegra11_android_defconfig
@@ -172,27 +172,15 @@ CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=y
 CONFIG_NET_ACT_GACT=y
 CONFIG_NET_ACT_MIRRED=y
-CONFIG_BT=y
-CONFIG_BT_RFCOMM=y
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=y
-CONFIG_BT_HIDP=y
-CONFIG_BT_HCIUART=y
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_BLUESLEEP=y
-CONFIG_BT_WILINK=m
 CONFIG_CFG80211=m
 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
 # CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_AD525X_DPOT=y
 CONFIG_AD525X_DPOT_I2C=y
@@ -201,6 +189,7 @@ CONFIG_SENSORS_NCT1008=y
 CONFIG_UID_STAT=y
 CONFIG_TEGRA_CRYPTO_DEV=y
 CONFIG_MAX1749_VIBRATOR=y
+CONFIG_BLUEDROID_PM=y
 CONFIG_EEPROM_AT24=y
 CONFIG_TI_ST=y
 CONFIG_ST_GPS=m
@@ -292,6 +281,7 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_MAX77663=y
 CONFIG_GPIO_RC5T583=y
 CONFIG_GPIO_PALMAS=y
+CONFIG_POWER_SUPPLY=y
 CONFIG_CHARGER_MAX77665=y
 CONFIG_BATTERY_SBS=y
 CONFIG_BATTERY_BQ27x00=y
@@ -397,7 +387,6 @@ CONFIG_HID_CYPRESS=y
 CONFIG_HID_DRAGONRISE=y
 CONFIG_DRAGONRISE_FF=y
 CONFIG_HID_EMS_FF=y
-CONFIG_HID_ELECOM=y
 CONFIG_HID_EZKEY=y
 CONFIG_HID_HOLTEK=y
 CONFIG_HOLTEK_FF=y
@@ -414,7 +403,6 @@ CONFIG_HID_LOGITECH_DJ=y
 CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
-CONFIG_HID_MAGICMOUSE=y
 CONFIG_HID_MICROSOFT=y
 CONFIG_HID_MONTEREY=y
 CONFIG_HID_MULTITOUCH=y
@@ -443,9 +431,6 @@ CONFIG_HID_TIVO=y
 CONFIG_HID_TOPSEED=y
 CONFIG_HID_THRUSTMASTER=y
 CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=y
-CONFIG_HID_WACOM_POWER_SUPPLY=y
-CONFIG_HID_WIIMOTE=y
 CONFIG_HID_ZEROPLUS=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=y
diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig
index 81b92bf3a21e..0d93abe250e3 100644
--- a/arch/arm/configs/tegra3_android_defconfig
+++ b/arch/arm/configs/tegra3_android_defconfig
@@ -173,22 +173,11 @@ CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=y
 CONFIG_NET_ACT_GACT=y
 CONFIG_NET_ACT_MIRRED=y
-CONFIG_BT=y
-CONFIG_BT_RFCOMM=y
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=y
-CONFIG_BT_HIDP=y
-CONFIG_BT_HCIUART=y
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_BLUESLEEP=y
-CONFIG_BT_WILINK=m
 CONFIG_CFG80211=m
 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
@@ -203,12 +192,12 @@ CONFIG_SENSORS_NCT1008=y
 CONFIG_UID_STAT=y
 CONFIG_TEGRA_CRYPTO_DEV=y
 CONFIG_MAX1749_VIBRATOR=y
+CONFIG_BLUEDROID_PM=y
 CONFIG_EEPROM_AT24=y
 CONFIG_TI_ST=y
 CONFIG_ST_GPS=m
 CONFIG_TEGRA_BB_SUPPORT=y
 CONFIG_TEGRA_BB_POWER=y
-CONFIG_TEGRA_BB_M7400=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
@@ -292,6 +281,7 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_MAX77663=y
 CONFIG_GPIO_RC5T583=y
 CONFIG_GPIO_PALMAS=y
+CONFIG_POWER_SUPPLY=y
 CONFIG_BATTERY_SBS=y
 CONFIG_BATTERY_BQ27x00=y
 CONFIG_CHARGER_TPS8003X=y
@@ -398,7 +388,6 @@ CONFIG_HID_CYPRESS=y
 CONFIG_HID_DRAGONRISE=y
 CONFIG_DRAGONRISE_FF=y
 CONFIG_HID_EMS_FF=y
-CONFIG_HID_ELECOM=y
 CONFIG_HID_EZKEY=y
 CONFIG_HID_HOLTEK=y
 CONFIG_HOLTEK_FF=y
@@ -415,7 +404,6 @@ CONFIG_HID_LOGITECH_DJ=y
 CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
-CONFIG_HID_MAGICMOUSE=y
 CONFIG_HID_MICROSOFT=y
 CONFIG_HID_MONTEREY=y
 CONFIG_HID_MULTITOUCH=y
@@ -444,9 +432,6 @@ CONFIG_HID_TIVO=y
 CONFIG_HID_TOPSEED=y
 CONFIG_HID_THRUSTMASTER=y
 CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=y
-CONFIG_HID_WACOM_POWER_SUPPLY=y
-CONFIG_HID_WIIMOTE=y
 CONFIG_HID_ZEROPLUS=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=y