Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45c636b4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-dt5-for-v3.18' of... 

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: default avatarArnd 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
parents 84bdd3a4 08adafd4

Documentation/devicetree/bindings/arm/shmobile.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -53,11 +53,11 @@ Boards: 
    compatible = "renesas,henninger", "renesas,r8a7791"

    compatible = "renesas,henninger", "renesas,r8a7791"

  - Koelsch (RTP0RC7791SEB00010S)

  - Koelsch (RTP0RC7791SEB00010S)

    compatible = "renesas,koelsch", "renesas,r8a7791"

    compatible = "renesas,koelsch", "renesas,r8a7791"

  - KZM9D

  - Kyoto Microcomputer Co. KZM-A9-Dual

    compatible = "renesas,kzm9d", "renesas,emev2"

    compatible = "renesas,kzm9d", "renesas,emev2"

  - KZM-A9-GT

  - Kyoto Microcomputer Co. KZM-A9-GT

    compatible = "renesas,kzm9g", "renesas,sh73a0"

    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"

    compatible = "renesas,kzm9g-reference", "renesas,sh73a0"

  - Lager (RTP0RC7790SEB00010S)

  - Lager (RTP0RC7790SEB00010S)

    compatible = "renesas,lager", "renesas,r8a7790"

    compatible = "renesas,lager", "renesas,r8a7790"

arch/arm/boot/dts/r8a73a4.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ 
	};

	};





	irqc0: interrupt-controller@e61c0000 {

	irqc0: interrupt-controller@e61c0000 {

		compatible = "renesas,irqc";

		compatible = "renesas,irqc-r8a73a4", "renesas,irqc";

		#interrupt-cells = <2>;

		#interrupt-cells = <2>;

		interrupt-controller;

		interrupt-controller;

		reg = <0 0xe61c0000 0 0x200>;

		reg = <0 0xe61c0000 0 0x200>;
@@ -90,7 +90,7 @@ 
	};

	};





	irqc1: interrupt-controller@e61c0200 {

	irqc1: interrupt-controller@e61c0200 {

		compatible = "renesas,irqc";

		compatible = "renesas,irqc-r8a73a4", "renesas,irqc";

		#interrupt-cells = <2>;

		#interrupt-cells = <2>;

		interrupt-controller;

		interrupt-controller;

		reg = <0 0xe61c0200 0 0x200>;

		reg = <0 0xe61c0200 0 0x200>;