tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: dts: exynos: Convert to new i2c-gpio bindings

The updated "i2c-gpio" driver bindings require to define the SDA and SCL
GPIO lines in the separate properties and mark both as GPIO_OPEN_DRAIN.
Covert all Exynos dts files to follow this style.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

authored by

Marek Szyprowski and committed by
Krzysztof Kozlowski 8df80c18 8807d356

+20 -13
+2 -1
arch/arm/boot/dts/exynos3250-monk.dts
··· 57 57 58 58 i2c_max77836: i2c-gpio-0 { 59 59 compatible = "i2c-gpio"; 60 - gpios = <&gpd0 2 GPIO_ACTIVE_HIGH>, <&gpd0 3 GPIO_ACTIVE_HIGH>; 60 + sda-gpios = <&gpd0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 61 + scl-gpios = <&gpd0 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 61 62 #address-cells = <1>; 62 63 #size-cells = <0>; 63 64
+2 -1
arch/arm/boot/dts/exynos3250-rinato.dts
··· 52 52 53 53 i2c_max77836: i2c-gpio-0 { 54 54 compatible = "i2c-gpio"; 55 - gpios = <&gpd0 2 GPIO_ACTIVE_HIGH>, <&gpd0 3 GPIO_ACTIVE_HIGH>; 55 + sda-gpios = <&gpd0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 56 + scl-gpios = <&gpd0 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 56 57 #address-cells = <1>; 57 58 #size-cells = <0>; 58 59
+2 -2
arch/arm/boot/dts/exynos4210-i9100.dts
··· 128 128 #address-cells = <1>; 129 129 #size-cells = <0>; 130 130 131 - sda-gpios = <&gpy4 0 GPIO_ACTIVE_HIGH>; 132 - scl-gpios = <&gpy4 1 GPIO_ACTIVE_HIGH>; 131 + sda-gpios = <&gpy4 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 132 + scl-gpios = <&gpy4 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 133 133 i2c-gpio,delay-us = <5>; 134 134 135 135 battery@36 {
+2 -1
arch/arm/boot/dts/exynos4210-universal_c210.dts
··· 164 164 165 165 hdmi_ddc: i2c-ddc { 166 166 compatible = "i2c-gpio"; 167 - gpios = <&gpe4 2 GPIO_ACTIVE_HIGH &gpe4 3 GPIO_ACTIVE_HIGH>; 167 + sda-gpios = <&gpe4 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 168 + scl-gpios = <&gpe4 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 168 169 i2c-gpio,delay-us = <100>; 169 170 #address-cells = <1>; 170 171 #size-cells = <0>;
+4 -2
arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
··· 53 53 54 54 i2c_ak8975: i2c-gpio-0 { 55 55 compatible = "i2c-gpio"; 56 - gpios = <&gpy2 4 GPIO_ACTIVE_HIGH>, <&gpy2 5 GPIO_ACTIVE_HIGH>; 56 + sda-gpios = <&gpy2 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 57 + scl-gpios = <&gpy2 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 57 58 i2c-gpio,delay-us = <2>; 58 59 #address-cells = <1>; 59 60 #size-cells = <0>; ··· 69 68 70 69 i2c_cm36651: i2c-gpio-2 { 71 70 compatible = "i2c-gpio"; 72 - gpios = <&gpf0 0 GPIO_ACTIVE_HIGH>, <&gpf0 1 GPIO_ACTIVE_HIGH>; 71 + sda-gpios = <&gpf0 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 72 + scl-gpios = <&gpf0 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 73 73 i2c-gpio,delay-us = <2>; 74 74 #address-cells = <1>; 75 75 #size-cells = <0>;
+6 -3
arch/arm/boot/dts/exynos4412-midas.dtsi
··· 140 140 141 141 i2c_max77693: i2c-gpio-1 { 142 142 compatible = "i2c-gpio"; 143 - gpios = <&gpm2 0 GPIO_ACTIVE_HIGH>, <&gpm2 1 GPIO_ACTIVE_HIGH>; 143 + sda-gpios = <&gpm2 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 144 + scl-gpios = <&gpm2 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 144 145 i2c-gpio,delay-us = <2>; 145 146 #address-cells = <1>; 146 147 #size-cells = <0>; ··· 189 188 190 189 i2c_max77693_fuel: i2c-gpio-3 { 191 190 compatible = "i2c-gpio"; 192 - gpios = <&gpf1 5 GPIO_ACTIVE_HIGH>, <&gpf1 4 GPIO_ACTIVE_HIGH>; 191 + sda-gpios = <&gpf1 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 192 + scl-gpios = <&gpf1 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 193 193 i2c-gpio,delay-us = <2>; 194 194 #address-cells = <1>; 195 195 #size-cells = <0>; ··· 230 228 231 229 i2c-mhl { 232 230 compatible = "i2c-gpio"; 233 - gpios = <&gpf0 4 GPIO_ACTIVE_HIGH>, <&gpf0 6 GPIO_ACTIVE_HIGH>; 231 + sda-gpios = <&gpf0 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 232 + scl-gpios = <&gpf0 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 234 233 i2c-gpio,delay-us = <100>; 235 234 #address-cells = <1>; 236 235 #size-cells = <0>;
+2 -3
arch/arm/boot/dts/exynos5250-arndale.dts
··· 641 641 pinctrl-0 = <&i2c2_gpio_bus>; 642 642 status = "okay"; 643 643 compatible = "i2c-gpio"; 644 - gpios = <&gpa0 6 0 /* sda */ 645 - &gpa0 7 0 /* scl */ 646 - >; 644 + sda-gpios = <&gpa0 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 645 + scl-gpios = <&gpa0 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 647 646 i2c-gpio,delay-us = <2>; 648 647 #address-cells = <1>; 649 648 #size-cells = <0>;