[4.9] regulator: fan53555: fix I2C device ids

Message ID 20171025142026.43244-1-guillaume.tucker@collabora.com
State New
Headers show
Series
  • [4.9] regulator: fan53555: fix I2C device ids
Related show

Commit Message

Guillaume Tucker Oct. 25, 2017, 2:20 p.m.
[ 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.tucker@collabora.com>

Signed-off-by: Mark Brown <broonie@kernel.org>

---
 drivers/regulator/fan53555.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 
2.11.0

Comments

Greg Kroah-Hartman Oct. 30, 2017, 9:47 a.m. | #1
On Wed, Oct 25, 2017 at 03:20:26PM +0100, Guillaume Tucker wrote:
> [ 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.tucker@collabora.com>

> Signed-off-by: Mark Brown <broonie@kernel.org>

> ---

>  drivers/regulator/fan53555.c | 5 ++++-

>  1 file changed, 4 insertions(+), 1 deletion(-)


Why just 4.9?  This belongs in all stable trees from 4.4-4.13, right?

thanks,

greg k-h
Guillaume Tucker Oct. 30, 2017, 10:26 a.m. | #2
On 30/10/17 09:47, Greg Kroah-Hartman wrote:
> On Wed, Oct 25, 2017 at 03:20:26PM +0100, Guillaume Tucker wrote:

>> [ 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.tucker@collabora.com>

>> Signed-off-by: Mark Brown <broonie@kernel.org>

>> ---

>>  drivers/regulator/fan53555.c | 5 ++++-

>>  1 file changed, 4 insertions(+), 1 deletion(-)

>

> Why just 4.9?  This belongs in all stable trees from 4.4-4.13, right?


Yes, absolutely.  I only tested this on actual hardware with
mainline v4.13 and 4.9 stable but it's trivial enough to also
just add it to 4.4 stable.  In fact I see you've already applied
it there, thanks!  And sorry, I should have sent all of them.

Guillaume

Patch

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
 	},
 	{ },