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

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

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

Merge "Third Round of Renesas ARM Based SoC DT Updates for v4.1" from Simon
Horman:

* Add DMA sound support to r8a7791 and r8a7790 SoCs

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

:
  ARM: shmobile: r8a7791: sound enables Audio DMAC entry on DTSI
  ARM: shmobile: r8a7790: sound enables Audio DMAC entry on DTSI
  ARM: shmobile: r8a7791: enable Audio DMAC peri peri via sound driver
  ARM: shmobile: r8a7790: enable Audio DMAC peri peri via sound driver
  ARM: shmobile: r8a7791: add reg-names for sound
  ARM: shmobile: r8a7790: add reg-names for sound

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents cdf77d76 63573339

arch/arm/boot/dts/r8a7790.dtsi

+112 −30
Original line number Diff line number Diff line
@@ -370,13 +370,6 @@ 
		dma-channels = <13>;

	};



	audmapp: dma-controller@ec740000 {

		compatible = "renesas,rcar-audmapp";

		#dma-cells = <1>;



		reg = <0 0xec740000 0 0x200>;

	};



	i2c0: i2c@e6508000 {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -1460,7 +1453,10 @@ 
		reg =	<0 0xec500000 0 0x1000>, /* SCU */

			<0 0xec5a0000 0 0x100>,  /* ADG */

			<0 0xec540000 0 0x1000>, /* SSIU */

			<0 0xec541000 0 0x1280>; /* SSI */

			<0 0xec541000 0 0x1280>, /* SSI */

			<0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/

		reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";



		clocks = <&mstp10_clks R8A7790_CLK_SSI_ALL>,

			<&mstp10_clks R8A7790_CLK_SSI9>, <&mstp10_clks R8A7790_CLK_SSI8>,

			<&mstp10_clks R8A7790_CLK_SSI7>, <&mstp10_clks R8A7790_CLK_SSI6>,
@@ -1485,34 +1481,120 @@ 
		status = "disabled";



		rcar_sound,dvc {

			dvc0: dvc@0 { };

			dvc1: dvc@1 { };

			dvc0: dvc@0 {

				dmas = <&audma0 0xbc>;

				dma-names = "tx";

			};

			dvc1: dvc@1 {

				dmas = <&audma0 0xbe>;

				dma-names = "tx";

			};

		};



		rcar_sound,src {

			src0: src@0 { interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>; };

			src1: src@1 { interrupts = <0 353 IRQ_TYPE_LEVEL_HIGH>; };

			src2: src@2 { interrupts = <0 354 IRQ_TYPE_LEVEL_HIGH>; };

			src3: src@3 { interrupts = <0 355 IRQ_TYPE_LEVEL_HIGH>; };

			src4: src@4 { interrupts = <0 356 IRQ_TYPE_LEVEL_HIGH>; };

			src5: src@5 { interrupts = <0 357 IRQ_TYPE_LEVEL_HIGH>; };

			src6: src@6 { interrupts = <0 358 IRQ_TYPE_LEVEL_HIGH>; };

			src7: src@7 { interrupts = <0 359 IRQ_TYPE_LEVEL_HIGH>; };

			src8: src@8 { interrupts = <0 360 IRQ_TYPE_LEVEL_HIGH>; };

			src9: src@9 { interrupts = <0 361 IRQ_TYPE_LEVEL_HIGH>; };

			src0: src@0 {

				interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x85>, <&audma1 0x9a>;

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

			};

			src1: src@1 {

				interrupts = <0 353 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x87>, <&audma1 0x9c>;

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

			};

			src2: src@2 {

				interrupts = <0 354 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x89>, <&audma1 0x9e>;

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

			};

			src3: src@3 {

				interrupts = <0 355 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x8b>, <&audma1 0xa0>;

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

			};

			src4: src@4 {

				interrupts = <0 356 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x8d>, <&audma1 0xb0>;

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

			};

			src5: src@5 {

				interrupts = <0 357 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x8f>, <&audma1 0xb2>;

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

			};

			src6: src@6 {

				interrupts = <0 358 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x91>, <&audma1 0xb4>;

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

			};

			src7: src@7 {

				interrupts = <0 359 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x93>, <&audma1 0xb6>;

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

			};

			src8: src@8 {

				interrupts = <0 360 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x95>, <&audma1 0xb8>;

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

			};

			src9: src@9 {

				interrupts = <0 361 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x97>, <&audma1 0xba>;

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

			};

		};



		rcar_sound,ssi {

			ssi0: ssi@0 { interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>; };

			ssi1: ssi@1 { interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>; };

			ssi2: ssi@2 { interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>; };

			ssi3: ssi@3 { interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>; };

			ssi4: ssi@4 { interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>; };

			ssi5: ssi@5 { interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>; };

			ssi6: ssi@6 { interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>; };

			ssi7: ssi@7 { interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>; };

			ssi8: ssi@8 { interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>; };

			ssi9: ssi@9 { interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; };

			ssi0: ssi@0 {

				interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;

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

			};

			ssi1: ssi@1 {

				 interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;

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

			};

			ssi2: ssi@2 {

				interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;

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

			};

			ssi3: ssi@3 {

				interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;

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

			};

			ssi4: ssi@4 {

				interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;

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

			};

			ssi5: ssi@5 {

				interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;

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

			};

			ssi6: ssi@6 {

				interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;

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

			};

			ssi7: ssi@7 {

				interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;

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

			};

			ssi8: ssi@8 {

				interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;

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

			};

			ssi9: ssi@9 {

				interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;

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

			};

		};

	};

