aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/dts/UBNT-ERX.dts
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2016-11-18 08:39:05 +0100
committerMathias Kresin <dev@kresin.me>2016-11-23 08:36:10 +0100
commitf1d0eba3eaf1e65ed4a185bb620540f6adbcc945 (patch)
treec3f2b0b6963a38d02cd98f04b3a20713ef12ddbb /target/linux/ramips/dts/UBNT-ERX.dts
parent18e7f49975deb353c1aa96bc5b5dca987a4d7e34 (diff)
downloadupstream-f1d0eba3eaf1e65ed4a185bb620540f6adbcc945.tar.gz
upstream-f1d0eba3eaf1e65ed4a185bb620540f6adbcc945.tar.bz2
upstream-f1d0eba3eaf1e65ed4a185bb620540f6adbcc945.zip
ramips: cleanup dts files of mt7621 based boards
Fix a typo in mt7621.dtsi compatible string. Disable spi, sdhci and pci in mt7621.dtsi and enable the nodes in the indiviual board dts files. The nodes require further device specific configuration anyway. Remove the m25p80@0 spi child node from mt7621.dtsi and add the chunked-io parameter to the individual board dts files. Fix the spi flash compatible string for the WNDR3700V5. Drop the mt7621-eval-board compatible string for all boards which are not the eval board. Drop the linux,modalias parameter from spi flash node. Remove the xhci node from board files, it is already enabled in dtsi. Disable xhci for boards not having usb ports populated. Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/ramips/dts/UBNT-ERX.dts')
-rw-r--r--target/linux/ramips/dts/UBNT-ERX.dts89
1 files changed, 42 insertions, 47 deletions
diff --git a/target/linux/ramips/dts/UBNT-ERX.dts b/target/linux/ramips/dts/UBNT-ERX.dts
index 713519d5d9..0b2da95b30 100644
--- a/target/linux/ramips/dts/UBNT-ERX.dts
+++ b/target/linux/ramips/dts/UBNT-ERX.dts
@@ -5,7 +5,6 @@
#include "mt7621.dtsi"
/ {
- compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
model = "UBNT-ERX";
memory@0 {
@@ -17,43 +16,6 @@
bootargs = "console=ttyS0,57600";
};
- nand@1e003000 {
- status = "okay";
-
- partition@0 {
- label = "u-boot";
- reg = <0x0 0x80000>;
- read-only;
- };
-
- partition@80000 {
- label = "u-boot-env";
- reg = <0x80000 0x60000>;
- read-only;
- };
-
- factory: partition@e0000 {
- label = "factory";
- reg = <0xe0000 0x60000>;
- };
-
- partition@140000 {
- label = "kernel1";
- reg = <0x140000 0x300000>;
- };
-
- partition@440000 {
- label = "kernel2";
- reg = <0x440000 0x300000>;
- };
-
- partition@740000 {
- label = "ubi";
- reg = <0x740000 0xf7c0000>;
- };
-
- };
-
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
@@ -72,6 +34,42 @@
mtd-mac-address = <&factory 0x22>;
};
+&nand {
+ status = "okay";
+
+ partition@0 {
+ label = "u-boot";
+ reg = <0x0 0x80000>;
+ read-only;
+ };
+
+ partition@80000 {
+ label = "u-boot-env";
+ reg = <0x80000 0x60000>;
+ read-only;
+ };
+
+ factory: partition@e0000 {
+ label = "factory";
+ reg = <0xe0000 0x60000>;
+ };
+
+ partition@140000 {
+ label = "kernel1";
+ reg = <0x140000 0x300000>;
+ };
+
+ partition@440000 {
+ label = "kernel2";
+ reg = <0x440000 0x300000>;
+ };
+
+ partition@740000 {
+ label = "ubi";
+ reg = <0x740000 0xf7c0000>;
+ };
+};
+
&pinctrl {
state_default: pinctrl0 {
gpio {
@@ -81,27 +79,20 @@
};
};
-&sdhci {
- status = "disabled";
-};
-
-&pcie {
- status = "disabled";
-};
-
&spi0 {
/* This board has 2Mb spi flash soldered in and visible
from manufacturer's firmware.
But this SoC shares spi and nand pins,
and current driver does't handle this sharing well */
status = "disabled";
+
m25p80@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";
reg = <1>;
- linux,modalias = "m25p80";
spi-max-frequency = <10000000>;
+ m25p,chunked-io = <32>;
partition@0 {
label = "spi";
@@ -110,3 +101,7 @@
};
};
};
+
+&xhci {
+ status = "disabled";
+};