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

Commit 5d518c8a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-arm64-dt2-for-v4.13' of... 

Merge tag 'renesas-arm64-dt2-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64

Second Round of Renesas ARM64 Based SoC DT Updates for v4.13

* Add reset control properties for audio to r9a779[56] SoCs
* Add add DMA for IIC_DVFS to r9a779[56] SoCs
* Add support for Salvator-XS and H3ULCB with R-Car H3 (r8a7795) ES2
* Add missing index to PWM pinctrl subnode name to Salvator-X board
* Add 12288000 for sound ADG to Salvator-X and ULCB boards

* tag 'renesas-arm64-dt2-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  arm64: dts: r8a7796: Add reset control properties for audio
  arm64: dts: r8a7795: Add reset control properties for audio
  arm64: dts: renesas: Add support for Salvator-XS with R-Car H3 ES2.0
  arm64: dts: renesas: Add common Salvator-XS board support
  arm64: dts: renesas: Extract common Salvator-X/XS board support
  arm64: dts: salvator-x: Add missing index to PWM pinctrl subnode name
  arm64: dts: r8a7795: h3ulcb: Add support for R-Car H3 ES2.0
  arm64: dts: r8a7796: add DMA for IIC_DVFS
  arm64: dts: r8a7795: add DMA for IIC_DVFS
  arm64: dts: ulcb: add 12288000 for sound ADG
  arm64: dts: salvator-x: add 12288000 for sound ADG

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9d03b296 4d1255eb

arch/arm64/boot/dts/renesas/Makefile

+2 −1
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-h3ulcb.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-xs.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb

dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb



always		:= $(dtb-y)

arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for the H3ULCB (R-Car Starter Kit Premier) board

 *

 * Copyright (C) 2016 Renesas Electronics Corp.

 * Copyright (C) 2016 Cogent Embedded, Inc.

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4



/dts-v1/;

#include "r8a7795-es1.dtsi"

#include "ulcb.dtsi"



/ {

	model = "Renesas H3ULCB board based on r8a7795 ES1.x";

	compatible = "renesas,h3ulcb", "renesas,r8a7795";



	memory@48000000 {

		device_type = "memory";

		/* first 128MB is reserved for secure area. */

		reg = <0x0 0x48000000 0x0 0x38000000>;

	};



	memory@500000000 {

		device_type = "memory";

		reg = <0x5 0x00000000 0x0 0x40000000>;

	};



	memory@600000000 {

		device_type = "memory";

		reg = <0x6 0x00000000 0x0 0x40000000>;

	};



	memory@700000000 {

		device_type = "memory";

		reg = <0x7 0x00000000 0x0 0x40000000>;

	};

};

arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts

+2 −2
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ 
#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4



/dts-v1/;

#include "r8a7795-es1.dtsi"

#include "r8a7795.dtsi"

#include "ulcb.dtsi"



/ {

	model = "Renesas H3ULCB board based on r8a7795 ES1.x";

	model = "Renesas H3ULCB board based on r8a7795 ES2.0+";

	compatible = "renesas,h3ulcb", "renesas,r8a7795";



	memory@48000000 {

arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts

0 → 100644
+109 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for the Salvator-X 2nd version board

 *

 * Copyright (C) 2015-2017 Renesas Electronics Corp.

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4



/dts-v1/;

#include "r8a7795.dtsi"

#include "salvator-xs.dtsi"



/ {

	model = "Renesas Salvator-X 2nd version board based on r8a7795 ES2.0+";

	compatible = "renesas,salvator-xs", "renesas,r8a7795";



	memory@48000000 {

		device_type = "memory";

		/* first 128MB is reserved for secure area. */

		reg = <0x0 0x48000000 0x0 0x38000000>;

	};



	memory@500000000 {

		device_type = "memory";

		reg = <0x5 0x00000000 0x0 0x40000000>;

	};



	memory@600000000 {

		device_type = "memory";

		reg = <0x6 0x00000000 0x0 0x40000000>;

	};



	memory@700000000 {

		device_type = "memory";

		reg = <0x7 0x00000000 0x0 0x40000000>;

	};

};



&du {

	clocks = <&cpg CPG_MOD 724>,

		 <&cpg CPG_MOD 723>,

		 <&cpg CPG_MOD 722>,

		 <&cpg CPG_MOD 721>,

		 <&cpg CPG_MOD 727>,

		 <&x21_clk>,

		 <&x22_clk>;

	clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",

		      "dclkin.1", "dclkin.2";

};



&ehci2 {

	status = "okay";

};



&hdmi0 {

	status = "okay";



	ports {

		port@1 {

			reg = <1>;

			rcar_dw_hdmi0_out: endpoint {

				remote-endpoint = <&hdmi0_con>;

			};

		};

	};

};



&hdmi0_con {

	remote-endpoint = <&rcar_dw_hdmi0_out>;

};



&hdmi1 {

	status = "okay";



	ports {

		port@1 {

			reg = <1>;

			rcar_dw_hdmi1_out: endpoint {

				remote-endpoint = <&hdmi1_con>;

			};

		};

	};

};



&hdmi1_con {

	remote-endpoint = <&rcar_dw_hdmi1_out>;

};



&ohci2 {

	status = "okay";

};



&pfc {

	usb2_pins: usb2 {

		groups = "usb2";

		function = "usb2";

	};

};



&usb2_phy2 {

	pinctrl-0 = <&usb2_pins>;

	pinctrl-names = "default";



	status = "okay";

};

arch/arm64/boot/dts/renesas/r8a7795.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -883,6 +883,8 @@ 
			clocks = <&cpg CPG_MOD 926>;

			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;

			resets = <&cpg 926>;

			dmas = <&dmac0 0x11>, <&dmac0 0x10>;

			dma-names = "tx", "rx";

			status = "disabled";

		};
@@ -1118,6 +1120,16 @@ 
				      "dvc.0", "dvc.1",

				      "clk_a", "clk_b", "clk_c", "clk_i";

			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;

			resets = <&cpg 1005>,

				 <&cpg 1006>, <&cpg 1007>,

				 <&cpg 1008>, <&cpg 1009>,

				 <&cpg 1010>, <&cpg 1011>,

				 <&cpg 1012>, <&cpg 1013>,

				 <&cpg 1014>, <&cpg 1015>;

			reset-names = "ssi-all",

				      "ssi.9", "ssi.8", "ssi.7", "ssi.6",

				      "ssi.5", "ssi.4", "ssi.3", "ssi.2",

				      "ssi.1", "ssi.0";

			status = "disabled";



			rcar_sound,dvc {