ramips: adapt VoCore to new second spi device code

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47667 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ramips/dts/VOCORE-16M.dts b/target/linux/ramips/dts/VOCORE-16M.dts
index 464c137..a1e854e 100644 (file)
--- a/target/linux/ramips/dts/VOCORE-16M.dts
+++ b/target/linux/ramips/dts/VOCORE-16M.dts
@@ -2,40 +2,38 @@
 
 /include/ "VOCORE.dtsi"
 
-/ {
-       palmbus@10000000 {
-               spi@b00 {
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "w25q128";
-                               reg = <0>;
-                               linux,modalias = "m25p80", "w25q128";
-                               spi-max-frequency = <10000000>;
+&spi0 {
+       status = "okay";
 
-                               partition@0 {
-                                       label = "uboot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "w25q128";
+               reg = <0>;
+               linux,modalias = "m25p80", "w25q128";
+               spi-max-frequency = <10000000>;
 
-                               partition@30000 {
-                                       label = "uboot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
+               partition@0 {
+                       label = "uboot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "uboot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
 
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
 
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0xfb0000>;
-                               };
-                       };
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0xfb0000>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/VOCORE-8M.dts b/target/linux/ramips/dts/VOCORE-8M.dts
index 8a081ed..ba6d32e 100644 (file)
--- a/target/linux/ramips/dts/VOCORE-8M.dts
+++ b/target/linux/ramips/dts/VOCORE-8M.dts
@@ -2,40 +2,38 @@
 
 /include/ "VOCORE.dtsi"
 
-/ {
-       palmbus@10000000 {
-               spi@b00 {
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "s25fl064k";
-                               reg = <0>;
-                               linux,modalias = "m25p80", "s25fl064k";
-                               spi-max-frequency = <10000000>;
+&spi0 {
+       status = "okay";
 
-                               partition@0 {
-                                       label = "uboot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "s25fl064k";
+               reg = <0>;
+               linux,modalias = "m25p80", "s25fl064k";
+               spi-max-frequency = <10000000>;
 
-                               partition@30000 {
-                                       label = "uboot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
+               partition@0 {
+                       label = "uboot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "uboot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
 
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
 
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x7b0000>;
-                               };
-                       };
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x7b0000>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/VOCORE.dtsi b/target/linux/ramips/dts/VOCORE.dtsi
index ff031fa..2acff33 100644 (file)
--- a/target/linux/ramips/dts/VOCORE.dtsi
+++ b/target/linux/ramips/dts/VOCORE.dtsi
@@ -12,16 +12,6 @@
                i2c@900 {
                        status = "okay";
                };
-
-               spi@b00 {
-                       status = "okay";
-
-                       spidev@1 {
-                               compatible = "linux,spidev";
-                               spi-max-frequency = <10000000>;
-                               reg = <1>;
-                       };
-               };
        };
 
        pinctrl {
@@ -195,3 +185,13 @@
                };
        };
 };
+
+&spi1 {
+       status = "okay";
+
+       spidev@0 {
+               compatible = "linux,spidev";
+               spi-max-frequency = <10000000>;
+               reg = <0>;
+       };
+};