[PATCH 0/7] Gemini DTS updates

[PATCH 0/7] Gemini DTS updates

[Linus Walleij]

This is a resend of some patches and some new fixups for
the Gemini device trees. Will send a v4.18 pull request for
this stuff in a few days.

Geert Uytterhoeven (1):
  ARM: dts: gemini: Fix "debounce-interval" property misspelling

Linus Walleij (6):
  ARM: dtd: Set DNS-313 LEDs to use better triggers
  ARM: dts: Set DNS-685 LEDs to use better triggers
  ARM: dts: Fix the DNS-313 flash compatible
  ARM: dts: Fix bootargs for Gemini D-Link devices
  ARM: dts: Add second ATA to NAS4220B
  ARM: dts: Fix DTC warnings

 arch/arm/boot/dts/gemini-dlink-dir-685.dts | 16 +++++++++-------
 arch/arm/boot/dts/gemini-dlink-dns-313.dts | 19 +++++++++++--------
 arch/arm/boot/dts/gemini-nas4220b.dts      | 20 +++++++++++---------
 arch/arm/boot/dts/gemini-rut1xx.dts        | 12 +++++-------
 arch/arm/boot/dts/gemini-sq201.dts         | 12 +++++-------
 arch/arm/boot/dts/gemini-wbd111.dts        | 17 ++++++++---------
 arch/arm/boot/dts/gemini-wbd222.dts        | 16 +++++++---------
 7 files changed, 56 insertions(+), 56 deletions(-)

-- 
2.17.0

[PATCH 1/7] ARM: dts: gemini: Fix "debounce-interval" property misspelling

[Linus Walleij]

From: Geert Uytterhoeven <geert+renesas@glider.be>

"debounce_interval" was never supported.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/boot/dts/gemini-dlink-dir-685.dts | 4 ++--
 arch/arm/boot/dts/gemini-dlink-dns-313.dts | 2 +-
 arch/arm/boot/dts/gemini-nas4220b.dts      | 4 ++--
 arch/arm/boot/dts/gemini-rut1xx.dts        | 2 +-
 arch/arm/boot/dts/gemini-sq201.dts         | 2 +-
 arch/arm/boot/dts/gemini-wbd111.dts        | 2 +-
 arch/arm/boot/dts/gemini-wbd222.dts        | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
