From c2b3e8740d8dcadbf90f8e9d947841cd2b7baa4a Mon Sep 17 00:00:00 2001 From: Frank Wang Date: Wed, 8 Mar 2017 15:07:02 +0800 Subject: [PATCH] arm64: dts: rockchip: amend usb-otg related nodes for rk3368-tb This adds move some common properties of usb-otg from dts to dtsi. Change-Id: I84355433b5ca63cc0b763d66dcdbb38897635418 Signed-off-by: Frank Wang --- .../boot/dts/rockchip/rk3368-android.dtsi | 42 +++++++++++++++++++ .../boot/dts/rockchip/rk3368-tb-sheep.dts | 40 +----------------- 2 files changed, 43 insertions(+), 39 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi index bb188b489054..b18235fca6cc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi @@ -295,6 +295,37 @@ status = "disabled"; }; + dwc_control_usb: dwc-control-usb { + compatible = "rockchip,rk3368-dwc-control-usb"; + rockchip,grf = <&grf>; + grf-offset = <0x04bc>; /* GRF_SOC_STATUS for USB2.0 OTG */ + interrupts = , + , + , + ; + interrupt-names = "otg_id", "otg_bvalid", + "otg_linestate", "host0_linestate"; + clocks = <&cru HCLK_USB_PERI>; + clock-names = "hclk_usb_peri"; + status = "disabled"; + + usb_bc { + compatible = "inno,phy"; + regbase = &dwc_control_usb; + rk_usb,bvalid = <0x4bc 23 1>; + rk_usb,iddig = <0x4bc 26 1>; + rk_usb,vdmsrcen = <0x718 12 1>; + rk_usb,vdpsrcen = <0x718 11 1>; + rk_usb,rdmpden = <0x718 10 1>; + rk_usb,idpsrcen = <0x718 9 1>; + rk_usb,idmsinken = <0x718 8 1>; + rk_usb,idpsinken = <0x718 7 1>; + rk_usb,dpattach = <0x4b8 31 1>; + rk_usb,cpdet = <0x4b8 30 1>; + rk_usb,dcpattach = <0x4b8 29 1>; + }; + }; + pinctrl { hdmi_i2c { hdmii2c_xfer: hdmii2c-xfer { @@ -439,3 +470,14 @@ }; }; }; + +&usb_otg { + clocks = <&cru SCLK_OTGPHY0>, <&cru HCLK_OTG0>; + clock-names = "sclk_otgphy0", "otg"; + resets = <&cru SRST_USBOTG_AHB>, + <&cru SRST_USBOTG_PHY>, + <&cru SRST_USBOTG_CON>; + reset-names = "otg_ahb", "otg_phy", "otg_controller"; + /* 0 - Normal, 1 - Force Host, 2 - Force Device */ + rockchip,usb-mode = <0>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-tb-sheep.dts b/arch/arm64/boot/dts/rockchip/rk3368-tb-sheep.dts index e1a17f0a4a8d..aa420afa11a0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-tb-sheep.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-tb-sheep.dts @@ -46,36 +46,6 @@ / { model = "Rockchip Sheep board"; compatible = "rockchip,sheep", "rockchip,rk3368"; - - dwc_control_usb: dwc-control-usb { - compatible = "rockchip,rk3368-dwc-control-usb"; - rockchip,grf = <&grf>; - grf-offset = <0x04bc>; /* GRF_SOC_STATUS for USB2.0 OTG */ - interrupts = , - , - , - ; - interrupt-names = "otg_id", "otg_bvalid", - "otg_linestate", "host0_linestate"; - clocks = <&cru HCLK_USB_PERI>, <&cru SCLK_USBPHY480M>; - clock-names = "hclk_usb_peri", "usbphy_480m"; - - usb_bc { - compatible = "inno,phy"; - regbase = &dwc_control_usb; - rk_usb,bvalid = <0x4bc 23 1>; - rk_usb,iddig = <0x4bc 26 1>; - rk_usb,vdmsrcen = <0x718 12 1>; - rk_usb,vdpsrcen = <0x718 11 1>; - rk_usb,rdmpden = <0x718 10 1>; - rk_usb,idpsrcen = <0x718 9 1>; - rk_usb,idmsinken = <0x718 8 1>; - rk_usb,idpsinken = <0x718 7 1>; - rk_usb,dpattach = <0x4b8 31 1>; - rk_usb,cpdet = <0x4b8 30 1>; - rk_usb,dcpattach = <0x4b8 29 1>; - }; - }; }; &rt5640 { @@ -144,21 +114,13 @@ }; &dwc_control_usb { - host_drv_gpio = <&gpio0 4 GPIO_ACTIVE_LOW>; otg_drv_gpio = <&gpio0 25 GPIO_ACTIVE_LOW>; rockchip,remote_wakeup; rockchip,usb_irq_wakeup; + status = "okay"; }; &usb_otg { - clocks = <&cru SCLK_OTGPHY0>, <&cru HCLK_OTG0>; - clock-names = "sclk_otgphy0", "otg"; - resets = <&cru SRST_USBOTG_AHB>, - <&cru SRST_USBOTG_PHY>, - <&cru SRST_USBOTG_CON>; - reset-names = "otg_ahb", "otg_phy", "otg_controller"; - /* 0 - Normal, 1 - Force Host, 2 - Force Device */ - rockchip,usb-mode = <0>; status = "okay"; }; -- 2.34.1