Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next (94e26c07) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/devicetree/bindings/sound/renesas,rsnd.txt

+34 −34

Original line number	Diff line number	Diff line
		@@ -199,10 +199,10 @@ Ex)
		sound {
		compatible = "simple-scu-audio-card";
		...
		simple-audio-card,cpu@0 {
		simple-audio-card,cpu-0 {
		sound-dai = <&rcar_sound 0>;
		};
		simple-audio-card,cpu@1 {
		simple-audio-card,cpu-1 {
		sound-dai = <&rcar_sound 1>;
		};
		simple-audio-card,codec {
		@@ -441,79 +441,79 @@ rcar_sound: sound@ec500000 {
		"clk_a", "clk_b", "clk_c", "clk_i";

		rcar_sound,dvc {
		dvc0: dvc@0 {
		dvc0: dvc-0 {
		dmas = <&audma0 0xbc>;
		dma-names = "tx";
		};
		dvc1: dvc@1 {
		dvc1: dvc-1 {
		dmas = <&audma0 0xbe>;
		dma-names = "tx";
		};
		};

		rcar_sound,mix {
		mix0: mix@0 { };
		mix1: mix@1 { };
		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 { };
		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 {
		src0: src-0 {
		interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>;
		dmas = <&audma0 0x85>, <&audma1 0x9a>;
		dma-names = "rx", "tx";
		};
		src1: src@1 {
		src1: src-1 {
		interrupts = <0 353 IRQ_TYPE_LEVEL_HIGH>;
		dmas = <&audma0 0x87>, <&audma1 0x9c>;
		dma-names = "rx", "tx";
		};
		src2: src@2 {
		src2: src-2 {
		interrupts = <0 354 IRQ_TYPE_LEVEL_HIGH>;
		dmas = <&audma0 0x89>, <&audma1 0x9e>;
		dma-names = "rx", "tx";
		};
		src3: src@3 {
		src3: src-3 {
		interrupts = <0 355 IRQ_TYPE_LEVEL_HIGH>;
		dmas = <&audma0 0x8b>, <&audma1 0xa0>;
		dma-names = "rx", "tx";
		};
		src4: src@4 {
		src4: src-4 {
		interrupts = <0 356 IRQ_TYPE_LEVEL_HIGH>;
		dmas = <&audma0 0x8d>, <&audma1 0xb0>;
		dma-names = "rx", "tx";
		};
		src5: src@5 {
		src5: src-5 {
		interrupts = <0 357 IRQ_TYPE_LEVEL_HIGH>;
		dmas = <&audma0 0x8f>, <&audma1 0xb2>;
		dma-names = "rx", "tx";
		};
		src6: src@6 {
		src6: src-6 {
		interrupts = <0 358 IRQ_TYPE_LEVEL_HIGH>;
		dmas = <&audma0 0x91>, <&audma1 0xb4>;
		dma-names = "rx", "tx";
		};
		src7: src@7 {
		src7: src-7 {
		interrupts = <0 359 IRQ_TYPE_LEVEL_HIGH>;
		dmas = <&audma0 0x93>, <&audma1 0xb6>;
		dma-names = "rx", "tx";
		};
		src8: src@8 {
		src8: src-8 {
		interrupts = <0 360 IRQ_TYPE_LEVEL_HIGH>;
		dmas = <&audma0 0x95>, <&audma1 0xb8>;
		dma-names = "rx", "tx";
		};
		src9: src@9 {
		src9: src-9 {
		interrupts = <0 361 IRQ_TYPE_LEVEL_HIGH>;
		dmas = <&audma0 0x97>, <&audma1 0xba>;
		dma-names = "rx", "tx";
		@@ -521,52 +521,52 @@ rcar_sound: sound@ec500000 {
		};

		rcar_sound,ssi {
		ssi0: ssi@0 {
		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 {
		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 {
		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 {
		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 {
		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 {
		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 {
		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 {
		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 {
		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 {
		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";

sound/soc/sh/dma-sh7760.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ struct camelot_pcm {
		#define DMABRG_PREALLOC_BUFFER 32 * 1024
		#define DMABRG_PREALLOC_BUFFER_MAX 32 * 1024

		static struct snd_pcm_hardware camelot_pcm_hardware = {
		static const struct snd_pcm_hardware camelot_pcm_hardware = {
		.info = (SNDRV_PCM_INFO_MMAP \|
		SNDRV_PCM_INFO_INTERLEAVED \|
		SNDRV_PCM_INFO_BLOCK_TRANSFER \|
		@@ -294,7 +294,7 @@ static snd_pcm_uframes_t camelot_pos(struct snd_pcm_substream *substream)
		return bytes_to_frames(runtime, pos);
		}

		static struct snd_pcm_ops camelot_pcm_ops = {
		static const struct snd_pcm_ops camelot_pcm_ops = {
		.open = camelot_pcm_open,
		.close = camelot_pcm_close,
		.ioctl = snd_pcm_lib_ioctl,
		@@ -320,7 +320,7 @@ static int camelot_pcm_new(struct snd_soc_pcm_runtime *rtd)
		return 0;
		}

		static struct snd_soc_platform_driver sh7760_soc_platform = {
		static const struct snd_soc_platform_driver sh7760_soc_platform = {
		.ops = &camelot_pcm_ops,
		.pcm_new = camelot_pcm_new,
		};

sound/soc/sh/fsi.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1710,7 +1710,7 @@ static const struct snd_soc_dai_ops fsi_dai_ops = {
		* pcm ops
		*/

		static struct snd_pcm_hardware fsi_pcm_hardware = {
		static const struct snd_pcm_hardware fsi_pcm_hardware = {
		.info = SNDRV_PCM_INFO_INTERLEAVED \|
		SNDRV_PCM_INFO_MMAP \|
		SNDRV_PCM_INFO_MMAP_VALID,
		@@ -1755,7 +1755,7 @@ static snd_pcm_uframes_t fsi_pointer(struct snd_pcm_substream *substream)
		return fsi_sample2frame(fsi, io->buff_sample_pos);
		}

		static struct snd_pcm_ops fsi_pcm_ops = {
		static const struct snd_pcm_ops fsi_pcm_ops = {
		.open = fsi_pcm_open,
		.ioctl = snd_pcm_lib_ioctl,
		.hw_params = fsi_hw_params,
		@@ -1818,7 +1818,7 @@ static struct snd_soc_dai_driver fsi_soc_dai[] = {
		},
		};

		static struct snd_soc_platform_driver fsi_soc_platform = {
		static const struct snd_soc_platform_driver fsi_soc_platform = {
		.ops = &fsi_pcm_ops,
		.pcm_new = fsi_pcm_new,
		};

sound/soc/sh/migor.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ static int migor_hw_free(struct snd_pcm_substream *substream)
		return 0;
		}

		static struct snd_soc_ops migor_dai_ops = {
		static const struct snd_soc_ops migor_dai_ops = {
		.hw_params = migor_hw_params,
		.hw_free = migor_hw_free,
		};

sound/soc/sh/rcar/adg.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -586,10 +586,8 @@ int rsnd_adg_probe(struct rsnd_priv *priv)
		int ret;

		adg = devm_kzalloc(dev, sizeof(*adg), GFP_KERNEL);
		if (!adg) {
		dev_err(dev, "ADG allocate failed\n");
		if (!adg)
		return -ENOMEM;
		}

		ret = rsnd_mod_init(priv, &adg->mod, &adg_ops,
		NULL, NULL, 0, 0);