[U-Boot] [PATCH] 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 philipp.tomsich@theobroma-systems.com ---
arch/arm/dts/rk3399-evb.dts | 2 ++ arch/arm/dts/rk3399.dtsi | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts index a959989..c3a7ca2 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 754d34a..dbe55f2 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;
On 29 March 2017 at 13:19, Philipp Tomsich philipp.tomsich@theobroma-systems.com wrote:
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 philipp.tomsich@theobroma-systems.com
arch/arm/dts/rk3399-evb.dts | 2 ++ arch/arm/dts/rk3399.dtsi | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
On 31 March 2017 at 22:24, Simon Glass sjg@chromium.org wrote:
On 29 March 2017 at 13:19, Philipp Tomsich philipp.tomsich@theobroma-systems.com wrote:
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 philipp.tomsich@theobroma-systems.com
arch/arm/dts/rk3399-evb.dts | 2 ++ arch/arm/dts/rk3399.dtsi | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-rockchip, thanks!
participants (2)
-
Philipp Tomsich -
Simon Glass