zc706-zynq7: Switch over to in kernel device tree

* Switch to the device tree that is available in the kernel source tree * Remove the in layer device tree and configuration for the in layer device tree Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
author: Nathan Rossi <nathan@nathanrossi.com> 2016-02-24 16:44:53 +1000
committer: Nathan Rossi <nathan@nathanrossi.com> 2016-03-06 20:04:03 +1000
commit: cad8934cba1ba92a612462ad6fa83b50116668a4 (patch)
tree: a01e180782d3f70676736a1e6e4d41427d8b7910
parent: d82cef3dca9749f385a16f506ca285f963584e3c (diff)
download: meta-xilinx-cad8934cba1ba92a612462ad6fa83b50116668a4.tar.gz
3 files changed, 2 insertions, 154 deletions
diff --git a/conf/machine/boards/zc706/zc706-zynq7-board.dtsi b/conf/machine/boards/zc706/zc706-zynq7-board.dtsi
deleted file mode 100644
index 01631695..00000000
--- a/conf/machine/boards/zc706/zc706-zynq7-board.dtsi
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * ZC706 DTS file header for generic boot.
- */
-/ {
-        model = "Xilinx ZC706";
-        chosen {
-                bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/ram rw";
-                linux,stdout-path = "/amba@0/serial@e0001000";
-        } ;
-        ps7_ddr_0: memory@0 {
-                device_type = "memory";
-                reg = <0x0 0x40000000>;
-        } ;
-        ps7_axi_interconnect_0: amba@0 {
-                ps7_ethernet_0: ps7-ethernet@e000b000 {
-                        phy-handle = <&phy0>;
-                        phy-mode = "rgmii-id";
-                        phy0: phy@7 {
-                                compatible = "marvell,88e1116r";
-                                device_type = "ethernet-phy";
-                                reg = <7>;
-                        } ;
-                } ;
-                ps7_qspi_0: ps7-qspi@e000d000 {
-                        is-dual = <1>;
-                        xlnx,qspi-mode = <0x2>;
-                        flash@0 {
-                                compatible = "micron,m25p80", "spansion,s25fl128s", "jedec,spi-nor";
-                                reg = <0x0>;
-                                spi-tx-bus-width = <1>;
-                                spi-rx-bus-width = <4>;
-                                spi-max-frequency = <50000000>;
-                                #address-cells = <1>;
-                                #size-cells = <1>;
-                                partition@qspi-fsbl-uboot {
-                                        label = "qspi-fsbl-uboot";
-                                        reg = <0x0 0x100000>;
-                                };
-                                partition@qspi-linux {
-                                        label = "qspi-linux";
-                                        reg = <0x100000 0x500000>;
-                                };
-                                partition@qspi-device-tree {
-                                        label = "qspi-device-tree";
-                                        reg = <0x600000 0x20000>;
-                                };
-                                partition@qspi-rootfs {
-                                        label = "qspi-rootfs";
-                                        reg = <0x620000 0x5E0000>;
-                                };
-                                partition@qspi-bitstream {
-                                        label = "qspi-bitstream";
-                                        reg = <0xC00000 0x400000>;
-                                };
-                        };
-                } ;
-                ps7_i2c_0: ps7-i2c@e0004000 {
-                        /* I2C Switch */
-                        i2cswitch@74 {
-                                compatible = "nxp,pca9548";
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-                                reg = <0x74>;
-                                i2c@0 {
-                                        #address-cells = <1>;
-                                        #size-cells = <0>;
-                                        reg = <0>;
-                                        osc@5d {
-                                                #clock-cells = <0>;
-                                                compatible = "silabs,si570";
-                                                temperature-stability = <50>;
-                                                reg = <0x5d>;
-                                                factory-fout = <156250000>;
-                                                initial-fout = <148500000>;
-                                        };
-                                };
-                                i2c@2 {
-                                        #address-cells = <1>;
-                                        #size-cells = <0>;
-                                        reg = <2>;
-                                        eeprom@54 {
-                                                compatible = "at,24c08";
-                                                reg = <0x54>;
-                                        };
-                                };
-                                i2c@3 {
-                                        #address-cells = <1>;
-                                        #size-cells = <0>;
-                                        reg = <3>;
-                                        gpio@21 {
-                                                compatible = "ti,tca6416";
-                                                reg = <0x21>;
-                                                gpio-controller;
-                                                #gpio-cells = <2>;
-                                        };
-                                };
-                                i2c@4 {
-                                        #address-cells = <1>;
-                                        #size-cells = <0>;
-                                        reg = <4>;
-                                        rtc@51 {
-                                                compatible = "nxp,pcf8563";
-                                                reg = <0x51>;
-                                        };
-                                };
-                                i2c@7 {
-                                        #address-cells = <1>;
-                                        #size-cells = <0>;
-                                        reg = <7>;
-                                        ucd90120@65 {
-                                                compatible = "pmbus,ucd90120";
-                                                reg = <0x65>;
-                                        };
-                                };
-                        };
-                };
-                ps7_usb_0: ps7-usb@e0002000 {
-                        xlnx,phy-reset-gpio = <&ps7_gpio_0 7 0>; /* MIO USB PHY Reset */
-                        usb-phy = <&usb0_phy>;
-                } ;
-                /* Disabled Devices */
-                ps7_sd_1: ps7-sdio@e0101000 { compatible = "invalid"; };
-                ps7_uart_0: serial@e0000000 { compatible = "invalid"; };
-                ps7_ethernet_1: ps7-ethernet@e000c000 { compatible = "invalid"; };
-                ps7_i2c_1: ps7-i2c@e0005000 { compatible = "invalid"; };
-                ps7_can_0: ps7-can@e0008000 { compatible = "invalid"; };
-                ps7_can_1: ps7-can@e0009000 { compatible = "invalid"; };
-                ps7_usb_1: ps7-usb@e0003000 { compatible = "invalid"; };
-        } ;
-        usb0_phy: usb-phy {
-                #phy-cells = <0>;
-                compatible = "usb-nop-xceiv";
-                reset-gpios = <&ps7_gpio_0 7 1>; /* MIO 7, GPIO_ACTIVE_LOW */
-        } ;
-} ;
diff --git a/conf/machine/boards/zc706/zc706-zynq7.dts b/conf/machine/boards/zc706/zc706-zynq7.dts
deleted file mode 100644
index 654986e4..00000000
--- a/conf/machine/boards/zc706/zc706-zynq7.dts
+++ /dev/null
@@ -1,5 +0,0 @@
-/dts-v1/;
-/include/ "zynq7-base.dtsi"
-/include/ "zc706-zynq7-board.dtsi"
-/ {
-} ;
-\ No newline at end of file
diff --git a/conf/machine/zc706-zynq7.conf b/conf/machine/zc706-zynq7.conf
index 07001424..7f97addf 100644
--- a/conf/machine/zc706-zynq7.conf
+++ b/conf/machine/zc706-zynq7.conf
@@ -15,16 +15,12 @@ require conf/machine/include/machine-xilinx-board.inc
 MACHINE_FEATURES = "rtc ext2 vfat usbhost usbgadget"
