ARM: tegra: Rename SPI flash chip nodes

SPI flash chip nodes should be named "flash" instead of "spi-flash".

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index 82caefe5928cdd9a10a5dcd3b0b3c0b017c36044..e64199ba82cbeeae9012093a60f132583e69ad9d 100644 (file)
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -1084,7 +1084,8 @@
        spi@7000da00 {
                status = "okay";
                spi-max-frequency = <25000000>;
-               spi-flash@0 {
+
+               flash@0 {
                        compatible = "winbond,w25q32dw", "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <20000000>;

diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index 35ab296408e10c1bd1485e95145ff34593ae35c3..b2b3eea81232a242e8f4b17509321e1ea417a2c5 100644 (file)
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -1655,7 +1655,8 @@
        spi@7000da00 {
                status = "okay";
                spi-max-frequency = <25000000>;
-               spi-flash@0 {
+
+               flash@0 {
                        compatible = "winbond,w25q32dw", "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <20000000>;

diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index e6b54ac1ebd1a4252c2386a2370795a0c9326876..02cf986c75678e811925e124e693c31b9df406e0 100644 (file)
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -881,7 +881,8 @@
        spi@7000da00 {
                status = "okay";
                spi-max-frequency = <25000000>;
-               spi-flash@0 {
+
+               flash@0 {
                        compatible = "winbond,w25q32dw", "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <20000000>;

diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index 4bc87bc0c2a45afd2fe64e5ee97c005eed7f3f85..beae368f827a49a4e2fe5c18588ac665bcfb611f 100644 (file)
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -287,7 +287,8 @@
        spi@7000c380 {
                status = "okay";
                spi-max-frequency = <48000000>;
-               spi-flash@0 {
+
+               flash@0 {
                        compatible = "winbond,w25q80bl", "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <48000000>;

diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index e159feeedef7262270b2a42c44d9daf74ff4203e..f724abcdb1a5590591e1d231b37563b709eee82d 100644 (file)
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -1898,7 +1898,8 @@
        spi@7000da00 {
                status = "okay";
                spi-max-frequency = <25000000>;
-               spi-flash@1 {
+
+               flash@1 {
                        compatible = "winbond,w25q32", "jedec,spi-nor";
                        reg = <1>;
                        spi-max-frequency = <20000000>;

diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index 448f1397e64a966b99811607fc2697e779c162ee..e7bfe0e5ee0676be18bc61e18fa51a1ed19ca519 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -374,7 +374,8 @@
        spi@7000da00 {
                status = "okay";
                spi-max-frequency = <25000000>;
-               spi-flash@1 {
+
+               flash@1 {
                        compatible = "winbond,w25q32", "jedec,spi-nor";
                        reg = <1>;
                        spi-max-frequency = <20000000>;