From: Philipp Tomsich Date: Wed, 29 Mar 2017 19:19:25 +0000 (+0200) Subject: dts: rk3399: move rockchip, vbus-gpio properties into board-specific files X-Git-Tag: v2017.05-rc2~124 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aad10a049d31b0b54e6eb762a60d4ded4a468c80;p=u-boot dts: rk3399: move rockchip, vbus-gpio properties into board-specific files The (shared) rk3399.dtsi had defined the 'rockchip,vbus-gpio' properties for each USB 3.0 controller. As the GPIO usage will vary (e.g. one of those GPIOs shuts down one of the regulators on the RK3399-Q7) between boards, we move this from the shared dtsi into the device tree file for the EVB board which these GPIO definitions match. Signed-off-by: Philipp Tomsich Acked-by: Simon Glass --- diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts index a959989735..c3a7ca26e7 100644 --- a/arch/arm/dts/rk3399-evb.dts +++ b/arch/arm/dts/rk3399-evb.dts @@ -95,6 +95,7 @@ }; &dwc3_typec0 { + rockchip,vbus-gpio = <&gpio1 3 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -107,6 +108,7 @@ }; &dwc3_typec1 { + rockchip,vbus-gpio = <&gpio1 4 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm/dts/rk3399.dtsi b/arch/arm/dts/rk3399.dtsi index 754d34a8e5..dbe55f2b32 100644 --- a/arch/arm/dts/rk3399.dtsi +++ b/arch/arm/dts/rk3399.dtsi @@ -239,7 +239,6 @@ compatible = "rockchip,rk3399-xhci"; reg = <0x0 0xfe800000 0x0 0x100000>; status = "disabled"; - rockchip,vbus-gpio = <&gpio1 3 GPIO_ACTIVE_HIGH>; snps,dis-enblslpm-quirk; snps,phyif-utmi-bits = <16>; snps,dis-u2-freeclk-exists-quirk; @@ -261,7 +260,6 @@ compatible = "rockchip,rk3399-xhci"; reg = <0x0 0xfe900000 0x0 0x100000>; status = "disabled"; - rockchip,vbus-gpio = <&gpio1 4 GPIO_ACTIVE_HIGH>; snps,dis-enblslpm-quirk; snps,phyif-utmi-bits = <16>; snps,dis-u2-freeclk-exists-quirk;