Source: linux
Version: 4.9.30-2
Severity: normal
Tags: upstream patch

Dear Maintainer,

The attached fix is a backport from mainline which has also been
submitted to
linux-4.9 stable:

  
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fc1111b885437f374ed54aadda44d8b241ebd2a3

The issue was found on a rk3288 Firefly board which uses a FAN53555 regulator
for the Mali GPU.  This patch fixes the I2C identifiers to match the fan53555
regulator kernel module info so that udev probes it correctly at boot time.


-- System Information:
Debian Release: 9.1
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: armhf (armv7l)

Kernel: Linux 4.9.0-3-armmp (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=locale: Cannot set 
LC_CTYPE to default locale: No such file or directory
locale: Cannot set LC_MESSAGES to default locale: No such file or directory
locale: Cannot set LC_ALL to default locale: No such file or directory
ANSI_X3.4-1968), LANGUAGE=en_GB.UTF-8 (charmap=locale: Cannot set LC_CTYPE to 
default locale: No such file or directory
locale: Cannot set LC_MESSAGES to default locale: No such file or directory
locale: Cannot set LC_ALL to default locale: No such file or directory
ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
>From 2623c442eff4e17690b8db9556b193f0966c008e Mon Sep 17 00:00:00 2001
From: Guillaume Tucker <guillaume.tuc...@collabora.com>
Date: Mon, 21 Aug 2017 13:47:43 +0100
Subject: [PATCH 4.9] regulator: fan53555: fix I2C device ids

[ Upstream commit fc1111b885437f374ed54aadda44d8b241ebd2a3 ]

The device tree nodes all correctly describe the regulators as
syr827 or syr828, but the I2C device id is currently set to the
wildcard value of syr82x in the driver.  This causes udev to fail
to match the driver module with the modalias data from sysfs.

Fix this by replacing the I2C device ids with ones that match the
device tree descriptions, with syr827 and syr828.  Tested on
Firefly rk3288 board.  The syr82x id was not used anywhere.

Fixes: e80c47bd738b (regulator: fan53555: Export I2C module alias information)
Signed-off-by: Guillaume Tucker <guillaume.tuc...@collabora.com>
Signed-off-by: Mark Brown <broo...@kernel.org>
---
 drivers/regulator/fan53555.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c
index d7da81a875cf..c9af065feb28 100644
--- a/drivers/regulator/fan53555.c
+++ b/drivers/regulator/fan53555.c
@@ -476,7 +476,10 @@ static const struct i2c_device_id fan53555_id[] = {
                .name = "fan53555",
                .driver_data = FAN53555_VENDOR_FAIRCHILD
        }, {
-               .name = "syr82x",
+               .name = "syr827",
+               .driver_data = FAN53555_VENDOR_SILERGY
+       }, {
+               .name = "syr828",
                .driver_data = FAN53555_VENDOR_SILERGY
        },
        { },
-- 
2.11.0

>From 2623c442eff4e17690b8db9556b193f0966c008e Mon Sep 17 00:00:00 2001
From: Guillaume Tucker <guillaume.tuc...@collabora.com>
Date: Mon, 21 Aug 2017 13:47:43 +0100
Subject: [PATCH 4.9] regulator: fan53555: fix I2C device ids

[ Upstream commit fc1111b885437f374ed54aadda44d8b241ebd2a3 ]

The device tree nodes all correctly describe the regulators as
syr827 or syr828, but the I2C device id is currently set to the
wildcard value of syr82x in the driver.  This causes udev to fail
to match the driver module with the modalias data from sysfs.

Fix this by replacing the I2C device ids with ones that match the
device tree descriptions, with syr827 and syr828.  Tested on
Firefly rk3288 board.  The syr82x id was not used anywhere.

Fixes: e80c47bd738b (regulator: fan53555: Export I2C module alias information)
Signed-off-by: Guillaume Tucker <guillaume.tuc...@collabora.com>
Signed-off-by: Mark Brown <broo...@kernel.org>
---
 drivers/regulator/fan53555.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c
index d7da81a875cf..c9af065feb28 100644
--- a/drivers/regulator/fan53555.c
+++ b/drivers/regulator/fan53555.c
@@ -476,7 +476,10 @@ static const struct i2c_device_id fan53555_id[] = {
                .name = "fan53555",
                .driver_data = FAN53555_VENDOR_FAIRCHILD
        }, {
-               .name = "syr82x",
+               .name = "syr827",
+               .driver_data = FAN53555_VENDOR_SILERGY
+       }, {
+               .name = "syr828",
                .driver_data = FAN53555_VENDOR_SILERGY
        },
        { },
-- 
2.11.0

Reply via email to