From 9f10313800d9ed2d8397288b6aa80661691e3c12 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 9 Apr 2020 12:43:22 +0100 Subject: [PATCH] defconfig: Enable I2C_MUX_PINCTRL in all Pi configs To be used to switch between the camera/display pins, and the HAT pins for i2c-0. (arm64/bcmrpi3_defconfig was missing all the I2C mux support, so enable it all) Signed-off-by: Dave Stevenson --- arch/arm/configs/bcm2709_defconfig | 1 + arch/arm/configs/bcm2711_defconfig | 1 + arch/arm/configs/bcmrpi_defconfig | 1 + arch/arm64/configs/bcm2711_defconfig | 1 + arch/arm64/configs/bcmrpi3_defconfig | 4 ++++ 5 files changed, 8 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig index e5168c0359b237..35ee59842466cc 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -655,6 +655,7 @@ CONFIG_I2C_CHARDEV=m CONFIG_I2C_MUX=m CONFIG_I2C_MUX_GPMUX=m CONFIG_I2C_MUX_PCA954x=m +CONFIG_I2C_MUX_PINCTRL=m CONFIG_I2C_BCM2708=m CONFIG_I2C_BCM2835=m CONFIG_I2C_GPIO=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig index 19a8ec28f8a450..27b906723ba66e 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -628,6 +628,7 @@ CONFIG_I2C_CHARDEV=m CONFIG_I2C_MUX=m CONFIG_I2C_MUX_GPMUX=m CONFIG_I2C_MUX_PCA954x=m +CONFIG_I2C_MUX_PINCTRL=m CONFIG_I2C_BCM2708=m CONFIG_I2C_BCM2835=m CONFIG_I2C_GPIO=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig index 543948a9499d71..892840ab9370e5 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -648,6 +648,7 @@ CONFIG_I2C_CHARDEV=m CONFIG_I2C_MUX=m CONFIG_I2C_MUX_GPMUX=m CONFIG_I2C_MUX_PCA954x=m +CONFIG_I2C_MUX_PINCTRL=m CONFIG_I2C_BCM2708=m CONFIG_I2C_BCM2835=m CONFIG_I2C_GPIO=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig index 14398af7f55893..1389bdc5880848 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -662,6 +662,7 @@ CONFIG_I2C_CHARDEV=m CONFIG_I2C_MUX=m CONFIG_I2C_MUX_GPMUX=m CONFIG_I2C_MUX_PCA954x=m +CONFIG_I2C_MUX_PINCTRL=m CONFIG_I2C_BCM2708=m CONFIG_I2C_BCM2835=m CONFIG_I2C_GPIO=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig index 34aa78d5d814d7..3a39acd6d0abe0 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -592,6 +592,10 @@ CONFIG_TCG_TPM=m CONFIG_TCG_TIS_SPI=m CONFIG_I2C=y CONFIG_I2C_CHARDEV=m +CONFIG_I2C_MUX=m +CONFIG_I2C_MUX_GPMUX=m +CONFIG_I2C_MUX_PCA954x=m +CONFIG_I2C_MUX_PINCTRL=m CONFIG_I2C_BCM2708=m CONFIG_I2C_BCM2835=m CONFIG_I2C_GPIO=m