ARM: shmobile: Use generic names for device nodes

PATCH New Geert Uytterhoeven 4 participants 18 messages Apr 27, 2015 – Apr 30, 2015

Subsystems (2)

Device tree bindings SuperH

lore

Share & tools

lore

Geert Uytterhoeven

author

2015-04-27 12:55 UTC #0 lore raw

cover ARM: shmobile: Use generic names for device nodes

Hi Magnus, Simon,

This patch series gets rid of the last non-generic device nodes names in the shmobile DTS files, and replaces them by generic names, cfr. ePAPR.

Thanks for applying!

Geert Uytterhoeven (10):
ARM: shmobile: r8a7740 dtsi: Use generic names for device nodes
ARM: shmobile: r8a7778 dtsi: Use generic names for device nodes
ARM: shmobile: r8a7779 dtsi: Use generic names for device nodes
ARM: shmobile: r8a7790 dtsi: Use generic names for device nodes
ARM: shmobile: r8a7791 dtsi: Use generic names for device nodes
ARM: shmobile: sh73a0 dtsi: Use generic names for device nodes
ARM: shmobile: ape6evm dts: Use generic names for device nodes
ARM: shmobile: armadillo800eva dts: Use generic names for device nodes
ARM: shmobile: kzm9d dts: Use generic names for device nodes
ARM: shmobile: marzen dts: Use generic names for device nodes

 arch/arm/boot/dts/emev2-kzm9d.dts             | 4 ++--
 arch/arm/boot/dts/r8a73a4-ape6evm.dts         | 2 +-
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +-
 arch/arm/boot/dts/r8a7740.dtsi                | 8 ++++----
 arch/arm/boot/dts/r8a7778.dtsi                | 2 +-
 arch/arm/boot/dts/r8a7779-marzen.dts          | 6 +++---
 arch/arm/boot/dts/r8a7779.dtsi                | 2 +-
 arch/arm/boot/dts/r8a7790.dtsi                | 2 +-
 arch/arm/boot/dts/r8a7791.dtsi                | 2 +-
 arch/arm/boot/dts/sh73a0.dtsi                 | 8 ++++----
 10 files changed, 19 insertions(+), 19 deletions(-)

Signature · 12 lines

1.9.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Geert Uytterhoeven

author

2015-04-27 12:55 UTC #1 lore raw

PATCH 1/10 ARM: shmobile: r8a7740 dtsi: Use generic names for device nodes

irqpin -> interrupt-controller

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 arch/arm/boot/dts/r8a7740.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

arch/arm/boot/dts/r8a7740.dtsi +4 -4

index 83c1c3ca1b8f1400..f265b6b194e9774d 100644
@@ -67,7 +67,7 @@
 	};
 
 	/* irqpin0: IRQ0 - IRQ7 */
