Skip to content

Commit

Permalink
Fix QSPI devicetree node for Zynq BSPs
Browse files Browse the repository at this point in the history
  • Loading branch information
@narrucmot
narrucmot committed Apr 7, 2021
1 parent f8110f3 commit 4212d6a
Show file tree
Hide file tree
Showing 7 changed files with 93 additions and 72 deletions.
29 changes: 15 additions & 14 deletions recipes-bsp/device-tree/files/minized-sbc/system-bsp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
11 changes: 10 additions & 1 deletion recipes-bsp/device-tree/files/mz7010-som/system-bsp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
};
};


&gem0 {
status = "okay";
phy-handle = <&phy0>;
Expand Down Expand Up @@ -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";
Expand Down
9 changes: 8 additions & 1 deletion recipes-bsp/device-tree/files/mz7020-som/system-bsp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
};
Expand Down
29 changes: 15 additions & 14 deletions recipes-bsp/device-tree/files/pz7010-fmc2/system-bsp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
};
};

/ {
Expand Down
29 changes: 15 additions & 14 deletions recipes-bsp/device-tree/files/pz7015-fmc2/system-bsp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
};
};

/ {
Expand Down
29 changes: 15 additions & 14 deletions recipes-bsp/device-tree/files/pz7020-fmc2/system-bsp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
};
};

/ {
Expand Down
29 changes: 15 additions & 14 deletions recipes-bsp/device-tree/files/pz7030-fmc2/system-bsp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
};
};

/ {
Expand Down

0 comments on commit 4212d6a

Please sign in to comment.