From 5f614bb096e145a7d1e1b4bc96b3ad5b194c13a5 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 9 Feb 2017 14:47:12 +0100 Subject: [PATCH] arm64: zynqmp: Sync dtses with Linux kernel Remove additional comments and usb setting. Signed-off-by: Michal Simek --- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 1 - arch/arm/dts/zynqmp-zcu100.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revB.dts | 4 ---- arch/arm/dts/zynqmp-zcu102.dts | 1 - 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts index d9acd29d511..200d9e4a1bf 100644 --- a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts +++ b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts @@ -191,7 +191,6 @@ snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&lane2 PHY_TYPE_USB3 0 2 26000000>; - dr_mode = "host"; }; &xilinx_drm { diff --git a/arch/arm/dts/zynqmp-zcu100.dts b/arch/arm/dts/zynqmp-zcu100.dts index f24cdc3fef7..7f8a1f5bb3b 100644 --- a/arch/arm/dts/zynqmp-zcu100.dts +++ b/arch/arm/dts/zynqmp-zcu100.dts @@ -339,7 +339,7 @@ regulator-always-on; }; }; - }; + }; */ }; i2csw_5: i2c@5 { /* i2c mw 75 0 20 */ diff --git a/arch/arm/dts/zynqmp-zcu102-revB.dts b/arch/arm/dts/zynqmp-zcu102-revB.dts index aeee387f6be..765108e4378 100644 --- a/arch/arm/dts/zynqmp-zcu102-revB.dts +++ b/arch/arm/dts/zynqmp-zcu102-revB.dts @@ -40,7 +40,3 @@ }; }; }; - -&dwc3_0 { - /* USB works - also bootrom DFU */ -}; diff --git a/arch/arm/dts/zynqmp-zcu102.dts b/arch/arm/dts/zynqmp-zcu102.dts index 2a5ce7dc9aa..bab9f3d860d 100644 --- a/arch/arm/dts/zynqmp-zcu102.dts +++ b/arch/arm/dts/zynqmp-zcu102.dts @@ -923,7 +923,6 @@ drivers/hwmon/pmbus/Makefile:11:obj-$(CONFIG_SENSORS_MAX20751) += max20751.o &dwc3_0 { status = "okay"; - /* Peripheral and OTG mode not working - usb reset issue */ dr_mode = "host"; snps,usb3_lpm_capable; phy-names = "usb3-phy"; -- 2.47.3