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

Commit d1005cc9 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

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

* Add Audio MIX and CTU support to r8a779[01] SoCs
* Correct IRQ sense for adv7511 on lager board
* Add sound label to koelsch and lager boards
* Add IIC support to emev2 SoC

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

:
  ARM: shmobile: r8a7791: Add Audio MIX support on DTSI
  ARM: shmobile: r8a7791: Add Audio CTU support on DTSI
  ARM: shmobile: r8a7790: Add Audio MIX support on DTSI
  ARM: shmobile: r8a7790: Add Audio CTU support on DTSI
  ARM: shmobile: lager: Fix adv7511 IRQ sensing
  ARM: shmobile: koelsch: add sound label on DTS
  ARM: shmobile: lager: add sound label on DTS
  ARM: shmobile: emev2: kzm9d: enable IIC busses
  ARM: shmobile: emev2: add IIC cores to dtsi

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 69516303 7fd6e11d

arch/arm/boot/dts/emev2-kzm9d.dts

+8 −0
Original line number Diff line number Diff line
@@ -95,6 +95,14 @@ 
	};

};



&iic0 {

	status = "okay";

};



&iic1 {

	status = "okay";

};



&pfc {

	uart1_pins: serial@e1030000 {

		renesas,groups = "uart1_ctrl", "uart1_data";

arch/arm/boot/dts/emev2.dtsi

+48 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
		gpio2 = &gpio2;

		gpio3 = &gpio3;

		gpio4 = &gpio4;

		i2c0 = &iic0;

		i2c1 = &iic1;

	};



	cpus {
@@ -66,6 +68,30 @@ 
			clock-frequency = <32768>;

			#clock-cells = <0>;

		};

		iic0_sclkdiv: iic0_sclkdiv {

			compatible = "renesas,emev2-smu-clkdiv";

			reg = <0x624 0>;

			clocks = <&pll3_fo>;

			#clock-cells = <0>;

		};

		iic0_sclk: iic0_sclk {

			compatible = "renesas,emev2-smu-gclk";

			reg = <0x48c 1>;

			clocks = <&iic0_sclkdiv>;

			#clock-cells = <0>;

		};

		iic1_sclkdiv: iic1_sclkdiv {

			compatible = "renesas,emev2-smu-clkdiv";

			reg = <0x624 16>;

			clocks = <&pll3_fo>;

			#clock-cells = <0>;

		};

		iic1_sclk: iic1_sclk {

			compatible = "renesas,emev2-smu-gclk";

			reg = <0x490 1>;

			clocks = <&iic1_sclkdiv>;

			#clock-cells = <0>;

		};

		pll3_fo: pll3_fo {

			compatible = "fixed-factor-clock";

			clocks = <&c32ki>;
@@ -234,4 +260,26 @@ 
		interrupt-controller;

		#interrupt-cells = <2>;

	};



	iic0: i2c@e0070000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,iic-emev2";

		reg = <0xe0070000 0x28>;

		interrupts = <0 32 IRQ_TYPE_EDGE_RISING>;

		clocks = <&iic0_sclk>;

		clock-names = "sclk";

		status = "disabled";

	};



	iic1: i2c@e10a0000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,iic-emev2";

		reg = <0xe10a0000 0x28>;

		interrupts = <0 33 IRQ_TYPE_EDGE_RISING>;

		clocks = <&iic1_sclk>;

		clock-names = "sclk";

		status = "disabled";

	};

};

arch/arm/boot/dts/r8a7790-lager.dts

