The zynq-7000.dtsi include does not have a qspi node in mainline kernels. To resolve this issue provide a dummy node with no properties. The dummy node does not affect the node provided by zynq-7000.dtsi in other kernels.
This was previously done in the individual device trees, instead this is now provided by a common include. Signed-off-by: Nathan Rossi <[email protected]> --- recipes-bsp/device-tree/device-tree.bb | 5 ++++- recipes-bsp/device-tree/files/common/zynq-7000-qspi-dummy.dtsi | 4 ++++ recipes-bsp/device-tree/files/microzed/microzed-zynq7.dts | 6 +----- recipes-bsp/device-tree/files/picozed/picozed-zynq7.dts | 6 +----- recipes-bsp/device-tree/files/qemu/qemuzynq.dts | 4 +--- recipes-bsp/device-tree/files/zybo-linux-bd/zybo-linux-bd-zynq7.dts | 3 ++- 6 files changed, 13 insertions(+), 15 deletions(-) create mode 100644 recipes-bsp/device-tree/files/common/zynq-7000-qspi-dummy.dtsi diff --git a/recipes-bsp/device-tree/device-tree.bb b/recipes-bsp/device-tree/device-tree.bb index 3311a6f..2573e52 100644 --- a/recipes-bsp/device-tree/device-tree.bb +++ b/recipes-bsp/device-tree/device-tree.bb @@ -22,7 +22,10 @@ DEVICETREE_PP_FLAGS ?= "-nostdinc -Ulinux \ " FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI_append_zynq = " file://common/zynq7-base.dtsi" +MACHINE_DEVICETREE_prepend_zynq = " \ + common/zynq-7000-qspi-dummy.dtsi \ + common/zynq7-base.dtsi \ + " S = "${WORKDIR}" diff --git a/recipes-bsp/device-tree/files/common/zynq-7000-qspi-dummy.dtsi b/recipes-bsp/device-tree/files/common/zynq-7000-qspi-dummy.dtsi new file mode 100644 index 0000000..d059a2d --- /dev/null +++ b/recipes-bsp/device-tree/files/common/zynq-7000-qspi-dummy.dtsi @@ -0,0 +1,4 @@ +&amba { + /* empty defintion for kernels that don't have qspi node */ + qspi: spi@e000d000 { }; +}; diff --git a/recipes-bsp/device-tree/files/microzed/microzed-zynq7.dts b/recipes-bsp/device-tree/files/microzed/microzed-zynq7.dts index 8edb932..f0de60e 100644 --- a/recipes-bsp/device-tree/files/microzed/microzed-zynq7.dts +++ b/recipes-bsp/device-tree/files/microzed/microzed-zynq7.dts @@ -1,5 +1,6 @@ /dts-v1/; /include/ "zynq-7000.dtsi" +/include/ "zynq-7000-qspi-dummy.dtsi" / { model = "Avnet microZed"; @@ -27,11 +28,6 @@ }; }; -&amba { - /* empty defintion for kernels that don't have qspi node */ - qspi: spi@e000d000 { }; -}; - &gem0 { status = "okay"; phy-mode = "rgmii-id"; diff --git a/recipes-bsp/device-tree/files/picozed/picozed-zynq7.dts b/recipes-bsp/device-tree/files/picozed/picozed-zynq7.dts index a7817cf..4ec64f5 100644 --- a/recipes-bsp/device-tree/files/picozed/picozed-zynq7.dts +++ b/recipes-bsp/device-tree/files/picozed/picozed-zynq7.dts @@ -1,5 +1,6 @@ /dts-v1/; /include/ "zynq-7000.dtsi" +/include/ "zynq-7000-qspi-dummy.dtsi" / { model = "Avnet picoZed"; @@ -27,11 +28,6 @@ }; }; -&amba { - /* empty defintion for kernels that don't have qspi node */ - qspi: spi@e000d000 { }; -}; - &gem0 { status = "okay"; phy-mode = "rgmii-id"; diff --git a/recipes-bsp/device-tree/files/qemu/qemuzynq.dts b/recipes-bsp/device-tree/files/qemu/qemuzynq.dts index 5b242c5..cd0694d 100644 --- a/recipes-bsp/device-tree/files/qemu/qemuzynq.dts +++ b/recipes-bsp/device-tree/files/qemu/qemuzynq.dts @@ -1,5 +1,6 @@ /dts-v1/; /include/ "zynq-7000.dtsi" +/include/ "zynq-7000-qspi-dummy.dtsi" / { model = "Zynq A9 QEMU"; @@ -28,9 +29,6 @@ compatible = "fixed-clock"; clock-frequency = <25000000>; }; - - /* empty defintion for kernels that don't have qspi node */ - qspi: spi@e000d000 { }; }; &gem0 { diff --git a/recipes-bsp/device-tree/files/zybo-linux-bd/zybo-linux-bd-zynq7.dts b/recipes-bsp/device-tree/files/zybo-linux-bd/zybo-linux-bd-zynq7.dts index a08959e..b31666f 100644 --- a/recipes-bsp/device-tree/files/zybo-linux-bd/zybo-linux-bd-zynq7.dts +++ b/recipes-bsp/device-tree/files/zybo-linux-bd/zybo-linux-bd-zynq7.dts @@ -1,6 +1,7 @@ /dts-v1/; /include/ "skeleton.dtsi" /include/ "zynq-7000.dtsi" +/include/ "zynq-7000-qspi-dummy.dtsi" /include/ "pcw.dtsi" /include/ "pl.dtsi" @@ -182,4 +183,4 @@ &v_tc_0 { compatible = "xlnx,v-tc-5.01.a"; -}; \ No newline at end of file +}; -- 2.8.1 -- _______________________________________________ meta-xilinx mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-xilinx
