From febd41d59dc4a8125b1b5fd0b947ab795bfe4aa5 Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Wed, 12 Dec 2012 17:08:23 +0100 Subject: ARM: sunxi: rename device tree source files This is the rename portion of "ARM: sunxi: Change device tree naming scheme for sunxi" that were missed when the patch was applied. Signed-off-by: Olof Johansson --- arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 38 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/sun4i-a10.dtsi | 19 +++++++++++++++ arch/arm/boot/dts/sun4i-cubieboard.dts | 38 ------------------------------ arch/arm/boot/dts/sun4i.dtsi | 19 --------------- arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 30 +++++++++++++++++++++++ arch/arm/boot/dts/sun5i-a13.dtsi | 20 ++++++++++++++++ arch/arm/boot/dts/sun5i-olinuxino.dts | 30 ----------------------- arch/arm/boot/dts/sun5i.dtsi | 20 ---------------- 8 files changed, 107 insertions(+), 107 deletions(-) create mode 100644 arch/arm/boot/dts/sun4i-a10-cubieboard.dts create mode 100644 arch/arm/boot/dts/sun4i-a10.dtsi delete mode 100644 arch/arm/boot/dts/sun4i-cubieboard.dts delete mode 100644 arch/arm/boot/dts/sun4i.dtsi create mode 100644 arch/arm/boot/dts/sun5i-a13-olinuxino.dts create mode 100644 arch/arm/boot/dts/sun5i-a13.dtsi delete mode 100644 arch/arm/boot/dts/sun5i-olinuxino.dts delete mode 100644 arch/arm/boot/dts/sun5i.dtsi (limited to 'arch') diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts new file mode 100644 index 000000000000..5cab82540437 --- /dev/null +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts @@ -0,0 +1,38 @@ +/* + * Copyright 2012 Stefan Roese + * Stefan Roese + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +/include/ "sun4i-a10.dtsi" + +/ { + model = "Cubietech Cubieboard"; + compatible = "cubietech,a10-cubieboard", "allwinner,sun4i-a10"; + + aliases { + serial0 = &uart0; + serial1 = &uart1; + }; + + chosen { + bootargs = "earlyprintk console=ttyS0,115200"; + }; + + soc { + uart0: uart@01c28000 { + status = "okay"; + }; + + uart1: uart@01c28400 { + status = "okay"; + }; + }; +}; diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi new file mode 100644 index 000000000000..e61fdd47bd01 --- /dev/null +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -0,0 +1,19 @@ +/* + * Copyright 2012 Stefan Roese + * Stefan Roese + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/include/ "sunxi.dtsi" + +/ { + memory { + reg = <0x40000000 0x80000000>; + }; +}; diff --git a/arch/arm/boot/dts/sun4i-cubieboard.dts b/arch/arm/boot/dts/sun4i-cubieboard.dts deleted file mode 100644 index 5cab82540437..000000000000 --- a/arch/arm/boot/dts/sun4i-cubieboard.dts +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2012 Stefan Roese - * Stefan Roese - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -/include/ "sun4i-a10.dtsi" - -/ { - model = "Cubietech Cubieboard"; - compatible = "cubietech,a10-cubieboard", "allwinner,sun4i-a10"; - - aliases { - serial0 = &uart0; - serial1 = &uart1; - }; - - chosen { - bootargs = "earlyprintk console=ttyS0,115200"; - }; - - soc { - uart0: uart@01c28000 { - status = "okay"; - }; - - uart1: uart@01c28400 { - status = "okay"; - }; - }; -}; diff --git a/arch/arm/boot/dts/sun4i.dtsi b/arch/arm/boot/dts/sun4i.dtsi deleted file mode 100644 index e61fdd47bd01..000000000000 --- a/arch/arm/boot/dts/sun4i.dtsi +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2012 Stefan Roese - * Stefan Roese - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/include/ "sunxi.dtsi" - -/ { - memory { - reg = <0x40000000 0x80000000>; - }; -}; diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts new file mode 100644 index 000000000000..498a091a4ea2 --- /dev/null +++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts @@ -0,0 +1,30 @@ +/* + * Copyright 2012 Maxime Ripard + * + * Maxime Ripard + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +/include/ "sun5i-a13.dtsi" + +/ { + model = "Olimex A13-Olinuxino"; + compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13"; + + chosen { + bootargs = "earlyprintk console=ttyS0,115200"; + }; + + soc { + uart1: uart@01c28400 { + status = "okay"; + }; + }; +}; diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi new file mode 100644 index 000000000000..59a2d265a98e --- /dev/null +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -0,0 +1,20 @@ +/* + * Copyright 2012 Maxime Ripard + * + * Maxime Ripard + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/include/ "sunxi.dtsi" + +/ { + memory { + reg = <0x40000000 0x20000000>; + }; +}; diff --git a/arch/arm/boot/dts/sun5i-olinuxino.dts b/arch/arm/boot/dts/sun5i-olinuxino.dts deleted file mode 100644 index 498a091a4ea2..000000000000 --- a/arch/arm/boot/dts/sun5i-olinuxino.dts +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2012 Maxime Ripard - * - * Maxime Ripard - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -/include/ "sun5i-a13.dtsi" - -/ { - model = "Olimex A13-Olinuxino"; - compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13"; - - chosen { - bootargs = "earlyprintk console=ttyS0,115200"; - }; - - soc { - uart1: uart@01c28400 { - status = "okay"; - }; - }; -}; diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi deleted file mode 100644 index 59a2d265a98e..000000000000 --- a/arch/arm/boot/dts/sun5i.dtsi +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012 Maxime Ripard - * - * Maxime Ripard - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/include/ "sunxi.dtsi" - -/ { - memory { - reg = <0x40000000 0x20000000>; - }; -}; -- cgit v1.2.3