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

Commit 2fd53734 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next

parents 0e76ee41 cd2b6574

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

+9 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ Required properties: 
- rcar_sound,src		: Should contain SRC feature.

				  The number of SRC subnode should be same as HW.

				  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.

				  The number of DAI subnode should be same as HW.

				  see below for detail.
@@ -21,6 +24,7 @@ SSI subnode properties: 
- interrupts			: Should contain SSI interrupt for PIO transfer

- shared-pin			: if shared clock pin

- pio-transfer			: use PIO transfer mode

- no-busif			: BUSIF is not ussed when [mem -> SSI] via DMA case



SRC subnode properties:

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

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



	rcar_sound,dvc {

		dvc0: dvc@0 { };

		dvc1: dvc@1 { };

	};



	rcar_sound,src {

		src0: src@0 { };

		src1: src@1 { };

arch/arm/mach-shmobile/board-armadillo800eva.c

+4 −0
Original line number Diff line number Diff line
@@ -998,6 +998,8 @@ static struct platform_device fsi_wm8978_device = { 
	.id	= 0,

	.dev	= {

		.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,

	.dev	= {

		.platform_data	= &fsi2_hdmi_info,

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.dma_mask = &fsi_hdmi_device.dev.coherent_dma_mask,

	},

};

arch/arm/mach-shmobile/board-kzm9g.c

+2 −0
Original line number Diff line number Diff line
@@ -603,6 +603,8 @@ static struct platform_device fsi_ak4648_device = { 
	.name	= "asoc-simple-card",

	.dev	= {

		.platform_data	= &fsi2_ak4648_info,

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.dma_mask = &fsi_ak4648_device.dev.coherent_dma_mask,

	},

};

arch/arm/mach-shmobile/board-mackerel.c

+4 −0
Original line number Diff line number Diff line
@@ -523,6 +523,8 @@ static struct platform_device fsi_hdmi_device = { 
	.id	= 1,

	.dev	= {

		.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",

	.dev	= {

		.platform_data	= &fsi2_ak4643_info,

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.dma_mask = &fsi_ak4643_device.dev.coherent_dma_mask,

	},

};

arch/sh/boards/mach-ecovec24/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -874,6 +874,8 @@ static struct platform_device fsi_da7210_device = { 
	.name	= "asoc-simple-card",

	.dev	= {

		.platform_data	= &fsi_da7210_info,

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.dma_mask = &fsi_da7210_device.dev.coherent_dma_mask,

	},

};