diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2015-03-07 20:01:19 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-04-27 08:20:25 +0200 |
| commit | 3727ed3bb3c531650e4e65a46b4b5eb3176c5da9 (patch) | |
| tree | ede37c0c58a8f8166e8289f7c111565afa1a173c /arch | |
| parent | cbc8107b3e44d86dc7a569c5ae42423cb95bc4a5 (diff) | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/sun5i-a10s.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun5i-a13.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun5i.dtsi | 2 |
3 files changed, 2 insertions, 16 deletions
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi index ef516db5852d..a78c95dfb33f 100644 --- 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 39264f7c7ae6..0188deed6f75 100644 --- 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 e42cbb03620f..343ba1133bda 100644 --- 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>; |