Skip to content

Commit fa34893

Browse files
committed
Merge tag 'qcom-arm64-defconfig-for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/defconfigs
Qualcomm ARM64 defconfig updates for v5.16 The major change here is the disabling of the firmware loades user space fallback, this is done as arm64 is the only platform with this flag enabled and as a result doesn't play nice with standard distributions. It then enables the new limits driver, which controls the hardware based thermal mitigation on a range of Qualcomm platforms. The prima/pronto WiFi and Bluetooth drivers are enabled to ensure these features works out of the box, now that the last details in the dts are landed. The new driver for acquiring sleep stats is enabled to facilitate the various efforts on getting these platforms into low power mode. Lastly the base SC7280 drivers needed to simply boot this platform are enabled. * tag 'qcom-arm64-defconfig-for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: defconfig: Enable Qualcomm LMH driver arm64: defconfig: Enable Qualcomm prima/pronto drivers arm64: defconfig: Enable Sleep stats driver arm64: defconfig: Enable QTI SC7280 pinctrl, gcc and interconnect arm64: defconfig: Disable firmware sysfs fallback Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 6fc04ea + 2da5212 commit fa34893

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

arch/arm64/configs/defconfig

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ CONFIG_BT_HCIUART=m
198198
CONFIG_BT_HCIUART_LL=y
199199
CONFIG_BT_HCIUART_BCM=y
200200
CONFIG_BT_HCIUART_QCA=y
201+
CONFIG_BT_QCOMSMD=m
201202
CONFIG_CFG80211=m
202203
CONFIG_MAC80211=m
203204
CONFIG_MAC80211_LEDS=y
@@ -241,7 +242,6 @@ CONFIG_PCI_EPF_TEST=m
241242
CONFIG_DEVTMPFS=y
242243
CONFIG_DEVTMPFS_MOUNT=y
243244
CONFIG_FW_LOADER_USER_HELPER=y
244-
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
245245
CONFIG_HISILICON_LPC=y
246246
CONFIG_SIMPLE_PM_BUS=y
247247
CONFIG_FSL_MC_BUS=y
@@ -379,6 +379,7 @@ CONFIG_USB_NET_MCS7830=m
379379
CONFIG_ATH10K=m
380380
CONFIG_ATH10K_PCI=m
381381
CONFIG_ATH10K_SNOC=m
382+
CONFIG_WCN36XX=m
382383
CONFIG_BRCMFMAC=m
383384
CONFIG_MWIFIEX=m
384385
CONFIG_MWIFIEX_PCIE=m
@@ -515,6 +516,7 @@ CONFIG_PINCTRL_QCS404=y
515516
CONFIG_PINCTRL_QDF2XXX=y
516517
CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
517518
CONFIG_PINCTRL_SC7180=y
519+
CONFIG_PINCTRL_SC7280=y
518520
CONFIG_PINCTRL_SDM845=y
519521
CONFIG_PINCTRL_SM8150=y
520522
CONFIG_PINCTRL_SM8250=y
@@ -579,6 +581,7 @@ CONFIG_TEGRA_BPMP_THERMAL=m
579581
CONFIG_TEGRA_SOCTHERM=m
580582
CONFIG_QCOM_TSENS=y
581583
CONFIG_QCOM_SPMI_TEMP_ALARM=m
584+
CONFIG_QCOM_LMH=m
582585
CONFIG_UNIPHIER_THERMAL=y
583586
CONFIG_WATCHDOG=y
584587
CONFIG_SL28CPLD_WATCHDOG=m
@@ -991,6 +994,7 @@ CONFIG_MSM_MMCC_8996=y
991994
CONFIG_MSM_GCC_8998=y
992995
CONFIG_QCS_GCC_404=y
993996
CONFIG_SC_GCC_7180=y
997+
CONFIG_SC_GCC_7280=y
994998
CONFIG_SDM_CAMCC_845=m
995999
CONFIG_SDM_GCC_845=y
9961000
CONFIG_SDM_GPUCC_845=y
@@ -1023,6 +1027,8 @@ CONFIG_REMOTEPROC=y
10231027
CONFIG_QCOM_Q6V5_MSS=m
10241028
CONFIG_QCOM_Q6V5_PAS=m
10251029
CONFIG_QCOM_SYSMON=m
1030+
CONFIG_QCOM_WCNSS_PIL=m
1031+
CONFIG_RPMSG_CHAR=m
10261032
CONFIG_RPMSG_QCOM_GLINK_RPM=y
10271033
CONFIG_RPMSG_QCOM_GLINK_SMEM=m
10281034
CONFIG_RPMSG_QCOM_SMD=y
@@ -1046,6 +1052,8 @@ CONFIG_QCOM_SMD_RPM=y
10461052
CONFIG_QCOM_SMP2P=y
10471053
CONFIG_QCOM_SMSM=y
10481054
CONFIG_QCOM_SOCINFO=m
1055+
CONFIG_QCOM_WCNSS_CTRL=m
1056+
CONFIG_QCOM_STATS=m
10491057
CONFIG_QCOM_APR=m
10501058
CONFIG_ARCH_R8A774A1=y
10511059
CONFIG_ARCH_R8A774B1=y
@@ -1170,6 +1178,7 @@ CONFIG_INTERCONNECT_IMX8MQ=m
11701178
CONFIG_INTERCONNECT_QCOM=y
11711179
CONFIG_INTERCONNECT_QCOM_MSM8916=m
11721180
CONFIG_INTERCONNECT_QCOM_OSM_L3=m
1181+
CONFIG_INTERCONNECT_QCOM_SC7280=y
11731182
CONFIG_INTERCONNECT_QCOM_SDM845=y
11741183
CONFIG_INTERCONNECT_QCOM_SM8150=m
11751184
CONFIG_INTERCONNECT_QCOM_SM8250=m

0 commit comments

Comments
 (0)