Skip to content

Commit

Permalink
Merge tag 'arm-soc/for-6.14/defconfig-arm64' of https://github.com/Br…
Browse files Browse the repository at this point in the history
…oadcom/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>
  • Loading branch information
Arnd Bergmann committed Jan 24, 2025
2 parents fa8592f + 6e59bcd commit 309f644
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm64/configs/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 309f644

Please sign in to comment.