From: Greg Kroah-Hartman Date: Mon, 28 May 2018 08:23:52 +0000 (+0200) Subject: drop i2c-core-report-of-style-module-alias-for-devices-registered-via-of.patch from... X-Git-Tag: v3.18.111~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a57e8ed39c9c34924abc26154c6ad0bc87fa713;p=thirdparty%2Fkernel%2Fstable-queue.git drop i2c-core-report-of-style-module-alias-for-devices-registered-via-of.patch from 4.14 and 4.16 queues --- diff --git a/queue-4.14/i2c-core-report-of-style-module-alias-for-devices-registered-via-of.patch b/queue-4.14/i2c-core-report-of-style-module-alias-for-devices-registered-via-of.patch deleted file mode 100644 index a059ad00be3..00000000000 --- a/queue-4.14/i2c-core-report-of-style-module-alias-for-devices-registered-via-of.patch +++ /dev/null @@ -1,71 +0,0 @@ -From foo@baz Sun May 27 16:52:54 CEST 2018 -From: Javier Martinez Canillas -Date: Sun, 3 Dec 2017 22:40:50 +0100 -Subject: i2c: core: report OF style module alias for devices registered via OF - -From: Javier Martinez Canillas - -[ Upstream commit af503716ac1444db61d80cb6d17cfe62929c21df ] - -The buses should honor the firmware interface used to register the device, -but the I2C core reports a MODALIAS of the form i2c: even for I2C -devices registered via OF. - -This means that user-space will never get an OF stype uevent MODALIAS even -when the drivers modules contain aliases exported from both the I2C and OF -device ID tables. For example, an Atmel maXTouch Touchscreen registered by -a DT node with compatible "atmel,maxtouch" has the following module alias: - -$ cat /sys/class/i2c-adapter/i2c-8/8-004b/modalias -i2c:maxtouch - -So udev won't be able to auto-load a module for an OF-only device driver. -Many OF-only drivers duplicate the OF device ID table entries in an I2C ID -table only has a workaround for how the I2C core reports the module alias. - -This patch changes the I2C core to report an OF related MODALIAS uevent if -the device was registered via OF. So for the previous example, after this -patch, the reported MODALIAS for the Atmel maXTouch will be the following: - -$ cat /sys/class/i2c-adapter/i2c-8/8-004b/modalias -of:NtrackpadTCatmel,maxtouch - -NOTE: This patch may break out-of-tree drivers that were relying on this - behavior, and only had an I2C device ID table even when the device - was registered via OF. There are no remaining drivers in mainline - that do this, but out-of-tree drivers have to be fixed and define - a proper OF device ID table to have module auto-loading working. - -Signed-off-by: Javier Martinez Canillas -Tested-by: Dmitry Mastykin -Signed-off-by: Wolfram Sang -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/i2c/i2c-core-base.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/drivers/i2c/i2c-core-base.c -+++ b/drivers/i2c/i2c-core-base.c -@@ -123,6 +123,10 @@ static int i2c_device_uevent(struct devi - struct i2c_client *client = to_i2c_client(dev); - int rc; - -+ rc = of_device_uevent_modalias(dev, env); -+ if (rc != -ENODEV) -+ return rc; -+ - rc = acpi_device_uevent_modalias(dev, env); - if (rc != -ENODEV) - return rc; -@@ -472,6 +476,10 @@ show_modalias(struct device *dev, struct - struct i2c_client *client = to_i2c_client(dev); - int len; - -+ len = of_device_modalias(dev, buf, PAGE_SIZE); -+ if (len != -ENODEV) -+ return len; -+ - len = acpi_device_modalias(dev, buf, PAGE_SIZE -1); - if (len != -ENODEV) - return len; diff --git a/queue-4.14/series b/queue-4.14/series index 1e3b41aae3d..7990188e89f 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -444,7 +444,6 @@ drm-bridge-sii902x-retry-status-read-after-ddi-i2c.patch tools-hv-fix-compiler-warnings-about-major-target_fname.patch block-null_blk-fix-invalid-parameters-when-loading-module.patch dmaengine-pl330-fix-a-race-condition-in-case-of-threaded-irqs.patch -i2c-core-report-of-style-module-alias-for-devices-registered-via-of.patch dmaengine-rcar-dmac-check-the-done-lists-in-rcar_dmac_chan_get_residue.patch enic-enable-rq-before-updating-rq-descriptors.patch watchdog-asm9260_wdt-fix-error-handling-in-asm9260_wdt_probe.patch diff --git a/queue-4.16/i2c-core-report-of-style-module-alias-for-devices-registered-via-of.patch b/queue-4.16/i2c-core-report-of-style-module-alias-for-devices-registered-via-of.patch deleted file mode 100644 index 47a0777e6d4..00000000000 --- a/queue-4.16/i2c-core-report-of-style-module-alias-for-devices-registered-via-of.patch +++ /dev/null @@ -1,71 +0,0 @@ -From foo@baz Sun May 27 16:10:03 CEST 2018 -From: Javier Martinez Canillas -Date: Sun, 3 Dec 2017 22:40:50 +0100 -Subject: i2c: core: report OF style module alias for devices registered via OF - -From: Javier Martinez Canillas - -[ Upstream commit af503716ac1444db61d80cb6d17cfe62929c21df ] - -The buses should honor the firmware interface used to register the device, -but the I2C core reports a MODALIAS of the form i2c: even for I2C -devices registered via OF. - -This means that user-space will never get an OF stype uevent MODALIAS even -when the drivers modules contain aliases exported from both the I2C and OF -device ID tables. For example, an Atmel maXTouch Touchscreen registered by -a DT node with compatible "atmel,maxtouch" has the following module alias: - -$ cat /sys/class/i2c-adapter/i2c-8/8-004b/modalias -i2c:maxtouch - -So udev won't be able to auto-load a module for an OF-only device driver. -Many OF-only drivers duplicate the OF device ID table entries in an I2C ID -table only has a workaround for how the I2C core reports the module alias. - -This patch changes the I2C core to report an OF related MODALIAS uevent if -the device was registered via OF. So for the previous example, after this -patch, the reported MODALIAS for the Atmel maXTouch will be the following: - -$ cat /sys/class/i2c-adapter/i2c-8/8-004b/modalias -of:NtrackpadTCatmel,maxtouch - -NOTE: This patch may break out-of-tree drivers that were relying on this - behavior, and only had an I2C device ID table even when the device - was registered via OF. There are no remaining drivers in mainline - that do this, but out-of-tree drivers have to be fixed and define - a proper OF device ID table to have module auto-loading working. - -Signed-off-by: Javier Martinez Canillas -Tested-by: Dmitry Mastykin -Signed-off-by: Wolfram Sang -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/i2c/i2c-core-base.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/drivers/i2c/i2c-core-base.c -+++ b/drivers/i2c/i2c-core-base.c -@@ -124,6 +124,10 @@ static int i2c_device_uevent(struct devi - struct i2c_client *client = to_i2c_client(dev); - int rc; - -+ rc = of_device_uevent_modalias(dev, env); -+ if (rc != -ENODEV) -+ return rc; -+ - rc = acpi_device_uevent_modalias(dev, env); - if (rc != -ENODEV) - return rc; -@@ -439,6 +443,10 @@ show_modalias(struct device *dev, struct - struct i2c_client *client = to_i2c_client(dev); - int len; - -+ len = of_device_modalias(dev, buf, PAGE_SIZE); -+ if (len != -ENODEV) -+ return len; -+ - len = acpi_device_modalias(dev, buf, PAGE_SIZE -1); - if (len != -ENODEV) - return len; diff --git a/queue-4.16/series b/queue-4.16/series index d1d0ffadf9c..a326b464bdd 100644 --- a/queue-4.16/series +++ b/queue-4.16/series @@ -210,7 +210,6 @@ powerpc-mm-slice-remove-intermediate-bitmap-copy.patch powerpc-mm-slice-create-header-files-dedicated-to-slices.patch powerpc-mm-slice-enhance-for-supporting-ppc32.patch powerpc-mm-slice-fix-hugepage-allocation-at-hint-address-on-8xx.patch -i2c-core-report-of-style-module-alias-for-devices-registered-via-of.patch dmaengine-rcar-dmac-check-the-done-lists-in-rcar_dmac_chan_get_residue.patch enic-enable-rq-before-updating-rq-descriptors.patch watchdog-asm9260_wdt-fix-error-handling-in-asm9260_wdt_probe.patch