From 82557aee853455f2af446b8f7ea3e00812685cd0 Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Sat, 28 Nov 2015 23:24:52 +0000
Subject: ramips: adapt VoCore to new second spi device code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
SVN-Revision: 47667
---
target/linux/ramips/dts/VOCORE-16M.dts | 58 ++++++++++++++++------------------
target/linux/ramips/dts/VOCORE-8M.dts | 58 ++++++++++++++++------------------
target/linux/ramips/dts/VOCORE.dtsi | 20 ++++++------
3 files changed, 66 insertions(+), 70 deletions(-)
diff --git a/target/linux/ramips/dts/VOCORE-16M.dts b/target/linux/ramips/dts/VOCORE-16M.dts
index 464c137825..a1e854e427 100644
--- 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 8a081edf6c..ba6d32eb5c 100644
--- 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 ff031fab41..2acff33bda 100644
--- 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>;
+ };
+};
--
cgit v1.2.3