usb: fix otg_drv/host_drv gpio in device tree

diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts
index 24094b36fb8bc4564af915118f50480489b66e63..acdc0f59565df624e577ab292332962cb6a88bc8 100755 (executable)
--- a/arch/arm/boot/dts/rk3126-sdk.dts
+++ b/arch/arm/boot/dts/rk3126-sdk.dts
@@ -10,7 +10,16 @@
                 default-brightness-level = <128>;
                 enable-gpios = <&gpio3 GPIO_C1 GPIO_ACTIVE_HIGH>;
         };
-};
+
+       usb_control {
+               compatible = "rockchip,rk3126-usb-control";
+               host_drv_gpio = <&gpio2 GPIO_B4 GPIO_ACTIVE_LOW>;
+               otg_drv_gpio = <&gpio2 GPIO_B6 GPIO_ACTIVE_LOW>;
+
+               rockchip,remote_wakeup;
+               rockchip,usb_irq_wakeup;
+               };
+       };
 
 &rk_screen {
        display-timings = <&disp_timings>;
@@ -35,4 +44,4 @@
 
 &key {
                io-channels = <&adc 2>;
-};
\ No newline at end of file
+};

diff --git a/arch/arm/boot/dts/rk3128-box.dts b/arch/arm/boot/dts/rk3128-box.dts
index fe143ebe63379a40dd136acfa6d1f02cc80a10bd..ce432785c82791be3c3ef3c3343fb7f08df5fbe5 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-box.dts
+++ b/arch/arm/boot/dts/rk3128-box.dts
@@ -3,6 +3,14 @@
 
 / {
         compatible = "rockchip,rk3128";
+       usb_control {
+               compatible = "rockchip,rk3126-usb-control";
+               host_drv_gpio = <&gpio3 GPIO_C4 GPIO_ACTIVE_LOW>;
+               otg_drv_gpio = <&gpio3 GPIO_C1 GPIO_ACTIVE_LOW>;
+
+               rockchip,remote_wakeup;
+               rockchip,usb_irq_wakeup;
+       };
 };
 
 

diff --git a/arch/arm/boot/dts/rk3128-sdk.dts b/arch/arm/boot/dts/rk3128-sdk.dts
index a9a0de5aa84762313eb7cee6abebb2256dd344d2..e5c7aabed088afbe3de0d959706c0bd094373500 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-sdk.dts
+++ b/arch/arm/boot/dts/rk3128-sdk.dts
@@ -10,6 +10,16 @@
                 default-brightness-level = <128>;
                 enable-gpios = <&gpio0 GPIO_D3 GPIO_ACTIVE_HIGH>;
         };
+
+       usb_control {
+               compatible = "rockchip,rk3126-usb-control";
+
+               host_drv_gpio = <&gpio3 GPIO_C4 GPIO_ACTIVE_LOW>;
+               otg_drv_gpio = <&gpio3 GPIO_C1 GPIO_ACTIVE_LOW>;
+
+               rockchip,remote_wakeup;
+               rockchip,usb_irq_wakeup;
+       };
 };
 
 &rk_screen {

diff --git a/arch/arm/boot/dts/rk312x-sdk.dtsi b/arch/arm/boot/dts/rk312x-sdk.dtsi
index 2f7760ac3b3883e0fcf4c7f293b9d9d036a9e04c..9ce5a7373dd91c8a7ca49eb8405eed41d3bc6d78 100755 (executable)
--- a/arch/arm/boot/dts/rk312x-sdk.dtsi
+++ b/arch/arm/boot/dts/rk312x-sdk.dtsi
@@ -11,15 +11,6 @@
                bootargs = "vmalloc=512M clk_ignore_unused";
        };
 
-       usb_control {
-               compatible = "rockchip,rk3126-usb-control";
-               host_drv_gpio = <&gpio2 GPIO_B4 GPIO_ACTIVE_LOW>;
-               otg_drv_gpio = <&gpio2 GPIO_B6 GPIO_ACTIVE_LOW>;
-
-               rockchip,remote_wakeup;
-               rockchip,usb_irq_wakeup;
-       };
-
        pwm_regulator1:pwm-regulator1 {
                compatible = "rockchip_pwm_regulator";
                pwms = <&pwm1 0 25000>;