ARM: dts: sun5i: Stop using different compatibles for ehci/ohci on a13 vs a10s

The A13 and the A10s use the same die (this has been confirmed by Allwinner),
as such there is no need to differentiate between the ehci/ohci parts of both,
the only reasons there were different allwinner,sun5i-a*-foo compatible
between these 2 parts is costemetically and because we could when we still
had 2 completely different dtsi files.

The allwinner,sun5i-a*-foo compatible strings are not used for binding at all,
the actual driver binds to the generic-?hci compatible, so we can safely remove
this cosmetical difference and simplify the dtsi files.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index ef516db5852d2d80f665ad69550a3c87eff91a61..a78c95dfb33fdb794bfe59fc0eecb2792841da70 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -157,14 +157,6 @@
        };
 };
 
-&ehci0 {
-       compatible = "allwinner,sun5i-a10s-ehci", "generic-ehci";
-};
-
-&ohci0 {
-       compatible = "allwinner,sun5i-a10s-ohci", "generic-ohci";
-};
-
 &pio {
        compatible = "allwinner,sun5i-a10s-pinctrl";
 

diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index 39264f7c7ae602b6479852357755a0361916f7d1..0188deed6f75714916d3a255bef4a917c8d32df7 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -152,14 +152,6 @@
        cooling-max-level = <5>;
 };
 
-&ehci0 {
-       compatible = "allwinner,sun5i-a13-ehci", "generic-ehci";
-};
-
-&ohci0 {
-       compatible = "allwinner,sun5i-a13-ohci", "generic-ohci";
-};
-
 &pio {
        compatible = "allwinner,sun5i-a13-pinctrl";
 

diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index e42cbb03620f9f5fc798c3a49e1e462a86206f2c..343ba1133bda0a5f1f637002f315ef587d8c086e 100644 (file)
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -392,6 +392,7 @@
                };
 
                ehci0: usb@01c14000 {
+                       compatible = "allwinner,sun5i-a13-ehci", "generic-ehci";
                        reg = <0x01c14000 0x100>;
                        interrupts = <39>;
                        clocks = <&ahb_gates 1>;
@@ -401,6 +402,7 @@
                };
 
                ohci0: usb@01c14400 {
+                       compatible = "allwinner,sun5i-a13-ohci", "generic-ohci";
                        reg = <0x01c14400 0x100>;
                        interrupts = <40>;
                        clocks = <&usb_clk 6>, <&ahb_gates 2>;