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

Commit d0c65252 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 1b4327dc e43fc6af

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

0 → 100644
+26 −0
Original line number Diff line number Diff line 
Renesas FSI



Required properties:

- compatible			: "renesas,sh_fsi2" or "renesas,sh_fsi"

- reg				: Should contain the register physical address and length

- interrupts			: Should contain FSI interrupt



- fsia,spdif-connection		: FSI is connected by S/PDFI

- fsia,stream-mode-support	: FSI supports 16bit stream mode.

- fsia,use-internal-clock	: FSI uses internal clock when master mode.



- fsib,spdif-connection		: same as fsia

- fsib,stream-mode-support	: same as fsia

- fsib,use-internal-clock	: same as fsia



Example:



sh_fsi2: sh_fsi2@0xec230000 {

	compatible = "renesas,sh_fsi2";

	reg = <0xec230000 0x400>;

	interrupts = <0 146 0x4>;



	fsia,spdif-connection;

	fsia,stream-mode-support;

	fsia,use-internal-clock;

};

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

+3 −8
Original line number Diff line number Diff line
@@ -657,14 +657,8 @@ static struct platform_device lcdc_device = { 
/* FSI */

#define IRQ_FSI		evt2irq(0x1840)

static struct sh_fsi_platform_info fsi_info = {

	.port_a = {

		.flags		= SH_FSI_BRS_INV,

	},

	.port_b = {

		.flags		= SH_FSI_BRS_INV |

				  SH_FSI_BRM_INV |

				  SH_FSI_LRS_INV |

				  SH_FSI_CLK_CPG |

		.flags		= SH_FSI_CLK_CPG |

				  SH_FSI_FMT_SPDIF,

	},

};
@@ -816,7 +810,8 @@ static struct platform_device lcdc1_device = { 
};



static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = {

	.cpu_daifmt	= SND_SOC_DAIFMT_CBM_CFM,

	.cpu_daifmt	= SND_SOC_DAIFMT_CBM_CFM |

			  SND_SOC_DAIFMT_IB_NF,

};



static struct asoc_simple_card_info fsi2_hdmi_info = {

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

+4 −7
Original line number Diff line number Diff line
@@ -503,7 +503,8 @@ static struct platform_device hdmi_lcdc_device = { 
};



static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = {

	.cpu_daifmt	= SND_SOC_DAIFMT_CBM_CFM,

	.cpu_daifmt	= SND_SOC_DAIFMT_CBM_CFM |

			  SND_SOC_DAIFMT_IB_NF,

};



static struct asoc_simple_card_info fsi2_hdmi_info = {
@@ -858,15 +859,11 @@ static struct platform_device leds_device = { 
#define IRQ_FSI evt2irq(0x1840)

static struct sh_fsi_platform_info fsi_info = {

	.port_a = {

		.flags = SH_FSI_BRS_INV,

		.tx_id = SHDMA_SLAVE_FSIA_TX,

		.rx_id = SHDMA_SLAVE_FSIA_RX,

	},

	.port_b = {

		.flags = SH_FSI_BRS_INV	|

			SH_FSI_BRM_INV	|

			SH_FSI_LRS_INV	|

			SH_FSI_CLK_CPG	|

		.flags = SH_FSI_CLK_CPG	|

			 SH_FSI_FMT_SPDIF,

	}

};

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

+2 −10
Original line number Diff line number Diff line
@@ -887,12 +887,6 @@ static struct platform_device camera_devices[] = { 
};



/* FSI */

static struct sh_fsi_platform_info fsi_info = {

	.port_b = {

		.flags = SH_FSI_BRS_INV,

	},

};



static struct resource fsi_resources[] = {

	[0] = {

		.name	= "FSI",
@@ -911,15 +905,13 @@ static struct platform_device fsi_device = { 
	.id		= 0,

	.num_resources	= ARRAY_SIZE(fsi_resources),

	.resource	= fsi_resources,

	.dev	= {

		.platform_data	= &fsi_info,

	},

};



static struct asoc_simple_dai_init_info fsi_da7210_init_info = {

	.fmt		= SND_SOC_DAIFMT_I2S,

	.codec_daifmt	= SND_SOC_DAIFMT_CBM_CFM,

	.cpu_daifmt	= SND_SOC_DAIFMT_CBS_CFS,

	.cpu_daifmt	= SND_SOC_DAIFMT_CBS_CFS |

			  SND_SOC_DAIFMT_IB_NF,

};



static struct asoc_simple_card_info fsi_da7210_info = {

arch/sh/boards/mach-se/7724/setup.c

+2 −10
Original line number Diff line number Diff line
@@ -279,12 +279,6 @@ static struct platform_device ceu1_device = { 


/* FSI */

/* change J20, J21, J22 pin to 1-2 connection to use slave mode */

static struct sh_fsi_platform_info fsi_info = {

	.port_a = {

		.flags = SH_FSI_BRS_INV,

	},

};



static struct resource fsi_resources[] = {

	[0] = {

		.name	= "FSI",
@@ -303,15 +297,13 @@ static struct platform_device fsi_device = { 
	.id		= 0,

	.num_resources	= ARRAY_SIZE(fsi_resources),

	.resource	= fsi_resources,

	.dev	= {

		.platform_data	= &fsi_info,

	},

};



static struct asoc_simple_dai_init_info fsi2_ak4642_init_info = {

	.fmt		= SND_SOC_DAIFMT_LEFT_J,

	.codec_daifmt	= SND_SOC_DAIFMT_CBM_CFM,

	.cpu_daifmt	= SND_SOC_DAIFMT_CBS_CFS,

	.cpu_daifmt	= SND_SOC_DAIFMT_CBS_CFS |

			  SND_SOC_DAIFMT_IB_NF,

	.sysclk		= 11289600,

};