arch: arm: HTC: Update defconfigs

Regenerate HTC defconfigs after prima driver update and move t6 to CONFIG_PRIMA_WLAN. Change-Id: Ib004368eb1bbd2a2fafc72aac94327da3d03c6ce
CyanogenMod · Apr 25, 2016 · d4a3b35 · d4a3b35
1 parent 8376286
commit d4a3b35
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 41 deletions.
diff --git a/arch/arm/configs/elite_defconfig b/arch/arm/configs/elite_defconfig
@@ -1457,6 +1457,7 @@ CONFIG_WCNSS_CORE=y
 # CONFIG_WCNSS_MEM_PRE_ALLOC is not set
 # CONFIG_ATH_COMMON is not set
 # CONFIG_BCMDHD is not set
+# CONFIG_BCMDHD_4335_MCC is not set
 # CONFIG_BRCMFMAC is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_IWM is not set
@@ -1639,6 +1640,7 @@ CONFIG_INPUT_GPIO=y
 CONFIG_SENSORS_AKM8975=y
 # CONFIG_SENSORS_PANASONIC_GYRO is not set
 CONFIG_SENSORS_BMA250=y
+# CONFIG_SENSORS_ONLY_BMA250 is not set
 # CONFIG_SENSORS_BMA250_BOSCH is not set
 CONFIG_INPUT_CAPELLA_CM3629=y
 CONFIG_SENSORS_R3GD20=y
@@ -3050,11 +3052,6 @@ CONFIG_PRIMA_WLAN_OKC=y
 # CONFIG_QCOM_VOWIFI_11R is not set
 # CONFIG_QCOM_TDLS is not set
 
-#
-# Qualcomm Atheros Prima WLAN module
-#
-# CONFIG_PRIMA_WLAN_3x is not set
-
 #
 # Qualcomm MSM specific device drivers
 #

diff --git a/arch/arm/configs/fighter_defconfig b/arch/arm/configs/fighter_defconfig
@@ -1458,6 +1458,7 @@ CONFIG_WCNSS_CORE=y
 # CONFIG_WCNSS_MEM_PRE_ALLOC is not set
 # CONFIG_ATH_COMMON is not set
 # CONFIG_BCMDHD is not set
+# CONFIG_BCMDHD_4335_MCC is not set
 # CONFIG_BRCMFMAC is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_IWM is not set
@@ -1640,6 +1641,7 @@ CONFIG_INPUT_GPIO=y
 CONFIG_SENSORS_AKM8975=y
 # CONFIG_SENSORS_PANASONIC_GYRO is not set
 CONFIG_SENSORS_BMA250=y
+# CONFIG_SENSORS_ONLY_BMA250 is not set
 # CONFIG_SENSORS_BMA250_BOSCH is not set
 CONFIG_INPUT_CAPELLA_CM3629=y
 # CONFIG_SENSORS_R3GD20 is not set
@@ -3025,11 +3027,6 @@ CONFIG_PRIMA_WLAN_OKC=y
 # CONFIG_QCOM_VOWIFI_11R is not set
 # CONFIG_QCOM_TDLS is not set
 
-#
-# Qualcomm Atheros Prima WLAN module
-#
-# CONFIG_PRIMA_WLAN_3x is not set
-
 #
 # Qualcomm MSM specific device drivers
 #

diff --git a/arch/arm/configs/jet_defconfig b/arch/arm/configs/jet_defconfig
@@ -1457,6 +1457,7 @@ CONFIG_WCNSS_CORE=y
 # CONFIG_WCNSS_MEM_PRE_ALLOC is not set
 # CONFIG_ATH_COMMON is not set
 # CONFIG_BCMDHD is not set
+# CONFIG_BCMDHD_4335_MCC is not set
 # CONFIG_BRCMFMAC is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_IWM is not set
@@ -1639,6 +1640,7 @@ CONFIG_INPUT_GPIO=y
 CONFIG_SENSORS_AKM8975=y
 # CONFIG_SENSORS_PANASONIC_GYRO is not set
 CONFIG_SENSORS_BMA250=y
+# CONFIG_SENSORS_ONLY_BMA250 is not set
 # CONFIG_SENSORS_BMA250_BOSCH is not set
 CONFIG_INPUT_CAPELLA_CM3629=y
 CONFIG_SENSORS_R3GD20=y
@@ -3053,11 +3055,6 @@ CONFIG_PRIMA_WLAN_OKC=y
 # CONFIG_QCOM_VOWIFI_11R is not set
 # CONFIG_QCOM_TDLS is not set
 
-#
-# Qualcomm Atheros Prima WLAN module
-#
-# CONFIG_PRIMA_WLAN_3x is not set
-
 #
 # Qualcomm MSM specific device drivers
 #

diff --git a/arch/arm/configs/m4_defconfig b/arch/arm/configs/m4_defconfig
@@ -1483,6 +1483,7 @@ CONFIG_BCMDHD_FW_PATH="/system/etc/firmware/fw_bcm4334.bin"
 CONFIG_BCMDHD_NVRAM_PATH="/system/etc/calibration.gpio4"
 # CONFIG_DHD_USE_STATIC_BUF is not set
 # CONFIG_DHD_USE_SCHED_SCAN is not set
+# CONFIG_BCMDHD_4335_MCC is not set
 # CONFIG_BRCMFMAC is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_IWM is not set
