Commit 071fb4cb authored by Steffen Trumtrar's avatar Steffen Trumtrar Committed by Dinh Nguyen
Browse files

ARM: socfpga: dts: Move common nodes to cyclone5 dtsi 



The current socfpga_cyclone5.dts describes the Altera Cyclone5 SoC Development
Kit. The Cyclone5 includes a SoCFPGA, which itself can be included in other
SoC+FPGA combinations.

Instead of having to describe all Cyclone5 common nodes in every board specific
dts, move socfpga_cyclone5.dts to a dtsi and include this in a new dts for the
Development Kit.

[Dinh Nguyen] - Changed to 115200 for baudrate in dts bootargs

Signed-off-by: default avatarSteffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: default avatarDinh Nguyen <dinguyen@altera.com>
parent 159c7f89

arch/arm/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ 
	r8a73a4-ape6evm-reference.dtb \

	sh7372-mackerel.dtb

dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d-reference.dtb

dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \

dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5_socdk.dtb \

	socfpga_vt.dtb

dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \

	spear1340-evb.dtb

arch/arm/boot/dts/socfpga_cyclone5.dts→arch/arm/boot/dts/socfpga_cyclone5.dtsi

+0 −20
Original line number Diff line number Diff line
@@ -19,26 +19,6 @@ 
/include/ "socfpga.dtsi"



/ {

	model = "Altera SOCFPGA Cyclone V";

	compatible = "altr,socfpga-cyclone5", "altr,socfpga";



	chosen {

		bootargs = "console=ttyS0,57600";

	};



	memory {

		name = "memory";

		device_type = "memory";

		reg = <0x0 0x40000000>; /* 1GB */

	};



	aliases {

		/* this allow the ethaddr uboot environmnet variable contents

		 * to be added to the gmac1 device tree blob.

		 */

		ethernet0 = &gmac1;

	};



	soc {

		clkmgr@ffd04000 {

			clocks {

arch/arm/boot/dts/socfpga_cyclone5_socdk.dts

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 *  Copyright (C) 2012 Altera Corporation <www.altera.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



/include/ "socfpga_cyclone5.dtsi"



/ {

	model = "Altera SOCFPGA Cyclone V SoC Development Kit";

	compatible = "altr,socfpga-cyclone5", "altr,socfpga";



	chosen {

		bootargs = "console=ttyS0,115200";

	};



	memory {

		name = "memory";

		device_type = "memory";

		reg = <0x0 0x40000000>; /* 1GB */

	};



	aliases {

		/* this allow the ethaddr uboot environmnet variable contents

		 * to be added to the gmac1 device tree blob.

		 */

		ethernet0 = &gmac1;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE