diff options
author | Arnd Bergmann <arnd@arndb.de> | 2025-01-24 15:08:51 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2025-01-24 15:08:51 +0300 |
commit | 309f64469cd5d09d5f1207e57d42f2eff9bd9311 (patch) | |
tree | a03536104732233d685742c5f83d46891ed181e2 | |
parent | fa8592f24944faf552c9a553ed64a3d5fe4e2cd9 (diff) | |
parent | 6e59bcd1e088901fe3441b2f3cfe887cdf544a4c (diff) | |
download | linux-309f64469cd5d09d5f1207e57d42f2eff9bd9311.tar.xz |
Merge tag 'arm-soc/for-6.14/defconfig-arm64' of https://github.com/Broadcom/stblinux into soc/defconfig
This pull request contains Broadcom ARM64-based SoCs defconfig updates
for 6.14, please pull the following:
- Stefan enables the pinctrl-based I2C mux driver which is used on
Raspberry Pi 4 based systems since we switched the Device Tree files
to use the i2c mux representation
* tag 'arm-soc/for-6.14/defconfig-arm64' of https://github.com/Broadcom/stblinux:
arm64: defconfig: Enable pinctrl-based I2C mux
Link: https://lore.kernel.org/r/20250123203302.1491843-1-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index ffdd405d0fcf..8f956e907160 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -521,6 +521,7 @@ CONFIG_TCG_TIS_I2C_INFINEON=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y +CONFIG_I2C_MUX_PINCTRL=m CONFIG_I2C_BCM2835=m CONFIG_I2C_CADENCE=m CONFIG_I2C_DESIGNWARE_CORE=y |