UBUNTU: [Config] disable I2C hardware drivers for s390x

I2C support is only enabled for s390x because it is required by
DRM. Since it has no hardware support for I2C it does not require
hardware drivers.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 7ef57edfb171220903aaec45307764c75447f3fd..e88935df112a502739a18ea6f23a124ef8b68875 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -197,13 +197,42 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 # CONFIG_HZ_100 is not set
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD8111=m
 CONFIG_I2C_AMD_MP2=y
+CONFIG_I2C_CBUS_GPIO=m
 CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_I2C_EMEV2 is not set
+CONFIG_I2C_GPIO=m
 CONFIG_I2C_HID=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
+CONFIG_I2C_MUX_MLXCPLD=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NVIDIA_GPU=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
 # CONFIG_I2C_SLAVE is not set
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_XILINX=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_IEEE802154=m
 CONFIG_IIO=m

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index f5177bd9e6df7a39ff396a1cefa9729eaab9e07d..ea30539c108768d20b1fd66059f1c8dd593079c2 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -203,14 +203,43 @@ CONFIG_HZ=250
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ_250=y
 CONFIG_I2C=y
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD8111=m
 # CONFIG_I2C_AMD_MP2 is not set
+CONFIG_I2C_CBUS_GPIO=m
 CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_I2C_EMEV2 is not set
+CONFIG_I2C_GPIO=m
 CONFIG_I2C_HID=m
+CONFIG_I2C_I801=m
 CONFIG_I2C_IMX=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
+CONFIG_I2C_MUX_MLXCPLD=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NVIDIA_GPU=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
 CONFIG_I2C_SLAVE=y
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_XILINX=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_IEEE802154=m
 CONFIG_IIO=m

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index e754704a79984b8ccf08c513a4301afde2446a85..5c70cf1e00fd221d8d75518fc1850bf327e80c0d 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -205,14 +205,43 @@ CONFIG_HZ=250
 CONFIG_HZ_250=y
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_CBUS_GPIO=m
 CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_EMEV2=m
+CONFIG_I2C_GPIO=m
 CONFIG_I2C_HID=m
+CONFIG_I2C_I801=m
 CONFIG_I2C_IMX=y
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
+CONFIG_I2C_MUX_MLXCPLD=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NVIDIA_GPU=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_PIIX4=m
 CONFIG_I2C_QUP=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
 CONFIG_I2C_SLAVE=y
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_XILINX=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_IEEE802154=m
 CONFIG_IIO=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index afea697eabd7215ec61807327e272becdfd617cc..24b3842abace302c3892e9a92c449f15c047f461 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3925,12 +3925,7 @@ CONFIG_HYSDN_CAPI=y
 CONFIG_HZ_FIXED=0
 # CONFIG_HZ_PERIODIC is not set
 CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
 CONFIG_I2C_ARB_GPIO_CHALLENGE=m
 CONFIG_I2C_AXXIA=m
 CONFIG_I2C_BCM2048=m
@@ -3939,7 +3934,6 @@ CONFIG_I2C_BCM_IPROC=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_BRCMSTB=m
 # CONFIG_I2C_CADENCE is not set
-CONFIG_I2C_CBUS_GPIO=m
 CONFIG_I2C_CHT_WC=m
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_TUNNEL=m
@@ -3948,20 +3942,17 @@ CONFIG_I2C_CROS_EC_TUNNEL=m
 # CONFIG_I2C_DEBUG_CORE is not set
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_DESIGNWARE_CORE=y
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DIOLAN_U2C=m
 CONFIG_I2C_DLN2=m
 CONFIG_I2C_EG20T=m
 CONFIG_I2C_EXYNOS5=m
 CONFIG_I2C_FSI=m
-CONFIG_I2C_GPIO=m
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_HIX5HD2=m
-CONFIG_I2C_I801=m
 CONFIG_I2C_IMX_LPI2C=m
-CONFIG_I2C_ISCH=m
 CONFIG_I2C_ISMT=m
 CONFIG_I2C_KEMPLD=m
 CONFIG_I2C_MESON=m
@@ -3970,28 +3961,16 @@ CONFIG_I2C_MPC=m
 CONFIG_I2C_MT65XX=m
 CONFIG_I2C_MULTI_INSTANTIATE=m
 CONFIG_I2C_MUX=m
