Author: blogic Date: 2016-01-04 15:21:11 +0100 (Mon, 04 Jan 2016) New Revision: 48113
Removed: trunk/target/linux/ramips/patches-4.3/0030-USB-add-OHCI-EHCI-OF-binding.patch Modified: trunk/target/linux/ramips/dts/mt7620a.dtsi trunk/target/linux/ramips/dts/mt7620n.dtsi trunk/target/linux/ramips/dts/mt7628an.dtsi trunk/target/linux/ramips/dts/rt3352.dtsi trunk/target/linux/ramips/dts/rt3883.dtsi trunk/target/linux/ramips/dts/rt5350.dtsi Log: ralink: fix USB compatible strings switch to the upstream compatible strings for ehci and ohci support. Signed-off-by: John Crispin <[email protected]> Modified: trunk/target/linux/ramips/dts/mt7620a.dtsi =================================================================== --- trunk/target/linux/ramips/dts/mt7620a.dtsi 2016-01-04 12:28:46 UTC (rev 48112) +++ trunk/target/linux/ramips/dts/mt7620a.dtsi 2016-01-04 14:21:11 UTC (rev 48113) @@ -462,7 +462,7 @@ }; ehci@101c0000 { - compatible = "ralink,rt3xxx-ehci"; + compatible = "generic-ehci"; reg = <0x101c0000 0x1000>; interrupt-parent = <&intc>; @@ -475,7 +475,7 @@ }; ohci@101c1000 { - compatible = "ralink,rt3xxx-ohci"; + compatible = "generic-ohci"; reg = <0x101c1000 0x1000>; interrupt-parent = <&intc>; Modified: trunk/target/linux/ramips/dts/mt7620n.dtsi =================================================================== --- trunk/target/linux/ramips/dts/mt7620n.dtsi 2016-01-04 12:28:46 UTC (rev 48112) +++ trunk/target/linux/ramips/dts/mt7620n.dtsi 2016-01-04 14:21:11 UTC (rev 48113) @@ -298,7 +298,7 @@ }; ehci@101c0000 { - compatible = "ralink,rt3xxx-ehci"; + compatible = "generic-ehci"; reg = <0x101c0000 0x1000>; interrupt-parent = <&intc>; @@ -311,7 +311,7 @@ }; ohci@101c1000 { - compatible = "ralink,rt3xxx-ohci"; + compatible = "generic-ohci"; reg = <0x101c1000 0x1000>; phys = <&usbphy 1>; Modified: trunk/target/linux/ramips/dts/mt7628an.dtsi =================================================================== --- trunk/target/linux/ramips/dts/mt7628an.dtsi 2016-01-04 12:28:46 UTC (rev 48112) +++ trunk/target/linux/ramips/dts/mt7628an.dtsi 2016-01-04 14:21:11 UTC (rev 48113) @@ -362,7 +362,7 @@ }; ehci@101c0000 { - compatible = "ralink,rt3xxx-ehci"; + compatible = "generic-ehci"; reg = <0x101c0000 0x1000>; phys = <&usbphy 1>; @@ -373,7 +373,7 @@ }; ohci@101c1000 { - compatible = "ralink,rt3xxx-ohci"; + compatible = "generic-ohci"; reg = <0x101c1000 0x1000>; phys = <&usbphy 1>; Modified: trunk/target/linux/ramips/dts/rt3352.dtsi =================================================================== --- trunk/target/linux/ramips/dts/rt3352.dtsi 2016-01-04 12:28:46 UTC (rev 48112) +++ trunk/target/linux/ramips/dts/rt3352.dtsi 2016-01-04 14:21:11 UTC (rev 48113) @@ -270,7 +270,7 @@ }; ehci@101c0000 { - compatible = "ralink,rt3xxx-ehci", "ehci-platform"; + compatible = "generic-ehci"; reg = <0x101c0000 0x1000>; interrupt-parent = <&intc>; @@ -280,7 +280,7 @@ }; ohci@101c1000 { - compatible = "ralink,rt3xxx-ohci", "ohci-platform"; + compatible = "generic-ohci"; reg = <0x101c1000 0x1000>; interrupt-parent = <&intc>; Modified: trunk/target/linux/ramips/dts/rt3883.dtsi =================================================================== --- trunk/target/linux/ramips/dts/rt3883.dtsi 2016-01-04 12:28:46 UTC (rev 48112) +++ trunk/target/linux/ramips/dts/rt3883.dtsi 2016-01-04 14:21:11 UTC (rev 48113) @@ -376,7 +376,7 @@ }; ehci@101c0000 { - compatible = "ralink,rt3xxx-ehci", "ehci-platform"; + compatible = "generic-ehci"; reg = <0x101c0000 0x1000>; phys = <&usbphy 1>; @@ -389,7 +389,7 @@ }; ohci@101c1000 { - compatible = "ralink,rt3xxx-ohci", "ohci-platform"; + compatible = "generic-ohci"; reg = <0x101c1000 0x1000>; phys = <&usbphy 1>; Modified: trunk/target/linux/ramips/dts/rt5350.dtsi =================================================================== --- trunk/target/linux/ramips/dts/rt5350.dtsi 2016-01-04 12:28:46 UTC (rev 48112) +++ trunk/target/linux/ramips/dts/rt5350.dtsi 2016-01-04 14:21:11 UTC (rev 48113) @@ -312,7 +312,7 @@ }; ehci@101c0000 { - compatible = "ralink,rt3xxx-ehci", "ehci-platform"; + compatible = "generic-ehci"; reg = <0x101c0000 0x1000>; phys = <&usbphy 1>; @@ -323,7 +323,7 @@ }; ohci@101c1000 { - compatible = "ralink,rt3xxx-ohci", "ohci-platform"; + compatible = "generic-ohci"; reg = <0x101c1000 0x1000>; phys = <&usbphy 1>; Deleted: trunk/target/linux/ramips/patches-4.3/0030-USB-add-OHCI-EHCI-OF-binding.patch =================================================================== --- trunk/target/linux/ramips/patches-4.3/0030-USB-add-OHCI-EHCI-OF-binding.patch 2016-01-04 12:28:46 UTC (rev 48112) +++ trunk/target/linux/ramips/patches-4.3/0030-USB-add-OHCI-EHCI-OF-binding.patch 2016-01-04 14:21:11 UTC (rev 48113) @@ -1,33 +0,0 @@ -From ef42c519247f677229bcbd1ab622222b165242af Mon Sep 17 00:00:00 2001 -From: John Crispin <[email protected]> -Date: Sun, 27 Jul 2014 09:49:07 +0100 -Subject: [PATCH 30/53] USB: add OHCI/EHCI OF binding - -based on f3bc64d6d1f21c1b92d75f233a37b75d77af6963 - -Signed-off-by: John Crispin <[email protected]> ---- - drivers/usb/host/ehci-platform.c | 1 + - drivers/usb/host/ohci-platform.c | 1 + - 2 files changed, 2 insertions(+) - ---- a/drivers/usb/host/ehci-platform.c -+++ b/drivers/usb/host/ehci-platform.c -@@ -381,6 +381,7 @@ static int ehci_platform_resume(struct d - static const struct of_device_id vt8500_ehci_ids[] = { - { .compatible = "via,vt8500-ehci", }, - { .compatible = "wm,prizm-ehci", }, -+ { .compatible = "ralink,rt3xxx-ehci", }, - { .compatible = "generic-ehci", }, - { .compatible = "cavium,octeon-6335-ehci", }, - {} ---- a/drivers/usb/host/ohci-platform.c -+++ b/drivers/usb/host/ohci-platform.c -@@ -344,6 +344,7 @@ static int ohci_platform_resume(struct d - #endif /* CONFIG_PM_SLEEP */ - - static const struct of_device_id ohci_platform_ids[] = { -+ { .compatible = "ralink,rt3xxx-ohci", }, - { .compatible = "generic-ohci", }, - { .compatible = "cavium,octeon-6335-ohci", }, - { } _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