arch/arm/boot/dts/r8a7791.dtsi

+112 −30
Original line number Diff line number Diff line
@@ -357,13 +357,6 @@ 
		dma-channels = <13>;

	};



	audmapp: dma-controller@ec740000 {

		compatible = "renesas,rcar-audmapp";

		#dma-cells = <1>;



		reg = <0 0xec740000 0 0x200>;

	};



	/* The memory map in the User's Manual maps the cores to bus numbers */

	i2c0: i2c@e6508000 {

		#address-cells = <1>;
@@ -1503,7 +1496,10 @@ 
		reg =	<0 0xec500000 0 0x1000>, /* SCU */

			<0 0xec5a0000 0 0x100>,  /* ADG */

			<0 0xec540000 0 0x1000>, /* SSIU */

			<0 0xec541000 0 0x1280>; /* SSI */

			<0 0xec541000 0 0x1280>, /* SSI */

			<0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/

		reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";



		clocks = <&mstp10_clks R8A7791_CLK_SSI_ALL>,

			<&mstp10_clks R8A7791_CLK_SSI9>, <&mstp10_clks R8A7791_CLK_SSI8>,

			<&mstp10_clks R8A7791_CLK_SSI7>, <&mstp10_clks R8A7791_CLK_SSI6>,
@@ -1528,34 +1524,120 @@ 
		status = "disabled";



		rcar_sound,dvc {

			dvc0: dvc@0 { };

			dvc1: dvc@1 { };

			dvc0: dvc@0 {

				dmas = <&audma0 0xbc>;

				dma-names = "tx";

			};

			dvc1: dvc@1 {

				dmas = <&audma0 0xbe>;

				dma-names = "tx";

			};

		};



		rcar_sound,src {

			src0: src@0 { interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>; };

			src1: src@1 { interrupts = <0 353 IRQ_TYPE_LEVEL_HIGH>; };

			src2: src@2 { interrupts = <0 354 IRQ_TYPE_LEVEL_HIGH>; };

			src3: src@3 { interrupts = <0 355 IRQ_TYPE_LEVEL_HIGH>; };

			src4: src@4 { interrupts = <0 356 IRQ_TYPE_LEVEL_HIGH>; };

			src5: src@5 { interrupts = <0 357 IRQ_TYPE_LEVEL_HIGH>; };

			src6: src@6 { interrupts = <0 358 IRQ_TYPE_LEVEL_HIGH>; };

			src7: src@7 { interrupts = <0 359 IRQ_TYPE_LEVEL_HIGH>; };

			src8: src@8 { interrupts = <0 360 IRQ_TYPE_LEVEL_HIGH>; };

			src9: src@9 { interrupts = <0 361 IRQ_TYPE_LEVEL_HIGH>; };

			src0: src@0 {

				interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x85>, <&audma1 0x9a>;

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

			};

			src1: src@1 {

				interrupts = <0 353 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x87>, <&audma1 0x9c>;

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

			};

			src2: src@2 {

				interrupts = <0 354 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x89>, <&audma1 0x9e>;

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

			};

			src3: src@3 {

				interrupts = <0 355 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x8b>, <&audma1 0xa0>;

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

			};

			src4: src@4 {

				interrupts = <0 356 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x8d>, <&audma1 0xb0>;

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

			};

			src5: src@5 {

				interrupts = <0 357 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x8f>, <&audma1 0xb2>;

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

			};

			src6: src@6 {

				interrupts = <0 358 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x91>, <&audma1 0xb4>;

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

			};

			src7: src@7 {

				interrupts = <0 359 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x93>, <&audma1 0xb6>;

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

			};

			src8: src@8 {

				interrupts = <0 360 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x95>, <&audma1 0xb8>;

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

			};

			src9: src@9 {

				interrupts = <0 361 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x97>, <&audma1 0xba>;

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

			};

		};



		rcar_sound,ssi {

			ssi0: ssi@0 { interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>; };

			ssi1: ssi@1 { interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>; };

			ssi2: ssi@2 { interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>; };

			ssi3: ssi@3 { interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>; };

			ssi4: ssi@4 { interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>; };

			ssi5: ssi@5 { interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>; };

			ssi6: ssi@6 { interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>; };

			ssi7: ssi@7 { interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>; };

			ssi8: ssi@8 { interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>; };

			ssi9: ssi@9 { interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; };

			ssi0: ssi@0 {

				interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;

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

			};

			ssi1: ssi@1 {

				 interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;

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

			};

			ssi2: ssi@2 {

				interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;

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

			};

			ssi3: ssi@3 {

				interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;

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

			};

			ssi4: ssi@4 {

				interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;

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

			};

			ssi5: ssi@5 {

				interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;

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

			};

			ssi6: ssi@6 {

				interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;

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

			};

			ssi7: ssi@7 {

				interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;

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

			};

			ssi8: ssi@8 {

				interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;

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

			};

			ssi9: ssi@9 {

				interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>;

				dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;

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

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE