Skip to content

Commit

Permalink
Merge tag 'renesas-dt5-for-v3.18' of git://git.kernel.org/pub/scm/lin…
Browse files Browse the repository at this point in the history
…ux/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
  • Loading branch information
Arnd Bergmann committed Sep 25, 2014
2 parents 84bdd3a + 08adafd commit 45c636b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Documentation/devicetree/bindings/arm/shmobile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/r8a73a4.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
};

irqc0: interrupt-controller@e61c0000 {
compatible = "renesas,irqc";
compatible = "renesas,irqc-r8a73a4", "renesas,irqc";
#interrupt-cells = <2>;
interrupt-controller;
reg = <0 0xe61c0000 0 0x200>;
Expand Down Expand Up @@ -90,7 +90,7 @@
};

irqc1: interrupt-controller@e61c0200 {
compatible = "renesas,irqc";
compatible = "renesas,irqc-r8a73a4", "renesas,irqc";
#interrupt-cells = <2>;
interrupt-controller;
reg = <0 0xe61c0200 0 0x200>;
Expand Down

0 comments on commit 45c636b

Please sign in to comment.