Merge branch 'topic/nhlt' into for-next

[linux-2.6-microblaze.git] / arch / arm / boot / dts / stm32mp157c-ev1.dts

diff --git a/arch/arm/boot/dts/stm32mp157c-ev1.dts b/arch/arm/boot/dts/stm32mp157c-ev1.dts
index 228e35e..8a4c7ff 100644 (file)
--- a/arch/arm/boot/dts/stm32mp157c-ev1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ev1.dts
@@ -174,8 +174,9 @@
 };
 
 &i2c2 {
-       pinctrl-names = "default";
+       pinctrl-names = "default", "sleep";
        pinctrl-0 = <&i2c2_pins_a>;
+       pinctrl-1 = <&i2c2_pins_sleep_a>;
        i2c-scl-rising-time-ns = <185>;
        i2c-scl-falling-time-ns = <20>;
        status = "okay";
@@ -210,7 +211,7 @@
                interrupt-parent = <&gpioi>;
                vdd-supply = <&v3v3>;
 
-               stmfx_pinctrl: stmfx-pin-controller {
+               stmfx_pinctrl: pinctrl {
                        compatible = "st,stmfx-0300-pinctrl";
                        gpio-controller;
                        #gpio-cells = <2>;
@@ -218,7 +219,7 @@
                        #interrupt-cells = <2>;
                        gpio-ranges = <&stmfx_pinctrl 0 0 24>;
 
-                       joystick_pins: joystick {
+                       joystick_pins: joystick-pins {
                                pins = "gpio0", "gpio1", "gpio2", "gpio3", "gpio4";
                                bias-pull-down;
                        };
@@ -227,8 +228,9 @@
 };
 
 &i2c5 {
-       pinctrl-names = "default";
+       pinctrl-names = "default", "sleep";
        pinctrl-0 = <&i2c5_pins_a>;
+       pinctrl-1 = <&i2c5_pins_sleep_a>;
        i2c-scl-rising-time-ns = <185>;
        i2c-scl-falling-time-ns = <20>;
        status = "okay";
@@ -353,7 +355,8 @@
 };
 
 &usbotg_hs {
-       dr_mode = "peripheral";
+       pinctrl-0 = <&usbotg_hs_pins_a>;
+       pinctrl-names = "default";
        phys = <&usbphyc_port1 0>;
        phy-names = "usb2-phy";
        status = "okay";