UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Hans de Goede 2015-03-07 20:01:19 +01:00 committed by Maxime Ripard
parent cbc8107b3e
commit 3727ed3bb3
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boot/dts/sun5i-a10s.dtsi
View File

@ -157,14 +157,6 @@
}; };
}; };
&ehci0 {
compatible = "allwinner,sun5i-a10s-ehci", "generic-ehci";
};
&ohci0 {
compatible = "allwinner,sun5i-a10s-ohci", "generic-ohci";
};
&pio { &pio {
compatible = "allwinner,sun5i-a10s-pinctrl"; compatible = "allwinner,sun5i-a10s-pinctrl";

8
arch/arm/boot/dts/sun5i-a13.dtsi
View File

@ -152,14 +152,6 @@
cooling-max-level = <5>; cooling-max-level = <5>;
}; };
&ehci0 {
compatible = "allwinner,sun5i-a13-ehci", "generic-ehci";
};
&ohci0 {
compatible = "allwinner,sun5i-a13-ohci", "generic-ohci";
};
&pio { &pio {
compatible = "allwinner,sun5i-a13-pinctrl"; compatible = "allwinner,sun5i-a13-pinctrl";

2
arch/arm/boot/dts/sun5i.dtsi
View File

@ -392,6 +392,7 @@
}; };
ehci0: usb@01c14000 { ehci0: usb@01c14000 {
compatible = "allwinner,sun5i-a13-ehci", "generic-ehci";
reg = <0x01c14000 0x100>; reg = <0x01c14000 0x100>;
interrupts = <39>; interrupts = <39>;
clocks = <&ahb_gates 1>; clocks = <&ahb_gates 1>;
@ -401,6 +402,7 @@
}; };
ohci0: usb@01c14400 { ohci0: usb@01c14400 {
compatible = "allwinner,sun5i-a13-ohci", "generic-ohci";
reg = <0x01c14400 0x100>; reg = <0x01c14400 0x100>;
interrupts = <40>; interrupts = <40>;
clocks = <&usb_clk 6>, <&ahb_gates 2>; clocks = <&usb_clk 6>, <&ahb_gates 2>;