summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-10-22 04:37:14 +0200
committerSimon Horman <horms+renesas@verge.net.au>2013-12-10 09:27:01 +0100
commite63763b9b55a6833047199bd587e061520302ffc (patch)
tree2f350ade2bd26a7cd67f8be5ba83126878f0112e /arch/arm/boot
parentARM: shmobile: sh73a0: tidyup DT node naming (diff)
downloadlinux-e63763b9b55a6833047199bd587e061520302ffc.tar.xz
linux-e63763b9b55a6833047199bd587e061520302ffc.zip
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>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts8
1 files 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";
};