From dd52ff55d3c0381dca70658d3cc73225f338740c Mon Sep 17 00:00:00 2001 From: lyz Date: Fri, 8 Aug 2014 10:05:47 +0800 Subject: [PATCH] usb: fix otg_drv/host_drv gpio in device tree --- arch/arm/boot/dts/rk3126-sdk.dts | 13 +++++++++++-- arch/arm/boot/dts/rk3128-box.dts | 8 ++++++++ arch/arm/boot/dts/rk3128-sdk.dts | 10 ++++++++++ arch/arm/boot/dts/rk312x-sdk.dtsi | 9 --------- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts index 24094b36fb8b..acdc0f59565d 100755 --- 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 fe143ebe6337..ce432785c827 100755 --- 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 a9a0de5aa847..e5c7aabed088 100755 --- 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 2f7760ac3b38..9ce5a7373dd9 100755 --- 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>; -- 2.34.1