Merge tag 'usb-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[platform/kernel/linux-rpi.git] / arch / arm / boot / dts / sama5d4.dtsi

diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index b0d7952..2d9f853 100644 (file)
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -342,7 +342,7 @@
                                pinctrl-0 = <&pinctrl_i2c0>;
                                pinctrl-1 = <&pinctrl_i2c0_gpio>;
                                sda-gpios = <&pioA 30 GPIO_ACTIVE_HIGH>;
-                               scl-gpios = <&pioA 31 GPIO_ACTIVE_HIGH>;
+                               scl-gpios = <&pioA 31 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 32>;
@@ -364,7 +364,7 @@
                                pinctrl-0 = <&pinctrl_i2c1>;
                                pinctrl-1 = <&pinctrl_i2c1_gpio>;
                                sda-gpios = <&pioE 29 GPIO_ACTIVE_HIGH>;
-                               scl-gpios = <&pioE 30 GPIO_ACTIVE_HIGH>;
+                               scl-gpios = <&pioE 30 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 33>;
@@ -409,7 +409,7 @@
                                pinctrl-0 = <&pinctrl_i2c2>;
                                pinctrl-1 = <&pinctrl_i2c2_gpio>;
                                sda-gpios = <&pioB 29 GPIO_ACTIVE_HIGH>;
-                               scl-gpios = <&pioB 30 GPIO_ACTIVE_HIGH>;
+                               scl-gpios = <&pioB 30 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 34>;