diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 20:08:56 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 20:08:56 +0400 |
| commit | 45c636b46e25981e22a4ab3cbf53ac80fbbc5b08 (patch) | |
| tree | 72b03c0ffa4898c9cbe041ed66ea1d07b87fe27c /Documentation | |
| parent | 84bdd3a491aecd83781244a2f42d37625a9ed431 (diff) | |
| parent | 08adafd4a1f8c9b6e2c49d955a0e45743c9ffd9a (diff) | |
| download | linux-45c636b46e25981e22a4ab3cbf53ac80fbbc5b08.tar.xz | |
Merge tag 'renesas-dt5-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Pull "Fifth Round of Renesas ARM Based SoC DT Updates for v3.18" from Simon Horman:
* Document manufacturer for KZM boards
* Use SoC-specific irqc compatible property
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-dt5-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Add manufacturer for KZM boards
ARM: shmobile: r8a73a4 dtsi: Add SoC-specific irqc compatible property
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/shmobile.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt index 5d1c5c0085dc..51147cb5c036 100644 --- a/Documentation/devicetree/bindings/arm/shmobile.txt +++ b/Documentation/devicetree/bindings/arm/shmobile.txt @@ -53,11 +53,11 @@ Boards: compatible = "renesas,henninger", "renesas,r8a7791" - Koelsch (RTP0RC7791SEB00010S) compatible = "renesas,koelsch", "renesas,r8a7791" - - KZM9D + - Kyoto Microcomputer Co. KZM-A9-Dual compatible = "renesas,kzm9d", "renesas,emev2" - - KZM-A9-GT + - Kyoto Microcomputer Co. KZM-A9-GT compatible = "renesas,kzm9g", "renesas,sh73a0" - - KZM-A9-GT - Reference Device Tree Implementation + - Kyoto Microcomputer Co. KZM-A9-GT - Reference Device Tree Implementation compatible = "renesas,kzm9g-reference", "renesas,sh73a0" - Lager (RTP0RC7790SEB00010S) compatible = "renesas,lager", "renesas,r8a7790" |