-# ZC706 machine definition known by Xilinx UBOOT
+# u-boot configuration
 UBOOT_MACHINE = "zynq_zc706_config"
 SPL_BINARY = "boot.bin"
 SERIAL_CONSOLE = "115200 ttyPS0"
-MACHINE_DEVICETREE := " \
+KERNEL_DEVICETREE = "zynq-zc706.dtb"
-                zc706/zc706-zynq7-board.dtsi \
-                zc706/zc706-zynq7.dts \
-                "
 KERNEL_FEATURES += "features/rtc/rtc.scc"
author	Nathan Rossi <nathan@nathanrossi.com>	2016-02-24 16:44:53 +1000
committer	Nathan Rossi <nathan@nathanrossi.com>	2016-03-06 20:04:03 +1000
commit	cad8934cba1ba92a612462ad6fa83b50116668a4 (patch)
tree	a01e180782d3f70676736a1e6e4d41427d8b7910
parent	d82cef3dca9749f385a16f506ca285f963584e3c (diff)
download	meta-xilinx-cad8934cba1ba92a612462ad6fa83b50116668a4.tar.gz

diff --git a/conf/machine/boards/zc706/zc706-zynq7-board.dtsi b/conf/machine/boards/zc706/zc706-zynq7-board.dtsi deleted file mode 100644 index 01631695..00000000 --- a/conf/machine/boards/zc706/zc706-zynq7-board.dtsi +++ /dev/null
@@ -1,143 +0,0 @@
1	/*
2	* ZC706 DTS file header for generic boot.
3	*/
4
5	/ {
6	model = "Xilinx ZC706";
7	chosen {
8	bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/ram rw";
9	linux,stdout-path = "/amba@0/serial@e0001000";
10	} ;
11	ps7_ddr_0: memory@0 {
12	device_type = "memory";
13	reg = <0x0 0x40000000>;
14	} ;
15	ps7_axi_interconnect_0: amba@0 {
16	ps7_ethernet_0: ps7-ethernet@e000b000 {
17	phy-handle = <&phy0>;
18	phy-mode = "rgmii-id";
19	phy0: phy@7 {
20	compatible = "marvell,88e1116r";
21	device_type = "ethernet-phy";
22	reg = <7>;
23	} ;
24	} ;
25	ps7_qspi_0: ps7-qspi@e000d000 {
26	is-dual = <1>;
27	xlnx,qspi-mode = <0x2>;
28	flash@0 {
29	compatible = "micron,m25p80", "spansion,s25fl128s", "jedec,spi-nor";
30	reg = <0x0>;
31	spi-tx-bus-width = <1>;
32	spi-rx-bus-width = <4>;
33	spi-max-frequency = <50000000>;
34	#address-cells = <1>;
35	#size-cells = <1>;
36	partition@qspi-fsbl-uboot {
37	label = "qspi-fsbl-uboot";
38	reg = <0x0 0x100000>;
39	};
40	partition@qspi-linux {
41	label = "qspi-linux";
42	reg = <0x100000 0x500000>;
43	};
44	partition@qspi-device-tree {
45	label = "qspi-device-tree";
46	reg = <0x600000 0x20000>;
47	};
48	partition@qspi-rootfs {
49	label = "qspi-rootfs";
50	reg = <0x620000 0x5E0000>;
51	};
52	partition@qspi-bitstream {
53	label = "qspi-bitstream";
54	reg = <0xC00000 0x400000>;
55	};
56	};
57	} ;
58	ps7_i2c_0: ps7-i2c@e0004000 {
59	/* I2C Switch */
60	i2cswitch@74 {
61	compatible = "nxp,pca9548";
62	#address-cells = <1>;
63	#size-cells = <0>;
64	reg = <0x74>;
65
66	i2c@0 {
67	#address-cells = <1>;
68	#size-cells = <0>;
69	reg = <0>;
70	osc@5d {
71	#clock-cells = <0>;
72	compatible = "silabs,si570";
73	temperature-stability = <50>;
74	reg = <0x5d>;
75	factory-fout = <156250000>;
76	initial-fout = <148500000>;
77	};
78	};
79
80	i2c@2 {
81	#address-cells = <1>;
82	#size-cells = <0>;
83	reg = <2>;
84	eeprom@54 {
85	compatible = "at,24c08";
86	reg = <0x54>;
87	};
88	};
89
90	i2c@3 {
91	#address-cells = <1>;
92	#size-cells = <0>;
93	reg = <3>;
94	gpio@21 {
95	compatible = "ti,tca6416";
96	reg = <0x21>;
97	gpio-controller;
98	#gpio-cells = <2>;
99	};
100	};
101
102	i2c@4 {
103	#address-cells = <1>;
104	#size-cells = <0>;
105	reg = <4>;
106	rtc@51 {
107	compatible = "nxp,pcf8563";
108	reg = <0x51>;
109	};
110	};
111
112	i2c@7 {
113	#address-cells = <1>;
114	#size-cells = <0>;
115	reg = <7>;
116	ucd90120@65 {
117	compatible = "pmbus,ucd90120";
118	reg = <0x65>;
119	};
120	};
121	};
122	};
123	ps7_usb_0: ps7-usb@e0002000 {
124	xlnx,phy-reset-gpio = <&ps7_gpio_0 7 0>; /* MIO USB PHY Reset */
125	usb-phy = <&usb0_phy>;
126	} ;
127
128	/* Disabled Devices */
129	ps7_sd_1: ps7-sdio@e0101000 { compatible = "invalid"; };
130	ps7_uart_0: serial@e0000000 { compatible = "invalid"; };
131	ps7_ethernet_1: ps7-ethernet@e000c000 { compatible = "invalid"; };
132	ps7_i2c_1: ps7-i2c@e0005000 { compatible = "invalid"; };
133	ps7_can_0: ps7-can@e0008000 { compatible = "invalid"; };
134	ps7_can_1: ps7-can@e0009000 { compatible = "invalid"; };
135	ps7_usb_1: ps7-usb@e0003000 { compatible = "invalid"; };
136	} ;
137
138	usb0_phy: usb-phy {
139	#phy-cells = <0>;
140	compatible = "usb-nop-xceiv";
141	reset-gpios = <&ps7_gpio_0 7 1>; /* MIO 7, GPIO_ACTIVE_LOW */
142	} ;
143	} ;