-	irqpin0: irqpin at e6900000 {
+	irqpin0: interrupt-controller at e6900000 {
 		compatible = "renesas,intc-irqpin-r8a7740", "renesas,intc-irqpin";
 		#interrupt-cells = <2>;
 		interrupt-controller;

@@ -89,7 +89,7 @@
 	};
 
 	/* irqpin1: IRQ8 - IRQ15 */
-	irqpin1: irqpin at e6900004 {
+	irqpin1: interrupt-controller at e6900004 {
 		compatible = "renesas,intc-irqpin-r8a7740", "renesas,intc-irqpin";
 		#interrupt-cells = <2>;
 		interrupt-controller;

@@ -111,7 +111,7 @@
 	};
 
 	/* irqpin2: IRQ16 - IRQ23 */
-	irqpin2: irqpin at e6900008 {
+	irqpin2: interrupt-controller at e6900008 {
 		compatible = "renesas,intc-irqpin-r8a7740", "renesas,intc-irqpin";
 		#interrupt-cells = <2>;
 		interrupt-controller;

@@ -133,7 +133,7 @@
 	};
 
 	/* irqpin3: IRQ24 - IRQ31 */
-	irqpin3: irqpin at e690000c {
+	irqpin3: interrupt-controller at e690000c {
 		compatible = "renesas,intc-irqpin-r8a7740", "renesas,intc-irqpin";
 		#interrupt-cells = <2>;
 		interrupt-controller;

Signature · 1 line

1.9.1

Geert Uytterhoeven

author

2015-04-27 12:55 UTC #2 lore raw

PATCH 2/10 ARM: shmobile: r8a7778 dtsi: Use generic names for device nodes

In reply to Geert Uytterhoeven

irqpin -> interrupt-controller

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 arch/arm/boot/dts/r8a7778.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/boot/dts/r8a7778.dtsi +1 -1

index 868f9730953350e9..7ce9f5fd586504f2 100644
@@ -68,7 +68,7 @@
 	};
 
 	/* irqpin: IRQ0 - IRQ3 */
-	irqpin: irqpin at fe78001c {
+	irqpin: interrupt-controller at fe78001c {
 		compatible = "renesas,intc-irqpin-r8a7778", "renesas,intc-irqpin";
 		#interrupt-cells = <2>;
 		interrupt-controller;

Signature · 1 line

1.9.1

Geert Uytterhoeven

author

2015-04-27 12:55 UTC #3 lore raw

PATCH 3/10 ARM: shmobile: r8a7779 dtsi: Use generic names for device nodes

In reply to Geert Uytterhoeven

irqpin -> interrupt-controller

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 arch/arm/boot/dts/r8a7779.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/boot/dts/r8a7779.dtsi +1 -1

index 5c2219b9f3eb5003..5c8071e87ae9c719 100644
@@ -148,7 +148,7 @@
 		interrupt-controller;
 	};
 
-	irqpin0: irqpin at fe780010 {
+	irqpin0: interrupt-controller at fe780010 {
 		compatible = "renesas,intc-irqpin-r8a7779", "renesas,intc-irqpin";
 		#interrupt-cells = <2>;
 		status = "disabled";

Signature · 1 line

1.9.1

Geert Uytterhoeven

author

2015-04-27 12:55 UTC #4 lore raw

PATCH 4/10 ARM: shmobile: r8a7790 dtsi: Use generic names for device nodes

In reply to Geert Uytterhoeven

rcar_sound -> sound

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 arch/arm/boot/dts/r8a7790.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/boot/dts/r8a7790.dtsi +1 -1

index f3b8430070b6e4b9..943d2e29bc57133f 100644
@@ -1442,7 +1442,7 @@
 		status = "disabled";
 	};
 
-	rcar_sound: rcar_sound at ec500000 {
+	rcar_sound: sound at ec500000 {
 		/*
 		 * #sound-dai-cells is required
 		 *

Signature · 1 line

1.9.1

Geert Uytterhoeven

author

2015-04-27 12:55 UTC #5 lore raw

PATCH 5/10 ARM: shmobile: r8a7791 dtsi: Use generic names for device nodes

In reply to Geert Uytterhoeven

rcar_sound -> sound

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 arch/arm/boot/dts/r8a7791.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/boot/dts/r8a7791.dtsi +1 -1

index 3e9f824797e75aed..9492c961ad4ee12d 100644
@@ -1485,7 +1485,7 @@
 		status = "disabled";
 	};
 
-	rcar_sound: rcar_sound at ec500000 {
+	rcar_sound: sound at ec500000 {
 		/*
 		 * #sound-dai-cells is required
 		 *

Signature · 1 line

1.9.1

Geert Uytterhoeven

author

2015-04-27 12:55 UTC #6 lore raw

PATCH 6/10 ARM: shmobile: sh73a0 dtsi: Use generic names for device nodes

In reply to Geert Uytterhoeven

irqpin -> interrupt-controller

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 arch/arm/boot/dts/sh73a0.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

arch/arm/boot/dts/sh73a0.dtsi +4 -4

index 45b539ce4d352035..0bdb1da60487b431 100644
@@ -90,7 +90,7 @@
 		status = "disabled";
 	};
 
-	irqpin0: irqpin at e6900000 {
+	irqpin0: interrupt-controller at e6900000 {
 		compatible = "renesas,intc-irqpin-sh73a0", "renesas,intc-irqpin";
 		#interrupt-cells = <2>;
 		interrupt-controller;

@@ -112,7 +112,7 @@
 		control-parent;
 	};
 
-	irqpin1: irqpin at e6900004 {
+	irqpin1: interrupt-controller at e6900004 {
 		compatible = "renesas,intc-irqpin-sh73a0", "renesas,intc-irqpin";
 		#interrupt-cells = <2>;
 		interrupt-controller;

@@ -134,7 +134,7 @@
 		control-parent;
 	};
 
-	irqpin2: irqpin at e6900008 {
+	irqpin2: interrupt-controller at e6900008 {
 		compatible = "renesas,intc-irqpin-sh73a0", "renesas,intc-irqpin";
 		#interrupt-cells = <2>;
 		interrupt-controller;

@@ -156,7 +156,7 @@
 		control-parent;
 	};
 
-	irqpin3: irqpin at e690000c {
+	irqpin3: interrupt-controller at e690000c {
 		compatible = "renesas,intc-irqpin-sh73a0", "renesas,intc-irqpin";
 		#interrupt-cells = <2>;
 		interrupt-controller;

Signature · 1 line

1.9.1

Geert Uytterhoeven

author

2015-04-27 12:55 UTC #7 lore raw

PATCH 7/10 ARM: shmobile: ape6evm dts: Use generic names for device nodes

In reply to Geert Uytterhoeven

max8973 -> regulator

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/boot/dts/r8a73a4-ape6evm.dts +1 -1

index 81a38ceee098087e..a4c425923c05e8cd 100644
@@ -147,7 +147,7 @@
 
 &i2c5 {
 	status = "okay";
-	vdd_dvfs: max8973 at 1b {
+	vdd_dvfs: regulator at 1b {
 		compatible = "maxim,max8973";
 		reg = <0x1b>;

Signature · 1 line

1.9.1

Geert Uytterhoeven

author

2015-04-27 12:55 UTC #8 lore raw

PATCH 8/10 ARM: shmobile: armadillo800eva dts: Use generic names for device nodes

In reply to Geert Uytterhoeven

wm8978 -> codec

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/boot/dts/r8a7740-armadillo800eva.dts +1 -1

index 9bd0cb439f448d03..2e31d8c01cbf6a74 100644
@@ -208,7 +208,7 @@
 		gpios = <&pfc 166 GPIO_ACTIVE_LOW>;
 	};
 
-	wm8978: wm8978 at 1a {
+	wm8978: codec at 1a {
 		#sound-dai-cells = <0>;
 		compatible = "wlf,wm8978";
 		reg = <0x1a>;

Signature · 1 line

1.9.1

Sergei Shtylyov

2015-04-27 13:05 UTC #9 lore raw

PATCH 8/10 ARM: shmobile: armadillo800eva dts: Use generic names for device nodes

Hello.

Quoted 12 lines · Geert Uytterhoeven

wm8978 -> codec
Signed-off-by Geert Uytterhoeven <[email protected]>
---
  arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/r8a7740-armadillo800eva.dts +0 -0
index 9bd0cb439f448d03..2e31d8c01cbf6a74 100644

arch/arm/boot/dts/r8a7740-armadillo800eva.dts line 211

Quoted 5 lines

arch/arm/boot/dts/r8a7740-armadillo800eva.dts +1 -1

@@ -208,7 +208,7 @@
  		gpios = <&pfc 166 GPIO_ACTIVE_LOW>;
  	};
 
-	wm8978: wm8978 at 1a {
+	wm8978: codec at 1a {

Perhaps sound-codec?

[...]

WBR, Sergei

Geert Uytterhoeven

2015-04-28 08:52 UTC #10 lore raw

PATCH 8/10 ARM: shmobile: armadillo800eva dts: Use generic names for device nodes

Quoted 4 lines · Sergei Shtylyov

arch/arm/boot/dts/r8a7740-armadillo800eva.dts line 211
Quoted 2 lines
arch/arm/boot/dts/r8a7740-armadillo800eva.dts +1 -1
-       wm8978: wm8978 at 1a {
+       wm8978: codec at 1a {
Perhaps sound-codec?

Given there's no single instance of "sound-codec" under Documentation/devicetree/, and only four occurrences in DTS files (whoops, I should fix up 3 of them ;-):

    arch/arm/boot/dts/r8a7778-bockw.dts: ak4643: sound-codec at 12 {
    arch/arm/boot/dts/r8a7790-lager.dts: ak4643: sound-codec at 12 {
    arch/arm/boot/dts/r8a7791-koelsch.dts: ak4643: sound-codec at 12 {
    arch/xtensa/boot/dts/xtfpga.dtsi: tlv320aic23: sound-codec at 0 {

I'm strongly leaning towards "codec".

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Simon Horman

2015-04-30 00:12 UTC #11 lore raw

PATCH 8/10 ARM: shmobile: armadillo800eva dts: Use generic names for device nodes

Quoted 10 lines · Geert Uytterhoeven

Quoted 4 lines · Sergei Shtylyov
arch/arm/boot/dts/r8a7740-armadillo800eva.dts line 211
Quoted 2 lines
arch/arm/boot/dts/r8a7740-armadillo800eva.dts +1 -1
-       wm8978: wm8978 at 1a {
+       wm8978: codec at 1a {
Perhaps sound-codec?
Given there's no single instance of "sound-codec" under Documentation/devicetree/, and only four occurrences in DTS files (whoops, I should fix up 3 of them ;-):

I'm happy to help with that if you are dunning short of cycles.

Quoted 6 lines

    arch/arm/boot/dts/r8a7778-bockw.dts: ak4643: sound-codec at 12 {
    arch/arm/boot/dts/r8a7790-lager.dts: ak4643: sound-codec at 12 {
    arch/arm/boot/dts/r8a7791-koelsch.dts: ak4643: sound-codec at 12 {
    arch/xtensa/boot/dts/xtfpga.dtsi: tlv320aic23: sound-codec at 0 {

I'm strongly leaning towards "codec".

On the strength of that I have queued this up.

Simon Horman

2015-04-30 00:13 UTC #12 lore raw

PATCH 8/10 ARM: shmobile: armadillo800eva dts: Use generic names for device nodes

Quoted 8 lines · Simon Horman

Quoted 7 lines · Geert Uytterhoeven
Quoted 4 lines · Sergei Shtylyov
arch/arm/boot/dts/r8a7740-armadillo800eva.dts line 211
Quoted 2 lines
arch/arm/boot/dts/r8a7740-armadillo800eva.dts +1 -1
-       wm8978: wm8978 at 1a {
+       wm8978: codec at 1a {
Perhaps sound-codec?

Quoted 7 lines

Quoted 3 lines
Given there's no single instance of "sound-codec" under Documentation/devicetree/, and only four occurrences in DTS files (whoops, I should fix up 3 of them ;-):
:)
I'm happy to help with that if you are dunning short of cycles.

I see you have already sent patches, thanks.

Quoted 13 lines

Quoted 6 lines
    arch/arm/boot/dts/r8a7778-bockw.dts: ak4643: sound-codec at 12 {
    arch/arm/boot/dts/r8a7790-lager.dts: ak4643: sound-codec at 12 {
    arch/arm/boot/dts/r8a7791-koelsch.dts: ak4643: sound-codec at 12 {
    arch/xtensa/boot/dts/xtfpga.dtsi: tlv320aic23: sound-codec at 0 {
I'm strongly leaning towards "codec".
On the strength of that I have queued this up.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Geert Uytterhoeven

author

2015-04-27 12:55 UTC #13 lore raw

PATCH 9/10 ARM: shmobile: kzm9d dts: Use generic names for device nodes

In reply to Geert Uytterhoeven

lan9220 -> ethernet
uart -> serial

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 arch/arm/boot/dts/emev2-kzm9d.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/emev2-kzm9d.dts +2 -2

index 19446273e4a7f832..1dee0aa4f40cc351 100644
@@ -81,7 +81,7 @@
 		regulator-boot-on;
 	};
 
-	lan9220 at 20000000 {
+	ethernet at 20000000 {
 		compatible = "smsc,lan9220", "smsc,lan9115";
 		reg = <0x20000000 0x10000>;
 		phy-mode = "mii";

@@ -96,7 +96,7 @@
 };
 
 &pfc {
-	uart1_pins: uart at e1030000 {
+	uart1_pins: serial at e1030000 {
 		renesas,groups = "uart1_ctrl", "uart1_data";
 		renesas,function = "uart1";
 	};

Signature · 1 line

1.9.1

Geert Uytterhoeven

author

2015-04-27 12:55 UTC #14 lore raw

PATCH 10/10 ARM: shmobile: marzen dts: Use generic names for device nodes

In reply to Geert Uytterhoeven

lan0 -> ethernet

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 arch/arm/boot/dts/r8a7779-marzen.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

arch/arm/boot/dts/r8a7779-marzen.dts +3 -3

index 540756cdf3914a2a..20afea6f06ef6735 100644
@@ -42,10 +42,10 @@
 		regulator-always-on;
 	};
 
-	lan0 at 18000000 {
+	ethernet at 18000000 {
 		compatible = "smsc,lan9220", "smsc,lan9115";
 		reg = <0x18000000 0x100>;
-		pinctrl-0 = <&lan0_pins>;
+		pinctrl-0 = <&ethernet_pins>;
 		pinctrl-names = "default";
 
 		phy-mode = "mii";

@@ -176,7 +176,7 @@
 		};
 	};
 
-	lan0_pins: lan0 {
+	ethernet_pins: ethernet {
 		intc {
 			renesas,groups = "intc_irq1_b";
 			renesas,function = "intc";

Signature · 1 line

1.9.1

Sergei Shtylyov

2015-04-27 13:06 UTC #15 lore raw

PATCH 10/10 ARM: shmobile: marzen dts: Use generic names for device nodes

Quoted 11 lines · Geert Uytterhoeven

lan0 -> ethernet
Signed-off-by Geert Uytterhoeven <[email protected]>
---
  arch/arm/boot/dts/r8a7779-marzen.dts | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/r8a7779-marzen.dts +0 -0
index 540756cdf3914a2a..20afea6f06ef6735 100644

[...]

arch/arm/boot/dts/r8a7779-marzen.dts line 179

Quoted 6 lines

arch/arm/boot/dts/r8a7779-marzen.dts +1 -1

@@ -176,7 +176,7 @@
  		};
  	};
 
-	lan0_pins: lan0 {
+	ethernet_pins: ethernet {

Why change the label?

WBR, Sergei

Geert Uytterhoeven

2015-04-27 13:53 UTC #16 lore raw

PATCH 10/10 ARM: shmobile: marzen dts: Use generic names for device nodes

Quoted 5 lines · Sergei Shtylyov

arch/arm/boot/dts/r8a7779-marzen.dts line 179
Quoted 2 lines
arch/arm/boot/dts/r8a7779-marzen.dts +1 -1
-       lan0_pins: lan0 {
+       ethernet_pins: ethernet {
Why change the label?

If there's only one instance, we usually name the pins like the device node.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Simon Horman

2015-04-28 00:57 UTC #17 lore raw

cover ARM: shmobile: Use generic names for device nodes

In reply to Geert Uytterhoeven

Quoted 6 lines · Geert Uytterhoeven

Hi Magnus, Simon,
This patch series gets rid of the last non-generic device nodes names in the shmobile DTS files, and replaces them by generic names, cfr. ePAPR.
Thanks for applying!

Thanks!

I have queued up the patches except for 08/10 which Sergei raised a concern about for which I am unsure of the resolution of.

Quoted 10 lines

Geert Uytterhoeven (10):
ARM: shmobile: r8a7740 dtsi: Use generic names for device nodes
ARM: shmobile: r8a7778 dtsi: Use generic names for device nodes
ARM: shmobile: r8a7779 dtsi: Use generic names for device nodes
ARM: shmobile: r8a7790 dtsi: Use generic names for device nodes
ARM: shmobile: r8a7791 dtsi: Use generic names for device nodes
ARM: shmobile: sh73a0 dtsi: Use generic names for device nodes
ARM: shmobile: ape6evm dts: Use generic names for device nodes
ARM: shmobile: armadillo800eva dts: Use generic names for device nodes

The above armadillo800eva patch is 08/10; the one I have not queued up (yet).

Quoted 14 lines

ARM: shmobile: kzm9d dts: Use generic names for device nodes
ARM: shmobile: marzen dts: Use generic names for device nodes

 arch/arm/boot/dts/emev2-kzm9d.dts             | 4 ++--
 arch/arm/boot/dts/r8a73a4-ape6evm.dts         | 2 +-
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +-
 arch/arm/boot/dts/r8a7740.dtsi                | 8 ++++----
 arch/arm/boot/dts/r8a7778.dtsi                | 2 +-
 arch/arm/boot/dts/r8a7779-marzen.dts          | 6 +++---
 arch/arm/boot/dts/r8a7779.dtsi                | 2 +-
 arch/arm/boot/dts/r8a7790.dtsi                | 2 +-
 arch/arm/boot/dts/r8a7791.dtsi                | 2 +-
 arch/arm/boot/dts/sh73a0.dtsi                 | 8 ++++----
 10 files changed, 19 insertions(+), 19 deletions(-)