diff options
| author | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-03-25 14:52:38 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-03-25 21:26:26 +0100 |
| commit | 0c64f75d89cb57eb4b9e956251dd87ee8e080563 (patch) | |
| tree | 7a8fdb14c1abcc5b62d39ac2f3feb9c244cc7ea5 /arch/arm/boot | |
| parent | ARM: dts: sunxi: Fix GIC compatible (diff) | |
| download | linux-0c64f75d89cb57eb4b9e956251dd87ee8e080563.tar.xz linux-0c64f75d89cb57eb4b9e956251dd87ee8e080563.zip | |
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>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31-colombus.dts | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts index 732873cbeedc..379d530ea2a7 100644 --- 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 0b7bedf85fb9..0e62b4042100 100644 --- 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>; }; }; |