-CONFIG_I2C_MUX_GPIO=m
 CONFIG_I2C_MUX_GPMUX=m
-CONFIG_I2C_MUX_LTC4306=m
-CONFIG_I2C_MUX_MLXCPLD=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_MV64XXX=m
-CONFIG_I2C_NFORCE2=m
 CONFIG_I2C_NFORCE2_S4985=m
 CONFIG_I2C_NOMADIK=m
-CONFIG_I2C_NVIDIA_GPU=m
-CONFIG_I2C_OCORES=m
 CONFIG_I2C_OMAP=y
 CONFIG_I2C_OPAL=y
 CONFIG_I2C_OWL=m
 CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
 CONFIG_I2C_PCA_ISA=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_PIIX4=m
 CONFIG_I2C_PXA=m
 CONFIG_I2C_PXA_SLAVE=y
 CONFIG_I2C_QCOM_CCI=m
@@ -4005,16 +3984,11 @@ CONFIG_I2C_SCMI=m
 CONFIG_I2C_SH_MOBILE=m
 CONFIG_I2C_SI470X=m
 CONFIG_I2C_SI4713=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
 CONFIG_I2C_SLAVE_EEPROM=m
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_SPRD=y
 CONFIG_I2C_STUB=m
 CONFIG_I2C_SYNQUACER=m
-CONFIG_I2C_TAOS_EVM=m
 CONFIG_I2C_TEGRA=m
 CONFIG_I2C_TEGRA_BPMP=m
 CONFIG_I2C_THUNDERX=m
@@ -4022,11 +3996,8 @@ CONFIG_I2C_TINY_USB=m
 # CONFIG_I2C_UNIPHIER is not set
 # CONFIG_I2C_UNIPHIER_F is not set
 CONFIG_I2C_VERSATILE=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
 CONFIG_I2C_VIPERBOARD=m
 CONFIG_I2C_XGENE_SLIMPRO=m
-CONFIG_I2C_XILINX=m
 CONFIG_I2C_XLP9XX=m
 CONFIG_I3C=m
 CONFIG_I40E=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 02c8986c29292aea4ba57e2fefcd0ddd47db27a9..d6208ece124e85fddc82c474730d476f6ad21c77 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -194,13 +194,42 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 # CONFIG_HZ_100 is not set
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD8111=m
 CONFIG_I2C_AMD_MP2=y
+CONFIG_I2C_CBUS_GPIO=m
 CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_I2C_EMEV2 is not set
+CONFIG_I2C_GPIO=m
 CONFIG_I2C_HID=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
+CONFIG_I2C_MUX_MLXCPLD=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NVIDIA_GPU=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
 # CONFIG_I2C_SLAVE is not set
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_XILINX=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_IEEE802154=m
 CONFIG_IIO=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 2086d0bcbb39809d57bbf9cf769df99560709a7e..92d427842e2fb02b65afb9edcc4fc204707e71bd 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -198,11 +198,40 @@ CONFIG_HZ=250
 CONFIG_HZ_250=y
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_CBUS_GPIO=m
 CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
+CONFIG_I2C_GPIO=m
 CONFIG_I2C_HID=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
+CONFIG_I2C_MUX_MLXCPLD=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NVIDIA_GPU=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
 # CONFIG_I2C_SLAVE is not set
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_XILINX=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_IEEE802154=m
 CONFIG_IIO=m

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index c9f966f44be1e5d9534b5ea28388f18d6ea64663..1e370239db327596c8a74346c4a1f61cd4bda6e8 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -184,11 +184,40 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
 CONFIG_I2C=m
 CONFIG_I2C_ALGOBIT=m
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_CBUS_GPIO is not set
 CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_GPIO is not set
 # CONFIG_I2C_HID is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_MUX_GPIO is not set
+# CONFIG_I2C_MUX_LTC4306 is not set
+# CONFIG_I2C_MUX_MLXCPLD is not set
+# CONFIG_I2C_MUX_PCA9541 is not set
+# CONFIG_I2C_MUX_PCA954x is not set
+# CONFIG_I2C_MUX_REG is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_NVIDIA_GPU is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_SLAVE is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_XILINX is not set
 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_IEEE802154 is not set
 # CONFIG_IIO is not set