From: Hans de Goede hdegoede@redhat.com
configs: rhel: Fix designware I2C controllers related config settings
Before 6.12 CONFIG_I2C_DESIGNWARE_CORE was not user selectable, instead it was automatically selected by CONFIG_I2C_DESIGNWARE_PLATFORM / CONFIG_I2C_DESIGNWARE_PCI.
Commit 9d1fbf22cff7 ("[redhat] New configs in drivers/i2c") created redhat/configs/rhel/generic/CONFIG_I2C_DESIGNWARE_CORE with "# CONFIG_I2C_DESIGNWARE_CORE is not set" to deal with it now being user selectable.
This is causing the other CONFIG_I2C_DESIGNWARE_* options to be disabled breaking anything connected to any designware I2C controllers, such as touchpads, accelerometers, fuel-gauges, USB Type-C controllers, camera sensors, etc.
This commit changes 2 designware I2C controllers configs to fix things:
1. Change the generic CONFIG_I2C_DESIGNWARE_CORE to 'm' to re-enable CONFIG_I2C_DESIGNWARE_PLATFORM which is 'm' in RHEL.
2. The designware I2C drivers should not be build on s390x, change the existing unsetting of CONFIG_I2C_DESIGNWARE_PLATFORM on s390x to unset CONFIG_I2C_DESIGNWARE_CORE to disable all designware I2C drivers.
Signed-off-by: Hans de Goede hdegoede@redhat.com
diff --git a/redhat/configs/rhel/generic/CONFIG_I2C_DESIGNWARE_CORE b/redhat/configs/rhel/generic/CONFIG_I2C_DESIGNWARE_CORE index blahblah..blahblah 100644 --- a/redhat/configs/rhel/generic/CONFIG_I2C_DESIGNWARE_CORE +++ b/redhat/configs/rhel/generic/CONFIG_I2C_DESIGNWARE_CORE @@ -1 +1 @@ -# CONFIG_I2C_DESIGNWARE_CORE is not set +CONFIG_I2C_DESIGNWARE_CORE=m diff --git a/redhat/configs/rhel/generic/s390x/CONFIG_I2C_DESIGNWARE_CORE b/redhat/configs/rhel/generic/s390x/CONFIG_I2C_DESIGNWARE_CORE new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/rhel/generic/s390x/CONFIG_I2C_DESIGNWARE_CORE @@ -0,0 +1 @@ +# CONFIG_I2C_DESIGNWARE_CORE is not set diff --git a/redhat/configs/rhel/generic/s390x/CONFIG_I2C_DESIGNWARE_PLATFORM b/redhat/configs/rhel/generic/s390x/CONFIG_I2C_DESIGNWARE_PLATFORM deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/s390x/CONFIG_I2C_DESIGNWARE_PLATFORM +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3431
From: Hans de Goede on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3431#note_2146026...
New version dropping the CONFIG_I2C_DESIGNWARE_PCI change pushed. No other changes.
I'll email the Red Hat gfx team about the need for CONFIG_I2C_DESIGNWARE_PCI for NAVI cards. If we need it for that then we probably need it on all archs except s390x, rather then only on x86.
From: Daniel Horak on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3431#note_2146026...
The s390x part is still good.
kernel@lists.fedoraproject.org