| Message ID | 1355325915-22375-1-git-send-email-maxime.ripard@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Dec 12, 2012 at 04:25:15PM +0100, Maxime Ripard wrote: > 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. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Hi, Applied in fixes for 3.8, since it makes sense to take care of the rename right after introduction before it's out in a release with the other name. -Olof
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi similarity index 100% rename from arch/arm/boot/dts/sun5i.dtsi rename to arch/arm/boot/dts/sun5i-a13.dtsi diff --git a/arch/arm/boot/dts/sun5i-olinuxino.dts b/arch/arm/boot/dts/sun5i-olinuxino.dts index d6ff889..498a091 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";
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. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/{sun5i.dtsi => sun5i-a13.dtsi} | 0 arch/arm/boot/dts/sun5i-olinuxino.dts | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/boot/dts/{sun5i.dtsi => sun5i-a13.dtsi} (100%)