From e8c5169c110eaf4874640b4ee62c5756000c56e4 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 12 Mar 2014 17:49:25 +1000 Subject: zc702-zynq7: Cleaned up device trees and configuration * Cleaned up device trees, refactored the dts per boot args setup Signed-off-by: Nathan Rossi --- conf/machine/boards/zc702/zc702-zynq7-board.dtsi | 145 +++++++++++++++++++++ .../machine/boards/zc702/zc702-zynq7-mmcblk0p2.dts | 11 -- conf/machine/boards/zc702/zc702-zynq7-ram.dts | 11 -- conf/machine/boards/zc702/zc702-zynq7.dts | 4 + conf/machine/boards/zc702/zc702-zynq7.dtsi | 141 -------------------- conf/machine/zc702-zynq7.conf | 10 +- 6 files changed, 153 insertions(+), 169 deletions(-) create mode 100644 conf/machine/boards/zc702/zc702-zynq7-board.dtsi delete mode 100644 conf/machine/boards/zc702/zc702-zynq7-mmcblk0p2.dts delete mode 100644 conf/machine/boards/zc702/zc702-zynq7-ram.dts create mode 100644 conf/machine/boards/zc702/zc702-zynq7.dts delete mode 100644 conf/machine/boards/zc702/zc702-zynq7.dtsi diff --git a/conf/machine/boards/zc702/zc702-zynq7-board.dtsi b/conf/machine/boards/zc702/zc702-zynq7-board.dtsi new file mode 100644 index 00000000..dfc453d5 --- /dev/null +++ b/conf/machine/boards/zc702/zc702-zynq7-board.dtsi @@ -0,0 +1,145 @@ +/* + * ZC702 DTS file header for generic boot. + */ + +/include/ "zynq-7-base.dtsi" +/ { + model = "Xilinx ZC702"; + 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"; + mdio { + phy0: phy@7 { + compatible = "marvell,88e1116r"; + device_type = "ethernet-phy"; + reg = <7>; + } ; + } ; + } ; + ps7_qspi_0: ps7-qspi@e000d000 { + flash@0 { + compatible = "n25q128"; + reg = <0x0>; + 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 { + compatible = "si570"; + 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@54 { + compatible = "nxp,pcf8563"; + reg = <0x51>; + }; + }; + + i2c@7 { + #address-cells = <1>; + #size-cells = <0>; + reg = <7>; + hwmon@52 { + compatible = "pmbus,ucd9248"; + reg = <52>; + }; + hwmon@53 { + compatible = "pmbus,ucd9248"; + reg = <53>; + }; + hwmon@54 { + compatible = "pmbus,ucd9248"; + reg = <54>; + }; + }; + }; + }; + ps7_gpio_0: ps7-gpio@e000a000 { + gpio-mask-high = <0x0>; + gpio-mask-low = <0x5600>; + } ; + ps7_usb_0: ps7-usb@e0002000 { + usb-reset = <&ps7_gpio_0 7 0>; /* MIO USB PHY Reset */ + } ; + + /* 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"; }; + } ; +} ; diff --git a/conf/machine/boards/zc702/zc702-zynq7-mmcblk0p2.dts b/conf/machine/boards/zc702/zc702-zynq7-mmcblk0p2.dts deleted file mode 100644 index 9646ce1f..00000000 --- a/conf/machine/boards/zc702/zc702-zynq7-mmcblk0p2.dts +++ /dev/null @@ -1,11 +0,0 @@ -/* - * ZC702 DTS file header for sdcard/mmc partition 2 boot. - */ - -/dts-v1/; -/include/ "zc702-zynq7.dtsi" -/ { - chosen { - bootargs = "console=ttyPS0,115200 root=/dev/mmcblk0p2 ro earlyprintk"; - } ; -} ; diff --git a/conf/machine/boards/zc702/zc702-zynq7-ram.dts b/conf/machine/boards/zc702/zc702-zynq7-ram.dts deleted file mode 100644 index c235298f..00000000 --- a/conf/machine/boards/zc702/zc702-zynq7-ram.dts +++ /dev/null @@ -1,11 +0,0 @@ -/* - * ZC702 DTS file header for ramdisk boot. - */ - -/dts-v1/; -/include/ "zc702-zynq7.dtsi" -/ { - chosen { - bootargs = "console=ttyPS0,115200 root=/dev/ram rw earlyprintk"; - } ; -} ; diff --git a/conf/machine/boards/zc702/zc702-zynq7.dts b/conf/machine/boards/zc702/zc702-zynq7.dts new file mode 100644 index 00000000..6dea1a53 --- /dev/null +++ b/conf/machine/boards/zc702/zc702-zynq7.dts @@ -0,0 +1,4 @@ +/dts-v1/; +/include/ "zc702-zynq7-board.dtsi" +/ { +} ; \ No newline at end of file diff --git a/conf/machine/boards/zc702/zc702-zynq7.dtsi b/conf/machine/boards/zc702/zc702-zynq7.dtsi deleted file mode 100644 index da746fcd..00000000 --- a/conf/machine/boards/zc702/zc702-zynq7.dtsi +++ /dev/null @@ -1,141 +0,0 @@ -/include/ "zynq-7-base.dtsi" -/ { - model = "Xilinx ZC702"; - chosen { - bootargs = "console=ttyPS0,115200 earlyprintk"; - 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"; - mdio { - phy0: phy@7 { - compatible = "marvell,88e1116r"; - device_type = "ethernet-phy"; - reg = <7>; - } ; - } ; - } ; - ps7_qspi_0: ps7-qspi@e000d000 { - flash@0 { - compatible = "n25q128"; - reg = <0x0>; - 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 { - compatible = "si570"; - 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@54 { - compatible = "nxp,pcf8563"; - reg = <0x51>; - }; - }; - - i2c@7 { - #address-cells = <1>; - #size-cells = <0>; - reg = <7>; - hwmon@52 { - compatible = "pmbus,ucd9248"; - reg = <52>; - }; - hwmon@53 { - compatible = "pmbus,ucd9248"; - reg = <53>; - }; - hwmon@54 { - compatible = "pmbus,ucd9248"; - reg = <54>; - }; - }; - }; - }; - ps7_gpio_0: ps7-gpio@e000a000 { - gpio-mask-high = <0x0>; - gpio-mask-low = <0x5600>; - } ; - ps7_usb_0: ps7-usb@e0002000 { - usb-reset = <&ps7_gpio_0 7 0>; /* MIO USB PHY Reset */ - } ; - - /* 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"; }; - } ; -} ; diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf index ce18e052..10984e7c 100644 --- a/conf/machine/zc702-zynq7.conf +++ b/conf/machine/zc702-zynq7.conf @@ -9,9 +9,6 @@ # For the FSBL 'zynq_fsbl_0.elf' refer to UG873 and the associated design files. # -PREFERRED_VERSION_linux-xlnx ?= "3.8%" -PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%" - require conf/machine/include/tune-zynq.inc require conf/machine/include/machine-xilinx-default.inc @@ -20,8 +17,9 @@ UBOOT_MACHINE = "zynq_zc70x_config" SERIAL_CONSOLE = "115200 ttyPS0" -MACHINE_DEVICETREE := "zc702/zc702-zynq7.dtsi \ - zc702/zc702-zynq7-ram.dts \ - zc702/zc702-zynq7-mmcblk0p2.dts" +MACHINE_DEVICETREE := " \ + zc702/zc702-zynq7-board.dtsi \ + zc702/zc702-zynq7.dts \ + " MACHINE_KCONFIG := "common/rtc.cfg" -- cgit v1.2.3-54-g00ecf