@@ -1667,6 +1668,7 @@ CONFIG_INPUT_GPIO=y
 # CONFIG_SENSORS_AKM8975 is not set
 # CONFIG_SENSORS_PANASONIC_GYRO is not set
 # CONFIG_SENSORS_BMA250 is not set
+# CONFIG_SENSORS_ONLY_BMA250 is not set
 # CONFIG_SENSORS_BMA250_BOSCH is not set
 CONFIG_INPUT_CAPELLA_CM3629=y
 CONFIG_SENSORS_R3GD20=y
@@ -3129,11 +3131,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 #
 # CONFIG_PRIMA_WLAN is not set
 
-#
-# Qualcomm Atheros Prima WLAN module
-#
-# CONFIG_PRIMA_WLAN_3x is not set
-
 #
 # Qualcomm MSM specific device drivers
 #

diff --git a/arch/arm/configs/m7_defconfig b/arch/arm/configs/m7_defconfig
@@ -1702,6 +1702,7 @@ CONFIG_SENSORS_AKM8963_NST=y
 # CONFIG_SENSORS_AKM8975 is not set
 # CONFIG_SENSORS_PANASONIC_GYRO is not set
 # CONFIG_SENSORS_BMA250 is not set
+# CONFIG_SENSORS_ONLY_BMA250 is not set
 CONFIG_SENSORS_BMA250_BOSCH=y
 CONFIG_SIG_MOTION=y
 CONFIG_INPUT_CAPELLA_CM3629=y
@@ -3171,11 +3172,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 #
 # CONFIG_PRIMA_WLAN is not set
 
-#
-# Qualcomm Atheros Prima WLAN module
-#
-# CONFIG_PRIMA_WLAN_3x is not set
-
 #
 # Qualcomm MSM specific device drivers
 #

diff --git a/arch/arm/configs/t6_defconfig b/arch/arm/configs/t6_defconfig
@@ -1520,6 +1520,7 @@ CONFIG_WCNSS_CORE=y
 # CONFIG_WCNSS_MEM_PRE_ALLOC is not set
 # CONFIG_ATH_COMMON is not set
 # CONFIG_BCMDHD is not set
+# CONFIG_BCMDHD_4335_MCC is not set
 # CONFIG_BRCMFMAC is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_IWM is not set
@@ -1703,6 +1704,7 @@ CONFIG_SENSORS_AKM8963_NST=y
 # CONFIG_SENSORS_AKM8975 is not set
 # CONFIG_SENSORS_PANASONIC_GYRO is not set
 # CONFIG_SENSORS_BMA250 is not set
+# CONFIG_SENSORS_ONLY_BMA250 is not set
 CONFIG_SENSORS_BMA250_BOSCH=y
 CONFIG_SIG_MOTION=y
 CONFIG_INPUT_CAPELLA_CM3629=y
@@ -1862,8 +1864,6 @@ CONFIG_I2C_QUP=y
 CONFIG_SPI=y
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_MASTER=y
-CONFIG_FPR_SPI=y
-CONFIG_FPR_SPI_DMA_GSBI1=y
 
 #
 # SPI Master Controller Drivers
@@ -3172,20 +3172,13 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 #
 # Qualcomm Atheros Prima WLAN module
 #
-# CONFIG_PRIMA_WLAN is not set
+CONFIG_PRIMA_WLAN=y
 # CONFIG_PRIMA_WLAN_BTAMP is not set
 CONFIG_PRIMA_WLAN_LFR=y
 CONFIG_PRIMA_WLAN_OKC=y
 CONFIG_PRIMA_WLAN_11AC_HIGH_TP=y
 CONFIG_QCOM_VOWIFI_11R=y
-
-#
-# Qualcomm Atheros Prima WLAN module
-#
-CONFIG_PRIMA_WLAN_3x=y
-# CONFIG_PRONTO_WLAN is not set
-# CONFIG_WLAN_FEATURE_11W is not set
-# CONFIG_CONFIG_ENABLE_LINUX_REG is not set
+CONFIG_QCOM_TDLS=y
 
 #
 # Qualcomm MSM specific device drivers

diff --git a/arch/arm/configs/ville_defconfig b/arch/arm/configs/ville_defconfig
@@ -1457,6 +1457,7 @@ CONFIG_WCNSS_CORE=y
 # CONFIG_WCNSS_MEM_PRE_ALLOC is not set
 # CONFIG_ATH_COMMON is not set
 # CONFIG_BCMDHD is not set
+# CONFIG_BCMDHD_4335_MCC is not set
 # CONFIG_BRCMFMAC is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_IWM is not set
@@ -1638,6 +1639,7 @@ CONFIG_INPUT_GPIO=y
 CONFIG_SENSORS_AKM8975=y
 CONFIG_SENSORS_PANASONIC_GYRO=y
 CONFIG_SENSORS_BMA250=y
+# CONFIG_SENSORS_ONLY_BMA250 is not set
 # CONFIG_SENSORS_BMA250_BOSCH is not set
 CONFIG_INPUT_CAPELLA_CM3629=y
 # CONFIG_SENSORS_R3GD20 is not set
@@ -3029,11 +3031,6 @@ CONFIG_PRIMA_WLAN_OKC=y
 # CONFIG_QCOM_VOWIFI_11R is not set
 # CONFIG_QCOM_TDLS is not set
 
-#
-# Qualcomm Atheros Prima WLAN module
-#
-# CONFIG_PRIMA_WLAN_3x is not set
-
 #
 # Qualcomm MSM specific device drivers
 #