Skip to content

Commit 241a3be

Browse files
committed
Merge tag 'arm-soc/for-6.17/defconfig-arm64' of https://github.com/Broadcom/stblinux into soc/defconfig
This pull request contains ARM64 defconfig updates for 6.17, please pull the following: - Andrea updates the defconfig to enable the RP1 misc, clock and gpio drivers as as well as turn on CONFIG_OF_OVERLAY which is necessary to apply the RP1 overlay file * tag 'arm-soc/for-6.17/defconfig-arm64' of https://github.com/Broadcom/stblinux: arm64: defconfig: Enable OF_OVERLAY option arm64: defconfig: Enable RP1 misc/clock/gpio drivers Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 06d6ebf + 44bba86 commit 241a3be

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -622,6 +622,7 @@ CONFIG_PINCTRL_QCS615=y
622622
CONFIG_PINCTRL_QCS8300=y
623623
CONFIG_PINCTRL_QDF2XXX=y
624624
CONFIG_PINCTRL_QDU1000=y
625+
CONFIG_PINCTRL_RP1=m
625626
CONFIG_PINCTRL_SA8775P=y
626627
CONFIG_PINCTRL_SC7180=y
627628
CONFIG_PINCTRL_SC7280=y
@@ -707,6 +708,7 @@ CONFIG_SENSORS_SL28CPLD=m
707708
CONFIG_SENSORS_INA2XX=m
708709
CONFIG_SENSORS_INA3221=m
709710
CONFIG_SENSORS_TMP102=m
711+
CONFIG_MISC_RP1=m
710712
CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
711713
CONFIG_CPU_THERMAL=y
712714
CONFIG_DEVFREQ_THERMAL=y
@@ -1317,6 +1319,7 @@ CONFIG_COMMON_CLK_CS2000_CP=y
13171319
CONFIG_COMMON_CLK_FSL_SAI=y
13181320
CONFIG_COMMON_CLK_S2MPS11=y
13191321
CONFIG_COMMON_CLK_PWM=y
1322+
CONFIG_COMMON_CLK_RP1=m
13201323
CONFIG_COMMON_CLK_RS9_PCIE=y
13211324
CONFIG_COMMON_CLK_VC3=y
13221325
CONFIG_COMMON_CLK_VC5=y
@@ -1663,6 +1666,7 @@ CONFIG_FPGA_BRIDGE=m
16631666
CONFIG_ALTERA_FREEZE_BRIDGE=m
16641667
CONFIG_FPGA_REGION=m
16651668
CONFIG_OF_FPGA_REGION=m
1669+
CONFIG_OF_OVERLAY=y
16661670
CONFIG_TEE=y
16671671
CONFIG_OPTEE=y
16681672
CONFIG_MUX_GPIO=m

0 commit comments

Comments
 (0)