From fe4e6d83e77dadb2d677653a9dc8a64c46b9fb81 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 16 Sep 2015 18:38:14 +1000 Subject: conf/machine/boards/*: Update flash compatible strings * Update the compatible strings in the device tree to have the dummy 'm25p80' string, the valid component string as well as adding the generic 'jedec,spi-nor' string for future use. Signed-off-by: Nathan Rossi --- conf/machine/boards/microzed/microzed-zynq7-board.dtsi | 2 +- conf/machine/boards/picozed/picozed-zynq7-board.dtsi | 2 +- conf/machine/boards/zc702/zc702-zynq7-board.dtsi | 2 +- conf/machine/boards/zc706/zc706-zynq7-board.dtsi | 2 +- conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi | 2 +- conf/machine/boards/zybo/zybo-zynq7-board.dtsi | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/boards/microzed/microzed-zynq7-board.dtsi b/conf/machine/boards/microzed/microzed-zynq7-board.dtsi index 9c57b6de..d56e3e1e 100644 --- a/conf/machine/boards/microzed/microzed-zynq7-board.dtsi +++ b/conf/machine/boards/microzed/microzed-zynq7-board.dtsi @@ -24,7 +24,7 @@ } ; ps7_qspi_0: ps7-qspi@e000d000 { flash@0 { - compatible = "n25q128"; + compatible = "micron,m25p80", "spansion,s25fl128s", "jedec,spi-nor"; reg = <0x0>; spi-max-frequency = <50000000>; #address-cells = <1>; diff --git a/conf/machine/boards/picozed/picozed-zynq7-board.dtsi b/conf/machine/boards/picozed/picozed-zynq7-board.dtsi index ceadc0c6..19d50524 100644 --- a/conf/machine/boards/picozed/picozed-zynq7-board.dtsi +++ b/conf/machine/boards/picozed/picozed-zynq7-board.dtsi @@ -20,7 +20,7 @@ } ; ps7_qspi_0: ps7-qspi@e000d000 { flash@0 { - compatible = "n25q128"; + compatible = "micron,m25p80", "spansion,s25fl128s", "jedec,spi-nor"; reg = <0x0>; spi-max-frequency = <50000000>; #address-cells = <1>; diff --git a/conf/machine/boards/zc702/zc702-zynq7-board.dtsi b/conf/machine/boards/zc702/zc702-zynq7-board.dtsi index 42a2b15e..686aa9f3 100644 --- a/conf/machine/boards/zc702/zc702-zynq7-board.dtsi +++ b/conf/machine/boards/zc702/zc702-zynq7-board.dtsi @@ -24,7 +24,7 @@ } ; ps7_qspi_0: ps7-qspi@e000d000 { flash@0 { - compatible = "n25q128"; + compatible = "micron,n25q128a11", "jedec,spi-nor"; reg = <0x0>; spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; diff --git a/conf/machine/boards/zc706/zc706-zynq7-board.dtsi b/conf/machine/boards/zc706/zc706-zynq7-board.dtsi index 7929d2c1..01631695 100644 --- a/conf/machine/boards/zc706/zc706-zynq7-board.dtsi +++ b/conf/machine/boards/zc706/zc706-zynq7-board.dtsi @@ -26,7 +26,7 @@ is-dual = <1>; xlnx,qspi-mode = <0x2>; flash@0 { - compatible = "n25q128"; + compatible = "micron,m25p80", "spansion,s25fl128s", "jedec,spi-nor"; reg = <0x0>; spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; diff --git a/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi b/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi index 255c5e8a..2ccfe1cc 100644 --- a/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi +++ b/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi @@ -29,7 +29,7 @@ } ; ps7_qspi_0: ps7-qspi@e000d000 { flash@0 { - compatible = "n25q128"; + compatible = "spansion,s25fl256s0", "jedec,spi-nor"; reg = <0x0>; spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; diff --git a/conf/machine/boards/zybo/zybo-zynq7-board.dtsi b/conf/machine/boards/zybo/zybo-zynq7-board.dtsi index c575edf8..5d7a3a84 100644 --- a/conf/machine/boards/zybo/zybo-zynq7-board.dtsi +++ b/conf/machine/boards/zybo/zybo-zynq7-board.dtsi @@ -26,7 +26,7 @@ } ; ps7_qspi_0: ps7-qspi@e000d000 { flash@0 { - compatible = "n25q128"; + compatible = "micron,m25p80", "spansion,s25fl128s", "jedec,spi-nor"; reg = <0x0>; spi-max-frequency = <50000000>; #address-cells = <1>; -- cgit v1.2.3-54-g00ecf