diff --git a/conf/machine/boards/zc706/zc706-zynq7.dts b/conf/machine/boards/zc706/zc706-zynq7.dts deleted file mode 100644 index 654986e4..00000000 --- a/conf/machine/boards/zc706/zc706-zynq7.dts +++ /dev/null
@@ -1,5 +0,0 @@
1	/dts-v1/;
2	/include/ "zynq7-base.dtsi"
3	/include/ "zc706-zynq7-board.dtsi"
4	/ {
5	} ; \ No newline at end of file


diff --git a/conf/machine/zc706-zynq7.conf b/conf/machine/zc706-zynq7.conf index 07001424..7f97addf 100644 --- a/conf/machine/zc706-zynq7.conf +++ b/conf/machine/zc706-zynq7.conf
@@ -15,16 +15,12 @@ require conf/machine/include/machine-xilinx-board.inc
15		15
16	MACHINE_FEATURES = "rtc ext2 vfat usbhost usbgadget"	16	MACHINE_FEATURES = "rtc ext2 vfat usbhost usbgadget"
17		17
18	# ZC706 machine definition known by Xilinx UBOOT	18	# u-boot configuration
19	UBOOT_MACHINE = "zynq_zc706_config"	19	UBOOT_MACHINE = "zynq_zc706_config"
20	SPL_BINARY = "boot.bin"	20	SPL_BINARY = "boot.bin"
21		21
22	SERIAL_CONSOLE = "115200 ttyPS0"	22	SERIAL_CONSOLE = "115200 ttyPS0"
23		23
24	MACHINE_DEVICETREE := " \	24	KERNEL_DEVICETREE = "zynq-zc706.dtb"
25	zc706/zc706-zynq7-board.dtsi \
26	zc706/zc706-zynq7.dts \
27	"
28
29	KERNEL_FEATURES += "features/rtc/rtc.scc"	25	KERNEL_FEATURES += "features/rtc/rtc.scc"
30		26