| From c7bdbd3c40ff0e8cddfbc304316d6d210cdd558d Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Mon, 21 Oct 2013 19:37:14 -0700 |
| Subject: ARM: shmobile: armadillo: tidyup DT node naming |
| |
| According to ePAPR spec, |
| this patch tidies up DT node name. |
| |
| This patch removed un-used "touchscreen" label |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit e63763b9b55a6833047199bd587e061520302ffc) |
| (Queued by ARM-SoC for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts |
| index 1c56c5e56950..6a542198985d 100644 |
| --- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts |
| +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts |
| @@ -90,7 +90,7 @@ |
| |
| &i2c0 { |
| status = "okay"; |
| - touchscreen: st1232@55 { |
| + touchscreen@55 { |
| compatible = "sitronix,st1232"; |
| reg = <0x55>; |
| interrupt-parent = <&irqpin1>; |
| @@ -105,12 +105,12 @@ |
| pinctrl-0 = <&scifa1_pins>; |
| pinctrl-names = "default"; |
| |
| - scifa1_pins: scifa1 { |
| + scifa1_pins: serial1 { |
| renesas,groups = "scifa1_data"; |
| renesas,function = "scifa1"; |
| }; |
| |
| - st1232_pins: st1232 { |
| + st1232_pins: touchscreen { |
| renesas,groups = "intc_irq10"; |
| renesas,function = "intc"; |
| }; |
| @@ -125,7 +125,7 @@ |
| renesas,function = "mmc0"; |
| }; |
| |
| - sdhi0_pins: sdhi0 { |
| + sdhi0_pins: sd0 { |
| renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_wp"; |
| renesas,function = "sdhi0"; |
| }; |
| -- |
| 1.8.5.rc3 |
| |
