Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e06f1a9e authored by Josh Cartwright's avatar Josh Cartwright Committed by Michal Simek
Browse files

ARM: zynq: dts: split up device tree 



The purpose of the created zynq-7000.dtsi file is to describe the
hardware common to all Zynq 7000-based boards.  Also, get rid of the
zynq-ep107 device tree, since it is not hardware anyone can purchase.

Add a zc702 dts file based on the zynq-7000.dtsi.  Add it to the
dts/Makefile so it is built with the 'dtbs' target.

Signed-off-by: default avatarJosh Cartwright <josh.cartwright@ni.com>
Acked-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent aaf5e0be

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -103,5 +103,6 @@ dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \ 
dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \

	wm8505-ref.dtb \

	wm8650-mid.dtb

dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb



endif

arch/arm/boot/dts/zynq-ep107.dts→arch/arm/boot/dts/zynq-7000.dtsi

+3 −16
Original line number Diff line number Diff line
@@ -10,29 +10,16 @@ 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

/include/ "skeleton.dtsi"



/dts-v1/;

/ {

	model = "Xilinx Zynq EP107";

	compatible = "xlnx,zynq-ep107";

	#address-cells = <1>;

	#size-cells = <1>;

	interrupt-parent = <&intc>;



	memory {

		device_type = "memory";

		reg = <0x0 0x10000000>;

	};



	chosen {

		bootargs = "console=ttyPS0,9600 root=/dev/ram rw initrd=0x800000,8M earlyprintk";

		linux,stdout-path = &uart0;

	};

	compatible = "xlnx,zynq-7000";



	amba {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		interrupt-parent = <&intc>;

		ranges;



		intc: interrupt-controller@f8f01000 {

arch/arm/boot/dts/zynq-zc702.dts

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

 *  Copyright (C) 2011 Xilinx

 *  Copyright (C) 2012 National Instruments Corp.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * 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.

 */

/dts-v1/;

/include/ "zynq-7000.dtsi"



/ {

	model = "Zynq ZC702 Development Board";

	compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";



	memory {

		device_type = "memory";

		reg = <0x0 0x40000000>;

	};



	chosen {

		bootargs = "console=ttyPS1,115200 earlyprintk";

	};



};

arch/arm/mach-zynq/common.c

+2 −1
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ static void __init xilinx_map_io(void) 
}



static const char *xilinx_dt_match[] = {

	"xlnx,zynq-ep107",

	"xlnx,zynq-zc702",

	"xlnx,zynq-7000",

	NULL

};