summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-04-24 15:34:00 +0200
committerArnd Bergmann <arnd@arndb.de>2014-04-24 15:34:00 +0200
commit8a52a116d1c3e9ee93e3886eb87a419e32b22cd5 (patch)
tree5fcba73bc5e7aafcc521d52082b3d2ec981af0b8 /arch/arm
parent59209c9a34f1e57922055110a476f9bc56c3fc99 (diff)
parentb08eed0c4d7d70eae2f4f1ff518cc33643722a07 (diff)
Merge tag 'renesas-dt5-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
Fifth Round of Renesas ARM Based SoC DT Updates for v3.15 Correct renesas,groups in SDHI nodes of for r8a7790 (R-Car H2) based Lager board. * tag 'renesas-dt5-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: lager: correct renesas,gpios to renesas,groups in sd[02] pfc Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/r8a7790-lager.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 6e99eb2df076..d01048ab3e77 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -141,12 +141,12 @@
};
sdhi0_pins: sd0 {
- renesas,gpios = "sdhi0_data4", "sdhi0_ctrl";
+ renesas,groups = "sdhi0_data4", "sdhi0_ctrl";
renesas,function = "sdhi0";
};
sdhi2_pins: sd2 {
- renesas,gpios = "sdhi2_data4", "sdhi2_ctrl";
+ renesas,groups = "sdhi2_data4", "sdhi2_ctrl";
renesas,function = "sdhi2";
};