From 53a1237496d88d0db89cd0c7052df89f7270c644 Mon Sep 17 00:00:00 2001 From: Martin Ayotte Date: Thu, 14 Mar 2019 17:06:00 -0400 Subject: [PATCH] remove duplicate dwc3/usb3phy lready in 5.0.y --- ...4-allwinner-h6-add-USB3-device-nodes.patch | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/patch/kernel/sunxi-dev/board-pine-h6-pine-h6-0023-arm64-allwinner-h6-add-USB3-device-nodes.patch b/patch/kernel/sunxi-dev/board-pine-h6-pine-h6-0023-arm64-allwinner-h6-add-USB3-device-nodes.patch index ad5bdc39e6..30617d0847 100644 --- a/patch/kernel/sunxi-dev/board-pine-h6-pine-h6-0023-arm64-allwinner-h6-add-USB3-device-nodes.patch +++ b/patch/kernel/sunxi-dev/board-pine-h6-pine-h6-0023-arm64-allwinner-h6-add-USB3-device-nodes.patch @@ -32,31 +32,6 @@ index f3ca411..b3d8da4 100644 + reset-names = "bus"; + status = "disabled"; + -+ dwc3: dwc3 { -+ compatible = "snps,dwc3"; -+ reg = <0x5200000 0x10000>; -+ interrupts = ; -+ /* -+ * According to Wink from Allwinner, the -+ * USB3 port on H6 is not capable of OTG; -+ * the datasheet doesn't mention OTG at all -+ * either, so the dr_mode is default to -+ * "host" here. -+ */ -+ dr_mode = "host"; -+ phys = <&usb3phy>; -+ phy-names = "usb3-phy"; -+ status = "disabled"; -+ }; -+ }; -+ -+ usb3phy: phy@5210000 { -+ compatible = "allwinner,sun50i-h6-usb3-phy"; -+ reg = <0x5210000 0x10000>; -+ clocks = <&ccu CLK_USB_PHY1>; -+ resets = <&ccu RST_USB_PHY1>; -+ #phy-cells = <0>; -+ status = "disabled"; + }; + r_ccu: clock@7010000 {