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

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

Merge branch 'topic/fsi' of... 

Merge branch 'topic/fsi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-simple-card
parents f89983ef fd974e52

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
@@ -877,12 +877,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",
@@ -901,15 +895,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,

};

include/sound/sh_fsi.h

+4 −66
Original line number Diff line number Diff line
@@ -11,82 +11,20 @@ 
 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#define FSI_PORT_A	0

#define FSI_PORT_B	1



#include <linux/clk.h>

#include <sound/soc.h>



/*

 * flags format

 *

 * 0x00000CBA

 *

 * A:  inversion

 * B:  format mode

 * C:  chip specific

 * D:  clock selecter if master mode

 * flags

 */



/* A: clock inversion */

#define SH_FSI_INVERSION_MASK	0x0000000F

#define SH_FSI_LRM_INV		(1 << 0)

#define SH_FSI_BRM_INV		(1 << 1)

#define SH_FSI_LRS_INV		(1 << 2)

#define SH_FSI_BRS_INV		(1 << 3)



/* B: format mode */

#define SH_FSI_FMT_MASK		0x000000F0

#define SH_FSI_FMT_DAI		(0 << 4)

#define SH_FSI_FMT_SPDIF	(1 << 4)



/* C: chip specific */

#define SH_FSI_OPTION_MASK	0x00000F00

#define SH_FSI_ENABLE_STREAM_MODE	(1 << 8) /* for 16bit data */



/* D:  clock selecter if master mode */

#define SH_FSI_CLK_MASK		0x0000F000

#define SH_FSI_CLK_EXTERNAL	(0 << 12)

#define SH_FSI_CLK_CPG		(1 << 12) /* FSIxCK + FSI-DIV */



/*

 * set_rate return value

 *

 * see ACKMD/BPFMD on

 *     ACK_MD (FSI2)

 *     CKG1   (FSI)

 *

 * err		: return value <  0

 * no change	: return value == 0

 * change xMD	: return value >  0

 *

 * 0x-00000AB

 *

 * A:  ACKMD value

 * B:  BPFMD value

 */



#define SH_FSI_ACKMD_MASK	(0xF << 0)

#define SH_FSI_ACKMD_512	(1 << 0)

#define SH_FSI_ACKMD_256	(2 << 0)

#define SH_FSI_ACKMD_128	(3 << 0)

#define SH_FSI_ACKMD_64		(4 << 0)

#define SH_FSI_ACKMD_32		(5 << 0)



#define SH_FSI_BPFMD_MASK	(0xF << 4)

#define SH_FSI_BPFMD_512	(1 << 4)

#define SH_FSI_BPFMD_256	(2 << 4)

#define SH_FSI_BPFMD_128	(3 << 4)

#define SH_FSI_BPFMD_64		(4 << 4)

#define SH_FSI_BPFMD_32		(5 << 4)

#define SH_FSI_BPFMD_16		(6 << 4)

#define SH_FSI_FMT_SPDIF		(1 << 0) /* spdif for HDMI */

#define SH_FSI_ENABLE_STREAM_MODE	(1 << 1) /* for 16bit data */

#define SH_FSI_CLK_CPG			(1 << 2) /* FSIxCK + FSI-DIV */



struct sh_fsi_port_info {

	unsigned long flags;

	int tx_id;

	int rx_id;

	int (*set_rate)(struct device *dev, int rate, int enable);

};



struct sh_fsi_platform_info {