Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next (2fd53734) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13,6 +13,9 @@ Required properties:
	- rcar_sound,src : Should contain SRC feature.		- rcar_sound,src : Should contain SRC feature.
	The number of SRC subnode should be same as HW.		The number of SRC subnode should be same as HW.
	see below for detail.		see below for detail.
			- rcar_sound,dvc : Should contain DVC feature.
			The number of DVC subnode should be same as HW.
			see below for detail.
	- rcar_sound,dai : DAI contents.		- rcar_sound,dai : DAI contents.
	The number of DAI subnode should be same as HW.		The number of DAI subnode should be same as HW.
	see below for detail.		see below for detail.
	@@ -21,6 +24,7 @@ SSI subnode properties:
	- interrupts : Should contain SSI interrupt for PIO transfer		- interrupts : Should contain SSI interrupt for PIO transfer
	- shared-pin : if shared clock pin		- shared-pin : if shared clock pin
	- pio-transfer : use PIO transfer mode		- pio-transfer : use PIO transfer mode
			- no-busif : BUSIF is not ussed when [mem -> SSI] via DMA case

	SRC subnode properties:		SRC subnode properties:
	no properties at this point		no properties at this point
	@@ -39,6 +43,11 @@ rcar_sound: rcar_sound@0xffd90000 {
	<0 0xec540000 0 0x1000>, /* SSIU */		<0 0xec540000 0 0x1000>, /* SSIU */
	<0 0xec541000 0 0x1280>; /* SSI */		<0 0xec541000 0 0x1280>; /* SSI */

			rcar_sound,dvc {
			dvc0: dvc@0 { };
			dvc1: dvc@1 { };
			};

	rcar_sound,src {		rcar_sound,src {
	src0: src@0 { };		src0: src@0 { };
	src1: src@1 { };		src1: src@1 { };

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -998,6 +998,8 @@ static struct platform_device fsi_wm8978_device = {
	.id = 0,		.id = 0,
	.dev = {		.dev = {
	.platform_data = &fsi_wm8978_info,		.platform_data = &fsi_wm8978_info,
			.coherent_dma_mask = DMA_BIT_MASK(32),
			.dma_mask = &fsi_wm8978_device.dev.coherent_dma_mask,
	},		},
	};		};

	@@ -1021,6 +1023,8 @@ static struct platform_device fsi_hdmi_device = {
	.id = 1,		.id = 1,
	.dev = {		.dev = {
	.platform_data = &fsi2_hdmi_info,		.platform_data = &fsi2_hdmi_info,
			.coherent_dma_mask = DMA_BIT_MASK(32),
			.dma_mask = &fsi_hdmi_device.dev.coherent_dma_mask,
	},		},
	};		};

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -603,6 +603,8 @@ static struct platform_device fsi_ak4648_device = {
	.name = "asoc-simple-card",		.name = "asoc-simple-card",
	.dev = {		.dev = {
	.platform_data = &fsi2_ak4648_info,		.platform_data = &fsi2_ak4648_info,
			.coherent_dma_mask = DMA_BIT_MASK(32),
			.dma_mask = &fsi_ak4648_device.dev.coherent_dma_mask,
	},		},
	};		};

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -523,6 +523,8 @@ static struct platform_device fsi_hdmi_device = {
	.id = 1,		.id = 1,
	.dev = {		.dev = {
	.platform_data = &fsi2_hdmi_info,		.platform_data = &fsi2_hdmi_info,
			.coherent_dma_mask = DMA_BIT_MASK(32),
			.dma_mask = &fsi_hdmi_device.dev.coherent_dma_mask,
	},		},
	};		};

	@@ -919,6 +921,8 @@ static struct platform_device fsi_ak4643_device = {
	.name = "asoc-simple-card",		.name = "asoc-simple-card",
	.dev = {		.dev = {
	.platform_data = &fsi2_ak4643_info,		.platform_data = &fsi2_ak4643_info,
			.coherent_dma_mask = DMA_BIT_MASK(32),
			.dma_mask = &fsi_ak4643_device.dev.coherent_dma_mask,
	},		},
	};		};

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -874,6 +874,8 @@ static struct platform_device fsi_da7210_device = {
	.name = "asoc-simple-card",		.name = "asoc-simple-card",
	.dev = {		.dev = {
	.platform_data = &fsi_da7210_info,		.platform_data = &fsi_da7210_info,
			.coherent_dma_mask = DMA_BIT_MASK(32),
			.dma_mask = &fsi_da7210_device.dev.coherent_dma_mask,
	},		},
	};		};