aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@gmail.com>2018-12-23 22:15:34 +0100
committerChristian Lamparter <chunkeey@gmail.com>2019-01-24 15:53:03 +0100
commitf9321373851c38177f7ba29aeea6fdc3ab27b244 (patch)
treeb3d3823e8e3018b6fbf766567dcb394a02e56401 /target/linux
parentcbb44f6ed7364108724a9582b9e37965d85a728d (diff)
downloadupstream-f9321373851c38177f7ba29aeea6fdc3ab27b244.tar.gz
upstream-f9321373851c38177f7ba29aeea6fdc3ab27b244.tar.bz2
upstream-f9321373851c38177f7ba29aeea6fdc3ab27b244.zip
apm821xx: dts overhaul
- remove stray #address-cells / #size-cells - fix partition unit-addresses in wd-mybooklive.dts - remove index from MBL's gpio node name Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/apm821xx/dts/apm82181.dtsi2
-rw-r--r--target/linux/apm821xx/dts/meraki-mr24.dts3
-rw-r--r--target/linux/apm821xx/dts/meraki-mx60.dts5
-rw-r--r--target/linux/apm821xx/dts/netgear-wndap6x0.dtsi5
-rw-r--r--target/linux/apm821xx/dts/netgear-wndr4700.dts5
-rw-r--r--target/linux/apm821xx/dts/wd-mybooklive.dts10
6 files changed, 4 insertions, 26 deletions
diff --git a/target/linux/apm821xx/dts/apm82181.dtsi b/target/linux/apm821xx/dts/apm82181.dtsi
index 45d4eac171..65032ba217 100644
--- a/target/linux/apm821xx/dts/apm82181.dtsi
+++ b/target/linux/apm821xx/dts/apm82181.dtsi
@@ -253,8 +253,6 @@
reg = <00000003 00000000 00002000>;
ccr = <0x00001000>;
bank-settings = <0x80002222>;
- #address-cells = <1>;
- #size-cells = <1>;
status = "disabled";
nand {
diff --git a/target/linux/apm821xx/dts/meraki-mr24.dts b/target/linux/apm821xx/dts/meraki-mr24.dts
index a66eba7efa..cb7c095dbb 100644
--- a/target/linux/apm821xx/dts/meraki-mr24.dts
+++ b/target/linux/apm821xx/dts/meraki-mr24.dts
@@ -50,9 +50,6 @@
status = "okay";
/* 32 MiB NAND Flash */
nand {
- #address-cells = <1>;
- #size-cells = <1>;
-
partition@0 {
label = "u-boot";
reg = <0x00000000 0x00150000>;
diff --git a/target/linux/apm821xx/dts/meraki-mx60.dts b/target/linux/apm821xx/dts/meraki-mx60.dts
index 62a77a62c0..fc3213e92c 100644
--- a/target/linux/apm821xx/dts/meraki-mx60.dts
+++ b/target/linux/apm821xx/dts/meraki-mx60.dts
@@ -53,9 +53,6 @@
ndfc@1,0 {
status = "okay";
nand {
- #address-cells = <1>;
- #size-cells = <1>;
-
partition@0 {
label = "u-boot";
reg = <0x00000000 0x00100000>;
@@ -161,8 +158,6 @@
keys {
compatible = "gpio-keys-polled";
- #address-cells = <1>;
- #size-cells = <0>;
poll-interval = <60>; /* 3 * 20 = 60ms */
autorepeat;
diff --git a/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi b/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
index 04611aad1e..d591070368 100644
--- a/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
+++ b/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
@@ -39,9 +39,6 @@
status = "okay";
/* 32 MiB SLC NAND Flash */
nand {
- #address-cells = <1>;
- #size-cells = <1>;
-
partition@0 {
label = "u-boot";
reg = <0x00000000 0x00100000>;
@@ -127,8 +124,6 @@
&POB0 {
keys {
compatible = "gpio-keys-polled";
- #address-cells = <1>;
- #size-cells = <0>;
#interrupt-cells = <2>;
poll-interval = <60>; /* 3 * 20 = 60ms */
autorepeat;
diff --git a/target/linux/apm821xx/dts/netgear-wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts
index 3fbcfaebbc..14f6762110 100644
--- a/target/linux/apm821xx/dts/netgear-wndr4700.dts
+++ b/target/linux/apm821xx/dts/netgear-wndr4700.dts
@@ -157,9 +157,6 @@
status = "okay";
/* 128 MiB Nand Flash */
nand {
- #address-cells = <1>;
- #size-cells = <1>;
-
partition0,0@0 {
label = "NAND 128MiB 3,3V 8-bit";
reg = <0x00000000 0x08000000>;
@@ -310,8 +307,6 @@
&POB0 {
keys {
compatible = "gpio-keys-polled";
- #address-cells = <1>;
- #size-cells = <0>;
#interrupt-cells = <2>;
autorepeat;
poll-interval = <60>; /* 3 * 20 = 60ms */
diff --git a/target/linux/apm821xx/dts/wd-mybooklive.dts b/target/linux/apm821xx/dts/wd-mybooklive.dts
index db27e1778d..6cba7d2f26 100644
--- a/target/linux/apm821xx/dts/wd-mybooklive.dts
+++ b/target/linux/apm821xx/dts/wd-mybooklive.dts
@@ -40,19 +40,19 @@
reg = <0x00000000 0x0001e000>;
};
- partition@1 {
+ partition@1e000 {
label = "env";
reg = <0x0001e000 0x00002000>;
};
- partition@2 {
+ partition@20000 {
label = "uboot";
reg = <0x00020000 0x00050000>;
};
};
};
- GPIO1: gpio1@e0000000 {
+ GPIO1: gpio@e0000000 {
compatible = "wd,mbl-gpio", "ti,74273";
reg-names = "dat";
reg = <0xe0000000 0x1>;
@@ -77,7 +77,7 @@
};
};
- GPIO2: gpio2@e0100000 {
+ GPIO2: gpio@e0100000 {
compatible = "wd,mbl-gpio", "ti,74244";
reg-names = "dat";
reg = <0xe0100000 0x1>;
@@ -109,8 +109,6 @@
keys {
compatible = "gpio-keys-polled";
- #address-cells = <1>;
- #size-cells = <0>;
poll-interval = <60>; /* 3 * 20 = 60ms */
autorepeat;