From 434e1c574cc304eaff630f4e92ed239f7886815f Mon Sep 17 00:00:00 2001 From: Barry Song Date: Thu, 23 Aug 2012 10:47:53 +0800 Subject: [PATCH] ARM: PRIMA2: rename prima2-cb.dts to prima2.dtsi as it only has SoC features The current prima2-cb.dts only includes prima2 SoC feature without board- specific descriptions. This patches rename it to dtsi and clean some useless content. Signed-off-by: Barry Song Acked-by: Linus Walleij --- .../boot/dts/{prima2-cb.dts => prima2.dtsi} | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) rename arch/arm/boot/dts/{prima2-cb.dts => prima2.dtsi} (96%) diff --git a/arch/arm/boot/dts/prima2-cb.dts b/arch/arm/boot/dts/prima2.dtsi similarity index 96% rename from arch/arm/boot/dts/prima2-cb.dts rename to arch/arm/boot/dts/prima2.dtsi index 4245306d60e1..1b716aae64f7 100644 --- a/arch/arm/boot/dts/prima2-cb.dts +++ b/arch/arm/boot/dts/prima2.dtsi @@ -1,20 +1,18 @@ -/dts-v1/; +/* + * DTS file for CSR SiRFprimaII SoC + * + * Copyright (c) 2012 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +/include/ "skeleton.dtsi" / { - model = "SiRF Prima2 eVB"; - compatible = "sirf,prima2-cb", "sirf,prima2"; + compatible = "sirf,prima2"; #address-cells = <1>; #size-cells = <1>; interrupt-parent = <&intc>; - memory { - reg = <0x00000000 0x20000000>; - }; - - chosen { - bootargs = "mem=512M real_root=/dev/mmcblk0p2 console=ttyS0 panel=1 bootsplash=true bpp=16 androidboot.console=ttyS1"; - linux,stdout-path = &uart1; - }; - cpus { #address-cells = <1>; #size-cells = <0>; -- 2.34.1