diff options
author | Olof Johansson <olof@lixom.net> | 2014-02-20 04:16:28 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-02-20 04:16:28 -0500 |
commit | ff280bceb554633429e28a80b70ba83d79c96071 (patch) | |
tree | 744a6602ed6f8f6b4aaccfe677eafb6bdf393b9c /arch/arm/boot | |
parent | 22a74909b1ad9db2c05e1aa3441ec5607be4bc0c (diff) | |
parent | 03fec7dee502d43114f384a1588ce84a3c9bf38d (diff) |
Merge tag 'renesas-boards2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
Merge "Second Round of Renesas ARM Based SoC Board Updates for v3.15" from
Simon Horman:
* r7s72100 (RZ/A1H) based Genmai board
- Enable SH ethernet
- Add RSPI support
* r8a7791 (R-Car M2) based Koelsch board
- Add QSPI support
- Add I2C support
- Pass SH ethernet PHY IRQ
* r8a7790 (R-Car H2) based Lager board
- Switch QSPI to named IRQs
- Add sound support
- Add USB0 cable detection workaround
- Pass SH ethernet PHY IRQ
* r8a7779 (R-Car H1) based Marzen board
- Revert conditional selection of SMSC_PHY
* r8a7778 (R-Car M1) based Bock-W board
- Use wp-gpios instead of WP pin
* tag 'renesas-boards2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: genmai: Enable r7s72100-ether
ARM: shmobile: lager legacy: Switch QSPI to named IRQs
ARM: shmobile: koelsch legacy: Add QSPI support
ARM: shmobile: genmai legacy: Add RSPI support
Revert "ARM: shmobile: marzen: Conditionally select SMSC_PHY"
ARM: shmobile: lager: add sound support
ARM: shmobile: Lager USB0 cable detection workaround
ARM: shmobile: bockw: use wp-gpios instead of WP pin
ARM: shmobile: koelsch: Add I2C support
ARM: shmobile: Koelsch: pass Ether PHY IRQ
ARM: shmobile: Lager: pass Ether PHY IRQ
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/r8a7778-bockw-reference.dts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts index bb62c7a906f4..06cda19dac6a 100644 --- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts +++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts | |||
@@ -17,6 +17,7 @@ | |||
17 | /dts-v1/; | 17 | /dts-v1/; |
18 | #include "r8a7778.dtsi" | 18 | #include "r8a7778.dtsi" |
19 | #include <dt-bindings/interrupt-controller/irq.h> | 19 | #include <dt-bindings/interrupt-controller/irq.h> |
20 | #include <dt-bindings/gpio/gpio.h> | ||
20 | 21 | ||
21 | / { | 22 | / { |
22 | model = "bockw"; | 23 | model = "bockw"; |
@@ -84,7 +85,7 @@ | |||
84 | 85 | ||
85 | sdhi0_pins: sd0 { | 86 | sdhi0_pins: sd0 { |
86 | renesas,groups = "sdhi0_data4", "sdhi0_ctrl", | 87 | renesas,groups = "sdhi0_data4", "sdhi0_ctrl", |
87 | "sdhi0_cd", "sdhi0_wp"; | 88 | "sdhi0_cd"; |
88 | renesas,function = "sdhi0"; | 89 | renesas,function = "sdhi0"; |
89 | }; | 90 | }; |
90 | 91 | ||
@@ -101,6 +102,7 @@ | |||
101 | vmmc-supply = <&fixedregulator3v3>; | 102 | vmmc-supply = <&fixedregulator3v3>; |
102 | bus-width = <4>; | 103 | bus-width = <4>; |
103 | status = "okay"; | 104 | status = "okay"; |
105 | wp-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>; | ||
104 | }; | 106 | }; |
105 | 107 | ||
106 | &hspi0 { | 108 | &hspi0 { |