From cad8934cba1ba92a612462ad6fa83b50116668a4 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 24 Feb 2016 16:44:53 +1000 Subject: 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 --- conf/machine/boards/zc706/zc706-zynq7-board.dtsi | 143 ----------------------- conf/machine/boards/zc706/zc706-zynq7.dts | 5 - conf/machine/zc706-zynq7.conf | 8 +- 3 files changed, 2 insertions(+), 154 deletions(-) delete mode 100644 conf/machine/boards/zc706/zc706-zynq7-board.dtsi delete mode 100644 conf/machine/boards/zc706/zc706-zynq7.dts 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 := " \ - zc706/zc706-zynq7-board.dtsi \ - zc706/zc706-zynq7.dts \ - " - +KERNEL_DEVICETREE = "zynq-zc706.dtb" KERNEL_FEATURES += "features/rtc/rtc.scc" -- cgit v1.2.3-54-g00ecf