diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-18 19:19:11 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-18 19:19:11 -0700 |
| commit | 3325a5ce0f92a415001fc17d508471d9e466f3a9 (patch) | |
| tree | e60ab95df50dc5784bc3082816b3d102f4d0265b /arch/arm/boot | |
| parent | 2b503be33237a6dfc7c406319115aeb35ff5d098 (diff) | |
| parent | 13132b3f44d3600983aceb7e9920b8ebb55a7cf8 (diff) | |
Merge tag 'renesas-fixes2-for-v4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/fixes-non-critical
Second Round of Renesas ARM Based SoC Fixes for v4.12
* Split LCD mux and gpio on armadillo800eva board
* tag 'renesas-fixes2-for-v4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: dts: armadillo800eva: Split LCD mux and gpio
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts index 7885075428bb..1788e186a512 100644 --- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts @@ -266,7 +266,9 @@ lcd0_pins: lcd0 { groups = "lcd0_data24_0", "lcd0_lclk_1", "lcd0_sync"; function = "lcd0"; + }; + lcd0_mux { /* DBGMD/LCDC0/FSIA MUX */ gpio-hog; gpios = <176 0>; |