ARM: dts: sunxi: Switch to new GPIOs properties for i2c-gpio

The i2c-gpio driver uses named gpios now and the array of GPIOs is
deprecated. Switch to the new binding.

Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>

diff --git a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
index 732873c..379d530 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
+++ b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
@@ -58,13 +58,13 @@
                /delete-property/stdout-path;
        };
 
-       i2c_lcd: i2c-gpio {
+       i2c_lcd: i2c {
                /* The lcd panel i2c interface is hooked up via gpios */
                compatible = "i2c-gpio";
                pinctrl-names = "default";
                pinctrl-0 = <&i2c_lcd_pins>;
-               gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>, /* PG12, sda */
-                       <&pio 6 10 GPIO_ACTIVE_HIGH>; /* PG10, scl */
+               sda-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
+               scl-gpios = <&pio 6 10 GPIO_ACTIVE_HIGH>; /* PG10 */
                i2c-gpio,delay-us = <5>;
        };
 };

diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index 0b7bedf..0e62b40 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -65,8 +65,8 @@
                compatible = "i2c-gpio";
                pinctrl-names = "default";
                pinctrl-0 = <&i2c_lcd_pins>;
-               gpios = <&pio 0 23 GPIO_ACTIVE_HIGH>, /* PA23, sda */
-                       <&pio 0 24 GPIO_ACTIVE_HIGH>; /* PA24, scl */
+               sda-gpios = <&pio 0 23 GPIO_ACTIVE_HIGH>; /* PA23 */
+               scl-gpios = <&pio 0 24 GPIO_ACTIVE_HIGH>; /* PA24 */
                i2c-gpio,delay-us = <5>;
        };
 };