From 4212d6a16dfdd058a912bd673d98badc5227c537 Mon Sep 17 00:00:00 2001 From: Tom Curran Date: Wed, 7 Apr 2021 14:07:58 -0400 Subject: [PATCH] Fix QSPI devicetree node for Zynq BSPs --- .../files/minized-sbc/system-bsp.dtsi | 29 ++++++++++--------- .../files/mz7010-som/system-bsp.dtsi | 11 ++++++- .../files/mz7020-som/system-bsp.dtsi | 9 +++++- .../files/pz7010-fmc2/system-bsp.dtsi | 29 ++++++++++--------- .../files/pz7015-fmc2/system-bsp.dtsi | 29 ++++++++++--------- .../files/pz7020-fmc2/system-bsp.dtsi | 29 ++++++++++--------- .../files/pz7030-fmc2/system-bsp.dtsi | 29 ++++++++++--------- 7 files changed, 93 insertions(+), 72 deletions(-) diff --git a/recipes-bsp/device-tree/files/minized-sbc/system-bsp.dtsi b/recipes-bsp/device-tree/files/minized-sbc/system-bsp.dtsi index 3694a756..3ea24fb9 100644 --- a/recipes-bsp/device-tree/files/minized-sbc/system-bsp.dtsi +++ b/recipes-bsp/device-tree/files/minized-sbc/system-bsp.dtsi @@ -44,21 +44,22 @@ usb-phy = <&usb_phy0>; } ; -/* QSPI addresses are defined with petalinux-config, but here they are overwritten so that one can program the flash internally */ +/* QSPI partitions are defined with petalinux-config and described in system.conf.dtsi */ &qspi { - #address-cells = <1>; - #size-cells = <0>; - flash0: flash@0 { - compatible = "micron,m25p80"; - reg = <0x0>; - #address-cells = <1>; - #size-cells = <1>; - spi-max-frequency = <50000000>; - partition@0 { - label = "boot"; - reg = <0x00000000 0x00ff0000>; - }; - }; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + is-dual = <0>; + num-cs = <1>; + flash0: flash@0 { + compatible = "n25q128a11"; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <50000000>; + #address-cells = <1>; + #size-cells = <1>; + }; }; /* SD Interface for Wi-Fi Module */ diff --git a/recipes-bsp/device-tree/files/mz7010-som/system-bsp.dtsi b/recipes-bsp/device-tree/files/mz7010-som/system-bsp.dtsi index 3d6d1e8d..7fab47e2 100644 --- a/recipes-bsp/device-tree/files/mz7010-som/system-bsp.dtsi +++ b/recipes-bsp/device-tree/files/mz7010-som/system-bsp.dtsi @@ -41,6 +41,7 @@ }; }; + &gem0 { status = "okay"; phy-handle = <&phy0>; @@ -70,17 +71,25 @@ }; +/* QSPI partitions are defined with petalinux-config and described in system.conf.dtsi */ &qspi { #address-cells = <1>; #size-cells = <0>; + status = "okay"; + is-dual = <0>; + num-cs = <1>; flash0: flash@0 { - compatible = "micron,m25p80"; + compatible = "n25q128a11"; reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <50000000>; #address-cells = <1>; #size-cells = <1>; }; }; + / { usb_phy0:usb_phy@0 { compatible="usb-nop-xceiv"; diff --git a/recipes-bsp/device-tree/files/mz7020-som/system-bsp.dtsi b/recipes-bsp/device-tree/files/mz7020-som/system-bsp.dtsi index 3d6d1e8d..054a2dd5 100644 --- a/recipes-bsp/device-tree/files/mz7020-som/system-bsp.dtsi +++ b/recipes-bsp/device-tree/files/mz7020-som/system-bsp.dtsi @@ -70,12 +70,19 @@ }; +/* QSPI partitions are defined with petalinux-config and described in system.conf.dtsi */ &qspi { #address-cells = <1>; #size-cells = <0>; + status = "okay"; + is-dual = <0>; + num-cs = <1>; flash0: flash@0 { - compatible = "micron,m25p80"; + compatible = "n25q128a11"; reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <50000000>; #address-cells = <1>; #size-cells = <1>; }; diff --git a/recipes-bsp/device-tree/files/pz7010-fmc2/system-bsp.dtsi b/recipes-bsp/device-tree/files/pz7010-fmc2/system-bsp.dtsi index f5737491..f57527bc 100644 --- a/recipes-bsp/device-tree/files/pz7010-fmc2/system-bsp.dtsi +++ b/recipes-bsp/device-tree/files/pz7010-fmc2/system-bsp.dtsi @@ -70,21 +70,22 @@ }; -/* QSPI addresses are defined with petalinux-config, but here they are overwritten so that one can program the flash internally */ +/* QSPI partitions are defined with petalinux-config and described in system.conf.dtsi */ &qspi { - #address-cells = <1>; - #size-cells = <0>; - flash0: flash@0 { - compatible = "micron,m25p80"; - reg = <0x0>; - #address-cells = <1>; - #size-cells = <1>; - spi-max-frequency = <50000000>; - partition@0 { - label = "boot"; - reg = <0x00000000 0x00ff0000>; - }; - }; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + is-dual = <0>; + num-cs = <1>; + flash0: flash@0 { + compatible = "n25q128a11"; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <50000000>; + #address-cells = <1>; + #size-cells = <1>; + }; }; / { diff --git a/recipes-bsp/device-tree/files/pz7015-fmc2/system-bsp.dtsi b/recipes-bsp/device-tree/files/pz7015-fmc2/system-bsp.dtsi index f5737491..f57527bc 100644 --- a/recipes-bsp/device-tree/files/pz7015-fmc2/system-bsp.dtsi +++ b/recipes-bsp/device-tree/files/pz7015-fmc2/system-bsp.dtsi @@ -70,21 +70,22 @@ }; -/* QSPI addresses are defined with petalinux-config, but here they are overwritten so that one can program the flash internally */ +/* QSPI partitions are defined with petalinux-config and described in system.conf.dtsi */ &qspi { - #address-cells = <1>; - #size-cells = <0>; - flash0: flash@0 { - compatible = "micron,m25p80"; - reg = <0x0>; - #address-cells = <1>; - #size-cells = <1>; - spi-max-frequency = <50000000>; - partition@0 { - label = "boot"; - reg = <0x00000000 0x00ff0000>; - }; - }; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + is-dual = <0>; + num-cs = <1>; + flash0: flash@0 { + compatible = "n25q128a11"; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <50000000>; + #address-cells = <1>; + #size-cells = <1>; + }; }; / { diff --git a/recipes-bsp/device-tree/files/pz7020-fmc2/system-bsp.dtsi b/recipes-bsp/device-tree/files/pz7020-fmc2/system-bsp.dtsi index f5737491..f57527bc 100644 --- a/recipes-bsp/device-tree/files/pz7020-fmc2/system-bsp.dtsi +++ b/recipes-bsp/device-tree/files/pz7020-fmc2/system-bsp.dtsi @@ -70,21 +70,22 @@ }; -/* QSPI addresses are defined with petalinux-config, but here they are overwritten so that one can program the flash internally */ +/* QSPI partitions are defined with petalinux-config and described in system.conf.dtsi */ &qspi { - #address-cells = <1>; - #size-cells = <0>; - flash0: flash@0 { - compatible = "micron,m25p80"; - reg = <0x0>; - #address-cells = <1>; - #size-cells = <1>; - spi-max-frequency = <50000000>; - partition@0 { - label = "boot"; - reg = <0x00000000 0x00ff0000>; - }; - }; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + is-dual = <0>; + num-cs = <1>; + flash0: flash@0 { + compatible = "n25q128a11"; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <50000000>; + #address-cells = <1>; + #size-cells = <1>; + }; }; / { diff --git a/recipes-bsp/device-tree/files/pz7030-fmc2/system-bsp.dtsi b/recipes-bsp/device-tree/files/pz7030-fmc2/system-bsp.dtsi index f5737491..f57527bc 100644 --- a/recipes-bsp/device-tree/files/pz7030-fmc2/system-bsp.dtsi +++ b/recipes-bsp/device-tree/files/pz7030-fmc2/system-bsp.dtsi @@ -70,21 +70,22 @@ }; -/* QSPI addresses are defined with petalinux-config, but here they are overwritten so that one can program the flash internally */ +/* QSPI partitions are defined with petalinux-config and described in system.conf.dtsi */ &qspi { - #address-cells = <1>; - #size-cells = <0>; - flash0: flash@0 { - compatible = "micron,m25p80"; - reg = <0x0>; - #address-cells = <1>; - #size-cells = <1>; - spi-max-frequency = <50000000>; - partition@0 { - label = "boot"; - reg = <0x00000000 0x00ff0000>; - }; - }; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + is-dual = <0>; + num-cs = <1>; + flash0: flash@0 { + compatible = "n25q128a11"; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <50000000>; + #address-cells = <1>; + #size-cells = <1>; + }; }; / {