+2 −2
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ 
			  1800000 0>;

	};



	sound {

	rsnd_ak4643: sound {

		compatible = "simple-audio-card";



		simple-audio-card,format = "left_j";
@@ -548,7 +548,7 @@ 
		compatible = "adi,adv7511w";

		reg = <0x39>;

		interrupt-parent = <&gpio1>;

		interrupts = <15 IRQ_TYPE_EDGE_FALLING>;

		interrupts = <15 IRQ_TYPE_LEVEL_LOW>;



		adi,input-depth = <8>;

		adi,input-colorspace = "rgb";

arch/arm/boot/dts/r8a7790.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -1303,6 +1303,7 @@ 
				<&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,

				<&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,

				<&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,

				<&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,

				<&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>;



			#clock-cells = <1>;
@@ -1312,6 +1313,7 @@ 
				R8A7790_CLK_SSI4 R8A7790_CLK_SSI3 R8A7790_CLK_SSI2 R8A7790_CLK_SSI1 R8A7790_CLK_SSI0

				R8A7790_CLK_SCU_ALL

				R8A7790_CLK_SCU_DVC1 R8A7790_CLK_SCU_DVC0

				R8A7790_CLK_SCU_CTU1_MIX1 R8A7790_CLK_SCU_CTU0_MIX0

				R8A7790_CLK_SCU_SRC9 R8A7790_CLK_SCU_SRC8 R8A7790_CLK_SCU_SRC7 R8A7790_CLK_SCU_SRC6 R8A7790_CLK_SCU_SRC5

				R8A7790_CLK_SCU_SRC4 R8A7790_CLK_SCU_SRC3 R8A7790_CLK_SCU_SRC2 R8A7790_CLK_SCU_SRC1 R8A7790_CLK_SCU_SRC0

			>;
@@ -1321,6 +1323,7 @@ 
				"ssi4", "ssi3", "ssi2", "ssi1", "ssi0",

				"scu-all",

				"scu-dvc1", "scu-dvc0",

				"scu-ctu1-mix1", "scu-ctu0-mix0",

				"scu-src9", "scu-src8", "scu-src7", "scu-src6", "scu-src5",

				"scu-src4", "scu-src3", "scu-src2", "scu-src1", "scu-src0";

		};
@@ -1536,6 +1539,8 @@ 
			<&mstp10_clks R8A7790_CLK_SCU_SRC5>, <&mstp10_clks R8A7790_CLK_SCU_SRC4>,

			<&mstp10_clks R8A7790_CLK_SCU_SRC3>, <&mstp10_clks R8A7790_CLK_SCU_SRC2>,

			<&mstp10_clks R8A7790_CLK_SCU_SRC1>, <&mstp10_clks R8A7790_CLK_SCU_SRC0>,

			<&mstp10_clks R8A7790_CLK_SCU_CTU0_MIX0>, <&mstp10_clks R8A7790_CLK_SCU_CTU1_MIX1>,

			<&mstp10_clks R8A7790_CLK_SCU_CTU0_MIX0>, <&mstp10_clks R8A7790_CLK_SCU_CTU1_MIX1>,

			<&mstp10_clks R8A7790_CLK_SCU_DVC0>, <&mstp10_clks R8A7790_CLK_SCU_DVC1>,

			<&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>;

		clock-names = "ssi-all",
@@ -1543,6 +1548,8 @@ 
				"ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",

				"src.9", "src.8", "src.7", "src.6", "src.5",

				"src.4", "src.3", "src.2", "src.1", "src.0",

				"ctu.0", "ctu.1",

				"mix.0", "mix.1",

				"dvc.0", "dvc.1",

				"clk_a", "clk_b", "clk_c", "clk_i";
@@ -1559,6 +1566,22 @@ 
			};

		};



		rcar_sound,mix {

			mix0: mix@0 { };

			mix1: mix@1 { };

		};



		rcar_sound,ctu {

			ctu00: ctu@0 { };

			ctu01: ctu@1 { };

			ctu02: ctu@2 { };

			ctu03: ctu@3 { };

			ctu10: ctu@4 { };

			ctu11: ctu@5 { };

			ctu12: ctu@6 { };

			ctu13: ctu@7 { };

		};



		rcar_sound,src {

			src0: src@0 {

				interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/r8a7791-koelsch.dts

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ 
			  1800000 0>;

	};



	sound {

	rsnd_ak4643: sound {

		compatible = "simple-audio-card";



		simple-audio-card,format = "left_j";