Commit 1a08a84c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-dt3-for-v4.3' of... 

Merge tag 'renesas-dt3-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Third Round of Renesas ARM Based SoC DT Updates for v4.3

* Add JPU support: r8a7791 and r8a7790 SoCs
* Add MMCIF and PFC support: r8a7794 SoC
* Add initial support for r8a7794/silk
* Add missing "gpio-ranges" to gpio nodes: sh73a0, r8a7740 and r8a73a4 SoCs

* tag 'renesas-dt3-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: sh73a0 dtsi: Add missing "gpio-ranges" to gpio node
  ARM: shmobile: r8a7740 dtsi: Add missing "gpio-ranges" to gpio node
  ARM: shmobile: r8a73a4 dtsi: Add missing "gpio-ranges" to gpio node
  ARM: shmobile: silk: add eMMC DT support
  ARM: shmobile: r8a7794: add MMCIF DT support
  ARM: shmobile: silk: add Ether DT support
  ARM: shmobile: silk: initial device tree
  ARM: shmobile: r8a7794: add PFC DT support
  ARM: shmobile: r8a7791: Add JPU device node.
  ARM: shmobile: r8a7790: Add JPU device node.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1e86355a 94bdc48d

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -535,6 +535,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \ 
	r8a7791-koelsch.dtb \

	r8a7793-gose.dtb \

	r8a7794-alt.dtb \

	r8a7794-silk.dtb \

	sh73a0-kzm9g.dtb

dtb-$(CONFIG_ARCH_SOCFPGA) += \

	socfpga_arria5_socdk.dtb \

arch/arm/boot/dts/r8a73a4.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -207,6 +207,13 @@ 
		reg = <0 0xe6050000 0 0x9000>;

		gpio-controller;

		#gpio-cells = <2>;

		gpio-ranges =

			<&pfc 0 0 31>, <&pfc 32 32 9>,

			<&pfc 64 64 22>, <&pfc 96 96 31>,

			<&pfc 128 128 7>, <&pfc 160 160 19>,

			<&pfc 192 192 31>, <&pfc 224 224 27>,

			<&pfc 256 256 28>, <&pfc 288 288 21>,

			<&pfc 320 320 10>;

		interrupts-extended =

			<&irqc0  0 0>, <&irqc0  1 0>, <&irqc0  2 0>, <&irqc0  3 0>,

			<&irqc0  4 0>, <&irqc0  5 0>, <&irqc0  6 0>, <&irqc0  7 0>,

arch/arm/boot/dts/r8a7740.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ 
		      <0xe605800c 0x20>;

		gpio-controller;

		#gpio-cells = <2>;

		gpio-ranges = <&pfc 0 0 212>;

		interrupts-extended =

			<&irqpin0 0 0>, <&irqpin0 1 0>, <&irqpin0 2 0>, <&irqpin0 3 0>,

			<&irqpin0 4 0>, <&irqpin0 5 0>, <&irqpin0 6 0>, <&irqpin0 7 0>,

arch/arm/boot/dts/r8a7790.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -872,6 +872,13 @@ 
		status = "disabled";

	};



	jpu: jpeg-codec@fe980000 {

		compatible = "renesas,jpu-r8a7790";

		reg = <0 0xfe980000 0 0x10300>;

		interrupts = <0 272 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp1_clks R8A7790_CLK_JPU>;

	};



	clocks {

		#address-cells = <2>;

		#size-cells = <2>;

arch/arm/boot/dts/r8a7791.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -898,6 +898,13 @@ 
		status = "disabled";

	};



	jpu: jpeg-codec@fe980000 {

		compatible = "renesas,jpu-r8a7791";

		reg = <0 0xfe980000 0 0x10300>;

		interrupts = <0 272 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp1_clks R8A7791_CLK_JPU>;

	};



	clocks {

		#address-cells = <2>;

		#size-cells = <2>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE