i2c: rk3x: Adjust mask/value offset for i2c2 on rv1126

Rockchip RV1126 is using old style i2c controller, the i2c2
bus uses a non-sequential offset in the grf register for the
mask/value bits for this bus.

This patch fixes i2c2 bus on rv1126 SoCs.

Signed-off-by: Tim Lunn <tim@feathertop.org>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c
index a044ca0c35a193e9f8abeb3cff88707285a7028d..06fec2344575d5f4362e0a7379f8563f453900d6 100644 (file)
--- a/drivers/i2c/busses/i2c-rk3x.c
+++ b/drivers/i2c/busses/i2c-rk3x.c
@@ -1288,8 +1288,12 @@ static int rk3x_i2c_probe(struct platform_device *pdev)
                        return -EINVAL;
                }
 
-               /* 27+i: write mask, 11+i: value */
-               value = BIT(27 + bus_nr) | BIT(11 + bus_nr);
+               /* rv1126 i2c2 uses non-sequential write mask 20, value 4 */
+               if (i2c->soc_data == &rv1126_soc_data && bus_nr == 2)
+                       value = BIT(20) | BIT(4);
+               else
+                       /* 27+i: write mask, 11+i: value */
+                       value = BIT(27 + bus_nr) | BIT(11 + bus_nr);
 
                ret = regmap_write(grf, i2c->soc_data->grf_offset, value);
                if (ret != 0) {