mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
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: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
This commit is contained in:
parent
159c7f8949
commit
071fb4cbe0
3 changed files with 41 additions and 21 deletions
|
@ -211,7 +211,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
|
||||||
r8a73a4-ape6evm-reference.dtb \
|
r8a73a4-ape6evm-reference.dtb \
|
||||||
sh7372-mackerel.dtb
|
sh7372-mackerel.dtb
|
||||||
dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d-reference.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
|
socfpga_vt.dtb
|
||||||
dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
|
dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
|
||||||
spear1340-evb.dtb
|
spear1340-evb.dtb
|
||||||
|
|
|
@ -19,26 +19,6 @@
|
||||||
/include/ "socfpga.dtsi"
|
/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 {
|
soc {
|
||||||
clkmgr@ffd04000 {
|
clkmgr@ffd04000 {
|
||||||
clocks {
|
clocks {
|
40
arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
Normal file
40
arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
/*
|
||||||
|
* 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;
|
||||||
|
};
|
||||||
|
};
|
Loading…
Reference in a new issue