index cadde92bc6b5..369c80076a61 100644
--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
@@ -28,7 +28,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		button-esc {
-			debounce_interval = <50>;
+			debounce-interval = <50>;
 			wakeup-source;
 			linux,code = <KEY_ESC>;
 			label = "reset";
@@ -36,7 +36,7 @@
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
 		};
 		button-eject {
-			debounce_interval = <50>;
+			debounce-interval = <50>;
 			wakeup-source;
 			linux,code = <KEY_EJECTCD>;
 			label = "unmount";
diff --git a/arch/arm/boot/dts/gemini-dlink-dns-313.dts b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
index 403364a7aab9..55b294f1675c 100644
--- a/arch/arm/boot/dts/gemini-dlink-dns-313.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
@@ -34,7 +34,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		button-esc {
-			debounce_interval = <50>;
+			debounce-interval = <50>;
 			wakeup-source;
 			linux,code = <KEY_ESC>;
 			label = "reset";
diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts
index 4785fbcc41ed..465c26b53212 100644
--- a/arch/arm/boot/dts/gemini-nas4220b.dts
+++ b/arch/arm/boot/dts/gemini-nas4220b.dts
@@ -30,7 +30,7 @@
 		#size-cells = <0>;
 
 		button at 29 {
-			debounce_interval = <50>;
+			debounce-interval = <50>;
 			wakeup-source;
 			linux,code = <KEY_SETUP>;
 			label = "Backup button";
@@ -38,7 +38,7 @@
 			gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;
 		};
 		button at 31 {
-			debounce_interval = <50>;
+			debounce-interval = <50>;
 			wakeup-source;
 			linux,code = <KEY_RESTART>;
 			label = "Softreset button";
diff --git a/arch/arm/boot/dts/gemini-rut1xx.dts b/arch/arm/boot/dts/gemini-rut1xx.dts
index 15f20178642c..a2f14ee37599 100644
--- a/arch/arm/boot/dts/gemini-rut1xx.dts
+++ b/arch/arm/boot/dts/gemini-rut1xx.dts
@@ -30,7 +30,7 @@
 		#size-cells = <0>;
 
 		button at 28 {
-			debounce_interval = <50>;
+			debounce-interval = <50>;
 			wakeup-source;
 			linux,code = <KEY_SETUP>;
 			label = "Reset to defaults";
diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts
index 63c02ca9513c..229c0267617a 100644
--- a/arch/arm/boot/dts/gemini-sq201.dts
+++ b/arch/arm/boot/dts/gemini-sq201.dts
@@ -30,7 +30,7 @@
 		#size-cells = <0>;
 
 		button at 18 {
-			debounce_interval = <50>;
+			debounce-interval = <50>;
 			wakeup-source;
 			linux,code = <KEY_SETUP>;
 			label = "factory reset";
diff --git a/arch/arm/boot/dts/gemini-wbd111.dts b/arch/arm/boot/dts/gemini-wbd111.dts
index b4ec9ad85d72..b31a9189083f 100644
--- a/arch/arm/boot/dts/gemini-wbd111.dts
+++ b/arch/arm/boot/dts/gemini-wbd111.dts
@@ -30,7 +30,7 @@
 		#size-cells = <0>;
 
 		button at 5 {
-			debounce_interval = <50>;
+			debounce-interval = <50>;
 			wakeup-source;
 			linux,code = <KEY_SETUP>;
 			label = "reset";
diff --git a/arch/arm/boot/dts/gemini-wbd222.dts b/arch/arm/boot/dts/gemini-wbd222.dts
index 6d25bcc046e7..0be867fbfc69 100644
--- a/arch/arm/boot/dts/gemini-wbd222.dts
+++ b/arch/arm/boot/dts/gemini-wbd222.dts
@@ -30,7 +30,7 @@
 		#size-cells = <0>;
 
 		button at 5 {
-			debounce_interval = <50>;
+			debounce-interval = <50>;
 			wakeup-source;
 			linux,code = <KEY_SETUP>;
 			label = "reset";
-- 
2.17.0

[PATCH 2/7] ARM: dtd: Set DNS-313 LEDs to use better triggers

[Linus Walleij]

We just used one LED for "disk activity" but using the green
LED for disk read and the red LED for disk write gives a way
better user experience.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/boot/dts/gemini-dlink-dns-313.dts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/gemini-dlink-dns-313.dts b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
index 55b294f1675c..2d9aa5ba8320 100644
--- a/arch/arm/boot/dts/gemini-dlink-dns-313.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
@@ -59,14 +59,13 @@
 			label = "dns313:green:disk";
 			gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
 			default-state = "off";
-			linux,default-trigger = "ide-disk";
-			/* Ideally should activate while reading */
+			linux,default-trigger = "disk-read";
 		};
 		led-disk-red {
 			label = "dns313:red:disk";
 			gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
 			default-state = "off";
-			/* Ideally should activate while writing */
+			linux,default-trigger = "disk-write";
 		};
 	};
 
-- 
2.17.0

[PATCH 3/7] ARM: dts: Set DNS-685 LEDs to use better triggers

[Linus Walleij]

Using the blue LED for disk read and the orange LED for
disk write gives a better user experience.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/boot/dts/gemini-dlink-dir-685.dts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
index 369c80076a61..8d3478cf840b 100644
--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
@@ -98,7 +98,7 @@
 		/*
 		 * These two LEDs are on the side of the device.
 		 * For electrical reasons, both LEDs cannot be active
-		 * at the same time so only blue or orange can on at
+		 * at the same time so only blue or orange can be on at
 		 * one time. Enabling both makes the LED go dark.
 		 * The LEDs both sit inside the unmount button and the
 		 * label on the case says "unmount".
@@ -108,12 +108,14 @@
 			/* Collides with LPC_SERIRQ, UART DTR, SSP FSC pins */
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 			default-state = "off";
+			linux,default-trigger = "disk-read";
 		};
 		led-orange-hd {
 			label = "dir685:orange:HD";
 			/* Collides with LPC_LAD[2], UART DSR, SSP ECLK pins */
 			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
 			default-state = "off";
+			linux,default-trigger = "disk-write";
 		};
 	};
 
-- 
2.17.0

[PATCH 4/7] ARM: dts: Fix the DNS-313 flash compatible

[Linus Walleij]

The flash on the DNS-313 needs to be probed as JEDEC, it does
not conform to the common CFI standard.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/boot/dts/gemini-dlink-dns-313.dts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/gemini-dlink-dns-313.dts b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
index 2d9aa5ba8320..d865cde8ed12 100644
--- a/arch/arm/boot/dts/gemini-dlink-dns-313.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
@@ -157,8 +157,12 @@
 
 	soc {
 		flash at 30000000 {
+			/*
+			 * This is a Eon EN29LV400AB 512 KiB flash with
+			 * three partitions.
+			 */
+			compatible = "cortina,gemini-flash", "jedec-flash";
 			status = "okay";
-			/* 512KB of flash */
 			reg = <0x30000000 0x00080000>;
 
 			/*
-- 
2.17.0

[PATCH 5/7] ARM: dts: Fix bootargs for Gemini D-Link devices

[Linus Walleij]

These machines need to be booted from very specific harddisk
partitions (as the D-Link DNS-313 boots specifically from
partition 4). Add the proper bootargs so that everything works
smoothly.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/boot/dts/gemini-dlink-dir-685.dts | 3 ++-
 arch/arm/boot/dts/gemini-dlink-dns-313.dts | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
index 8d3478cf840b..89ce0d1916e3 100644
--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
@@ -20,7 +20,8 @@
 	};
 
 	chosen {
-		stdout-path = "uart0:115200n8";
+		bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait";
+		stdout-path = "uart0:19200n8";
 	};
 
 	gpio_keys {
diff --git a/arch/arm/boot/dts/gemini-dlink-dns-313.dts b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
index d865cde8ed12..da78a0aa389a 100644
--- a/arch/arm/boot/dts/gemini-dlink-dns-313.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
@@ -26,6 +26,7 @@
 	};
 
 	chosen {
+		bootargs = "console=ttyS0,19200n8 root=/dev/sda4 rw rootwait";
 		stdout-path = "uart0:19200n8";
 	};
 
-- 
2.17.0

[PATCH 6/7] ARM: dts: Add second ATA to NAS4220B

[Linus Walleij]

The NAS4220B has the second ATA interface up and running.
Activate it in the device tree.

Signed-off-by: Roman Yeryomin <roman@advem.lv>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/boot/dts/gemini-nas4220b.dts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts
index 465c26b53212..9f78803b2456 100644
--- a/arch/arm/boot/dts/gemini-nas4220b.dts
+++ b/arch/arm/boot/dts/gemini-nas4220b.dts
@@ -202,5 +202,9 @@
 		ata at 63000000 {
 			status = "okay";
 		};
+
+		ata at 63400000 {
+			status = "okay";
+		};
 	};
 };
-- 
2.17.0

[PATCH 7/7] ARM: dts: Fix DTC warnings

[Linus Walleij]

The DTC was warning a lot about unit names etc, I think I fixed
them all. One warning remains:

arch/arm/boot/dts/gemini-rut1xx.dtb: Warning (unit_address_vs_reg):
 /memory: node has a reg or ranges property, but no unit name

This comes up all the time even though memory is stated as
memory at 0 for all boards, I guess this is a bug in the DTC
syntax checker, like it cannot really differentiate between
@0 and no unit name at all for the memory node.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/boot/dts/gemini-dlink-dir-685.dts |  5 ++---
 arch/arm/boot/dts/gemini-dlink-dns-313.dts |  5 ++---
 arch/arm/boot/dts/gemini-nas4220b.dts      | 12 +++++-------
 arch/arm/boot/dts/gemini-rut1xx.dts        | 10 ++++------
 arch/arm/boot/dts/gemini-sq201.dts         | 10 ++++------
 arch/arm/boot/dts/gemini-wbd111.dts        | 15 +++++++--------
 arch/arm/boot/dts/gemini-wbd222.dts        | 14 ++++++--------
 7 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
index 89ce0d1916e3..fb5c954ab95a 100644
--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
@@ -13,7 +13,7 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
-	memory {
+	memory at 0 {
 		/* 128 MB SDRAM in 2 x Hynix HY5DU121622DTP-D43 */
 		device_type = "memory";
 		reg = <0x00000000 0x8000000>;
@@ -26,8 +26,7 @@
 
 	gpio_keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
+
 		button-esc {
 			debounce-interval = <50>;
 			wakeup-source;
diff --git a/arch/arm/boot/dts/gemini-dlink-dns-313.dts b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
index da78a0aa389a..d1329322b968 100644
--- a/arch/arm/boot/dts/gemini-dlink-dns-313.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
@@ -15,7 +15,7 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
-	memory {
+	memory at 0 {
 		/* 64 MB SDRAM in a Nanya NT5DS32M16BS-6K package */
 		device_type = "memory";
 		reg = <0x00000000 0x4000000>;
@@ -32,8 +32,7 @@
 
 	gpio_keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
+
 		button-esc {
 			debounce-interval = <50>;
 			wakeup-source;
diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts
index 9f78803b2456..963ea890c87f 100644
--- a/arch/arm/boot/dts/gemini-nas4220b.dts
+++ b/arch/arm/boot/dts/gemini-nas4220b.dts
@@ -14,7 +14,7 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
-	memory { /* 128 MB */
+	memory at 0 { /* 128 MB */
 		device_type = "memory";
 		reg = <0x00000000 0x8000000>;
 	};
@@ -26,10 +26,8 @@
 
 	gpio_keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
-		button at 29 {
+		button-setup {
 			debounce-interval = <50>;
 			wakeup-source;
 			linux,code = <KEY_SETUP>;
@@ -37,7 +35,7 @@
 			/* Conflict with TVC */
 			gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;
 		};
-		button at 31 {
+		button-restart {
 			debounce-interval = <50>;
 			wakeup-source;
 			linux,code = <KEY_RESTART>;
@@ -49,13 +47,13 @@
 
 	leds {
 		compatible = "gpio-leds";
-		led at 28 {
+		led-orange-hdd {
 			label = "nas4220b:orange:hdd";
 			/* Conflict with TVC */
 			gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
 		};
-		led at 30 {
+		led-green-os {
 			label = "nas4220b:green:os";
 			/* Conflict with TVC */
 			gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm/boot/dts/gemini-rut1xx.dts b/arch/arm/boot/dts/gemini-rut1xx.dts
index a2f14ee37599..eb4f0bf074da 100644
--- a/arch/arm/boot/dts/gemini-rut1xx.dts
+++ b/arch/arm/boot/dts/gemini-rut1xx.dts
@@ -14,7 +14,7 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
-	memory { /* 128 MB */
+	memory at 0 { /* 128 MB */
 		device_type = "memory";
 		reg = <0x00000000 0x8000000>;
 	};
@@ -26,10 +26,8 @@
 
 	gpio_keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
-		button at 28 {
+		button-setup {
 			debounce-interval = <50>;
 			wakeup-source;
 			linux,code = <KEY_SETUP>;
@@ -41,14 +39,14 @@
 
 	leds {
 		compatible = "gpio-leds";
-		led at 7 {
+		led-gsm {
 			/* FIXME: add the LED color */
 			label = "rut1xx::gsm";
 			/* Conflict with ICE */
 			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
 		};
-		led at 31 {
+		led-power {
 			/* FIXME: add the LED color */
 			label = "rut1xx::power";
 			/* Conflict with NAND CE0 */
diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts
index 229c0267617a..e5cf9d1a98cd 100644
--- a/arch/arm/boot/dts/gemini-sq201.dts
+++ b/arch/arm/boot/dts/gemini-sq201.dts
@@ -14,7 +14,7 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
-	memory { /* 128 MB */
+	memory at 0 { /* 128 MB */
 		device_type = "memory";
 		reg = <0x00000000 0x8000000>;
 	};
@@ -26,10 +26,8 @@
 
 	gpio_keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
-		button at 18 {
+		button-setup {
 			debounce-interval = <50>;
 			wakeup-source;
 			linux,code = <KEY_SETUP>;
@@ -41,14 +39,14 @@
 
 	leds {
 		compatible = "gpio-leds";
-		led at 20 {
+		led-green-info {
 			label = "sq201:green:info";
 			/* Conflict with parallel flash */
 			gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
 			linux,default-trigger = "heartbeat";
 		};
-		led at 31 {
+		led-green-usb {
 			label = "sq201:green:usb";
 			/* Conflict with parallel and NAND flash */
 			gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm/boot/dts/gemini-wbd111.dts b/arch/arm/boot/dts/gemini-wbd111.dts
index b31a9189083f..29af86cd10f7 100644
--- a/arch/arm/boot/dts/gemini-wbd111.dts
+++ b/arch/arm/boot/dts/gemini-wbd111.dts
@@ -14,7 +14,8 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
-	memory { /* 128 MB */
+	memory at 0 {
+		/* 128 MB */
 		device_type = "memory";
 		reg = <0x00000000 0x8000000>;
 	};
@@ -26,10 +27,8 @@
 
 	gpio_keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
-		button at 5 {
+		button-setup {
 			debounce-interval = <50>;
 			wakeup-source;
 			linux,code = <KEY_SETUP>;
@@ -42,25 +41,25 @@
 	leds {
 		compatible = "gpio-leds";
 
-		led at 1 {
+		led-red-l3 {
 			label = "wbd111:red:L3";
 			/* Conflict with TVC and extended parallel flash */
 			gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
 			default-state = "off";
 		};
-		led at 2 {
+		led-green-l4 {
 			label = "wbd111:green:L4";
 			/* Conflict with TVC and extended parallel flash */
 			gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
 			default-state = "off";
 		};
-		led at 3 {
+		led-red-l4 {
 			label = "wbd111:red:L4";
 			/* Conflict with TVC and extended parallel flash */
 			gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
 			default-state = "off";
 		};
-		led at 5 {
+		led-greeb-l3 {
 			label = "wbd111:green:L3";
 			/* Conflict with TVC and extended parallel flash */
 			gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm/boot/dts/gemini-wbd222.dts b/arch/arm/boot/dts/gemini-wbd222.dts
index 0be867fbfc69..24e6ae3616f7 100644
--- a/arch/arm/boot/dts/gemini-wbd222.dts
+++ b/arch/arm/boot/dts/gemini-wbd222.dts
@@ -14,7 +14,7 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
-	memory { /* 128 MB */
+	memory at 0 { /* 128 MB */
 		device_type = "memory";
 		reg = <0x00000000 0x8000000>;
 	};
@@ -26,10 +26,8 @@
 
 	gpio_keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
-		button at 5 {
+		button-setup {
 			debounce-interval = <50>;
 			wakeup-source;
 			linux,code = <KEY_SETUP>;
@@ -42,25 +40,25 @@
 	leds {
 		compatible = "gpio-leds";
 
-		led at 1 {
+		led-red-l3 {
 			label = "wbd111:red:L3";
 			/* Conflict with TVC and extended parallel flash */
 			gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
 			default-state = "off";
 		};
-		led at 2 {
+		led-green-l4 {
 			label = "wbd111:green:L4";
 			/* Conflict with TVC and extended parallel flash */
 			gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
 			default-state = "off";
 		};
-		led at 3 {
+		led-red-l4 {
 			label = "wbd111:red:L4";
 			/* Conflict with TVC and extended parallel flash */
 			gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
 			default-state = "off";
 		};
-		led at 5 {
+		led-green-l3 {
 			label = "wbd111:green:L3";
 			/* Conflict with TVC and extended parallel flash */
 			gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
-- 
2.17.0

[PATCH 7/7] ARM: dts: Fix DTC warnings

[Robin Murphy]

On 06/05/18 14:43, Linus Walleij wrote:
> The DTC was warning a lot about unit names etc, I think I fixed
> them all. One warning remains:
> 
> arch/arm/boot/dts/gemini-rut1xx.dtb: Warning (unit_address_vs_reg):
>   /memory: node has a reg or ranges property, but no unit name
> 
> This comes up all the time even though memory is stated as
> memory at 0 for all boards, I guess this is a bug in the DTC
> syntax checker, like it cannot really differentiate between
> @0 and no unit name at all for the memory node.

That might be because it's pulling in skeleton.dtsi, since I think 
"memory at 0" and "memory" are treated as distinct nodes, such that the 
former from the board DTS no longer overrides the latter from skeleton 
and you end up with both.

Robin.

> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
>   arch/arm/boot/dts/gemini-dlink-dir-685.dts |  5 ++---
>   arch/arm/boot/dts/gemini-dlink-dns-313.dts |  5 ++---
>   arch/arm/boot/dts/gemini-nas4220b.dts      | 12 +++++-------
>   arch/arm/boot/dts/gemini-rut1xx.dts        | 10 ++++------
>   arch/arm/boot/dts/gemini-sq201.dts         | 10 ++++------
>   arch/arm/boot/dts/gemini-wbd111.dts        | 15 +++++++--------
>   arch/arm/boot/dts/gemini-wbd222.dts        | 14 ++++++--------
>   7 files changed, 30 insertions(+), 41 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
> index 89ce0d1916e3..fb5c954ab95a 100644
> --- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
> +++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
> @@ -13,7 +13,7 @@
>   	#address-cells = <1>;
>   	#size-cells = <1>;
>   
> -	memory {
> +	memory at 0 {
>   		/* 128 MB SDRAM in 2 x Hynix HY5DU121622DTP-D43 */
>   		device_type = "memory";
>   		reg = <0x00000000 0x8000000>;
> @@ -26,8 +26,7 @@
>   
>   	gpio_keys {
>   		compatible = "gpio-keys";
> -		#address-cells = <1>;
> -		#size-cells = <0>;
> +
>   		button-esc {
>   			debounce-interval = <50>;
>   			wakeup-source;
> diff --git a/arch/arm/boot/dts/gemini-dlink-dns-313.dts b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
> index da78a0aa389a..d1329322b968 100644
> --- a/arch/arm/boot/dts/gemini-dlink-dns-313.dts
> +++ b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
> @@ -15,7 +15,7 @@
>   	#address-cells = <1>;
>   	#size-cells = <1>;
>   
> -	memory {
> +	memory at 0 {
>   		/* 64 MB SDRAM in a Nanya NT5DS32M16BS-6K package */
>   		device_type = "memory";
>   		reg = <0x00000000 0x4000000>;
> @@ -32,8 +32,7 @@
>   
>   	gpio_keys {
>   		compatible = "gpio-keys";
> -		#address-cells = <1>;
> -		#size-cells = <0>;
> +
>   		button-esc {
>   			debounce-interval = <50>;
>   			wakeup-source;
> diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts
> index 9f78803b2456..963ea890c87f 100644
> --- a/arch/arm/boot/dts/gemini-nas4220b.dts
> +++ b/arch/arm/boot/dts/gemini-nas4220b.dts
> @@ -14,7 +14,7 @@
>   	#address-cells = <1>;
>   	#size-cells = <1>;
>   
> -	memory { /* 128 MB */
> +	memory at 0 { /* 128 MB */
>   		device_type = "memory";
>   		reg = <0x00000000 0x8000000>;
>   	};
> @@ -26,10 +26,8 @@
>   
>   	gpio_keys {
>   		compatible = "gpio-keys";
> -		#address-cells = <1>;
> -		#size-cells = <0>;
>   
> -		button at 29 {
> +		button-setup {
>   			debounce-interval = <50>;
>   			wakeup-source;
>   			linux,code = <KEY_SETUP>;
> @@ -37,7 +35,7 @@
>   			/* Conflict with TVC */
>   			gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;
>   		};
> -		button at 31 {
> +		button-restart {
>   			debounce-interval = <50>;
>   			wakeup-source;
>   			linux,code = <KEY_RESTART>;
> @@ -49,13 +47,13 @@
>   
>   	leds {
>   		compatible = "gpio-leds";
> -		led at 28 {
> +		led-orange-hdd {
>   			label = "nas4220b:orange:hdd";
>   			/* Conflict with TVC */
>   			gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
>   			default-state = "on";
>   		};
> -		led at 30 {
> +		led-green-os {
>   			label = "nas4220b:green:os";
>   			/* Conflict with TVC */
>   			gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
> diff --git a/arch/arm/boot/dts/gemini-rut1xx.dts b/arch/arm/boot/dts/gemini-rut1xx.dts
> index a2f14ee37599..eb4f0bf074da 100644
> --- a/arch/arm/boot/dts/gemini-rut1xx.dts
> +++ b/arch/arm/boot/dts/gemini-rut1xx.dts
> @@ -14,7 +14,7 @@
>   	#address-cells = <1>;
>   	#size-cells = <1>;
>   
> -	memory { /* 128 MB */
> +	memory at 0 { /* 128 MB */
>   		device_type = "memory";
>   		reg = <0x00000000 0x8000000>;
>   	};
> @@ -26,10 +26,8 @@
>   
>   	gpio_keys {
>   		compatible = "gpio-keys";
> -		#address-cells = <1>;
> -		#size-cells = <0>;
>   
> -		button at 28 {
> +		button-setup {
>   			debounce-interval = <50>;
>   			wakeup-source;
>   			linux,code = <KEY_SETUP>;
> @@ -41,14 +39,14 @@
>   
>   	leds {
>   		compatible = "gpio-leds";
> -		led at 7 {
> +		led-gsm {
>   			/* FIXME: add the LED color */
>   			label = "rut1xx::gsm";
>   			/* Conflict with ICE */
>   			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
>   			default-state = "on";
>   		};
> -		led at 31 {
> +		led-power {
>   			/* FIXME: add the LED color */
>   			label = "rut1xx::power";
>   			/* Conflict with NAND CE0 */
> diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts
> index 229c0267617a..e5cf9d1a98cd 100644
> --- a/arch/arm/boot/dts/gemini-sq201.dts
> +++ b/arch/arm/boot/dts/gemini-sq201.dts
> @@ -14,7 +14,7 @@
>   	#address-cells = <1>;
>   	#size-cells = <1>;
>   
> -	memory { /* 128 MB */
> +	memory at 0 { /* 128 MB */
>   		device_type = "memory";
>   		reg = <0x00000000 0x8000000>;
>   	};
> @@ -26,10 +26,8 @@
>   
>   	gpio_keys {
>   		compatible = "gpio-keys";
> -		#address-cells = <1>;
> -		#size-cells = <0>;
>   
> -		button at 18 {
> +		button-setup {
>   			debounce-interval = <50>;
>   			wakeup-source;
>   			linux,code = <KEY_SETUP>;
> @@ -41,14 +39,14 @@
>   
>   	leds {
>   		compatible = "gpio-leds";
> -		led at 20 {
> +		led-green-info {
>   			label = "sq201:green:info";
>   			/* Conflict with parallel flash */
>   			gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
>   			default-state = "on";
>   			linux,default-trigger = "heartbeat";
>   		};
> -		led at 31 {
> +		led-green-usb {
>   			label = "sq201:green:usb";
>   			/* Conflict with parallel and NAND flash */
>   			gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;
> diff --git a/arch/arm/boot/dts/gemini-wbd111.dts b/arch/arm/boot/dts/gemini-wbd111.dts
> index b31a9189083f..29af86cd10f7 100644
> --- a/arch/arm/boot/dts/gemini-wbd111.dts
> +++ b/arch/arm/boot/dts/gemini-wbd111.dts
> @@ -14,7 +14,8 @@
>   	#address-cells = <1>;
>   	#size-cells = <1>;
>   
> -	memory { /* 128 MB */
> +	memory at 0 {
> +		/* 128 MB */
>   		device_type = "memory";
>   		reg = <0x00000000 0x8000000>;
>   	};
> @@ -26,10 +27,8 @@
>   
>   	gpio_keys {
>   		compatible = "gpio-keys";
> -		#address-cells = <1>;
> -		#size-cells = <0>;
>   
> -		button at 5 {
> +		button-setup {
>   			debounce-interval = <50>;
>   			wakeup-source;
>   			linux,code = <KEY_SETUP>;
> @@ -42,25 +41,25 @@
>   	leds {
>   		compatible = "gpio-leds";
>   
> -		led at 1 {
> +		led-red-l3 {
>   			label = "wbd111:red:L3";
>   			/* Conflict with TVC and extended parallel flash */
>   			gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
>   			default-state = "off";
>   		};
> -		led at 2 {
> +		led-green-l4 {
>   			label = "wbd111:green:L4";
>   			/* Conflict with TVC and extended parallel flash */
>   			gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
>   			default-state = "off";
>   		};
> -		led at 3 {
> +		led-red-l4 {
>   			label = "wbd111:red:L4";
>   			/* Conflict with TVC and extended parallel flash */
>   			gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
>   			default-state = "off";
>   		};
> -		led at 5 {
> +		led-greeb-l3 {
>   			label = "wbd111:green:L3";
>   			/* Conflict with TVC and extended parallel flash */
>   			gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
> diff --git a/arch/arm/boot/dts/gemini-wbd222.dts b/arch/arm/boot/dts/gemini-wbd222.dts
> index 0be867fbfc69..24e6ae3616f7 100644
> --- a/arch/arm/boot/dts/gemini-wbd222.dts
> +++ b/arch/arm/boot/dts/gemini-wbd222.dts
> @@ -14,7 +14,7 @@
>   	#address-cells = <1>;
>   	#size-cells = <1>;
>   
> -	memory { /* 128 MB */
> +	memory at 0 { /* 128 MB */
>   		device_type = "memory";
>   		reg = <0x00000000 0x8000000>;
>   	};
> @@ -26,10 +26,8 @@
>   
>   	gpio_keys {
>   		compatible = "gpio-keys";
> -		#address-cells = <1>;
> -		#size-cells = <0>;
>   
> -		button at 5 {
> +		button-setup {
>   			debounce-interval = <50>;
>   			wakeup-source;
>   			linux,code = <KEY_SETUP>;
> @@ -42,25 +40,25 @@
>   	leds {
>   		compatible = "gpio-leds";
>   
> -		led at 1 {
> +		led-red-l3 {
>   			label = "wbd111:red:L3";
>   			/* Conflict with TVC and extended parallel flash */
>   			gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
>   			default-state = "off";
>   		};
> -		led at 2 {
> +		led-green-l4 {
>   			label = "wbd111:green:L4";
>   			/* Conflict with TVC and extended parallel flash */
>   			gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
>   			default-state = "off";
>   		};
> -		led at 3 {
> +		led-red-l4 {
>   			label = "wbd111:red:L4";
>   			/* Conflict with TVC and extended parallel flash */
>   			gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
>   			default-state = "off";
>   		};
> -		led at 5 {
> +		led-green-l3 {
>   			label = "wbd111:green:L3";
>   			/* Conflict with TVC and extended parallel flash */
>   			gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
>