summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/sun5i-olinuxino.dts
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2012-12-12 20:08:23 +0400
committerOlof Johansson <olof@lixom.net>2012-12-17 22:04:31 +0400
commit68136b105cbb798b13e9545b9952e568d04e347c (patch)
tree4fd814c72beee32f13613b0b50d282525caf8441 /arch/arm/boot/dts/sun5i-olinuxino.dts
parent2cdda350672dc30e1530ab562f96dae4d843d145 (diff)
downloadlinux-68136b105cbb798b13e9545b9952e568d04e347c.tar.xz
ARM: sunxi: Change device tree naming scheme for sunxi
There is several different SoCs sharing the sun5i codename: A10s, A12 and A13. Since there is enough differences to not consider those the same SoCs, change a bit the naming scheme to reflect this. Moreover, some boards like the olinuxino come in A10s and A13 variants, which also share the same SoC codename. So change the naming scheme to reflect both the codename and the market name of the SoCs used in the dtsi and in the board files Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/sun5i-olinuxino.dts')
-rw-r--r--arch/arm/boot/dts/sun5i-olinuxino.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sun5i-olinuxino.dts b/arch/arm/boot/dts/sun5i-olinuxino.dts
index d6ff889a5d87..498a091a4ea2 100644
--- a/arch/arm/boot/dts/sun5i-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-olinuxino.dts
@@ -12,11 +12,11 @@
*/
/dts-v1/;
-/include/ "sun5i.dtsi"
+/include/ "sun5i-a13.dtsi"
/ {
model = "Olimex A13-Olinuxino";
- compatible = "olimex,a13-olinuxino", "allwinner,sun5i";
+ compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13";
chosen {
bootargs = "earlyprintk console=ttyS0,115200";