summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>2017-03-29 19:19:25 (GMT)
committerSimon Glass <sjg@chromium.org>2017-04-05 02:01:57 (GMT)
commitaad10a049d31b0b54e6eb762a60d4ded4a468c80 (patch)
tree24e13446de13df7af7efdbdb93cece9bd24ca542 /arch
parent0b3ce83d7b73b600ce4abb5168543aa2d983dd94 (diff)
downloadu-boot-aad10a049d31b0b54e6eb762a60d4ded4a468c80.tar.xz
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> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/rk3399-evb.dts2
-rw-r--r--arch/arm/dts/rk3399.dtsi2
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;