ep93xx i2s audio

Add ep93xx core support for i2s audio

Signed-off-by Ryan Mallon <[email protected]>

---
 arch/arm/mach-ep93xx/clock.c                    |   69 ++++++++++++++++++++++-
 arch/arm/mach-ep93xx/core.c                     |   31 ++++++++++
 arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h |   10 +++
 arch/arm/mach-ep93xx/include/mach/platform.h    |    1 +
 4 files changed, 110 insertions(+), 1 deletions(-)

arch/arm/mach-ep93xx/clock.c +2 -1

index 5f80092..503d430 100644
@@ -43,7 +43,8 @@ static unsigned long get_uart_rate(struct clk *clk);
 
 static int set_keytchclk_rate(struct clk *clk, unsigned long rate);
 static int set_div_rate(struct clk *clk, unsigned long rate);
-
+static int set_i2s_sclk_rate(struct clk *clk, unsigned long rate);
+static int set_i2s_lrclk_rate(struct clk *clk, unsigned long rate);
 
 static struct clk clk_xtali = {
 	.rate		= EP93XX_EXT_CLK_RATE,

arch/arm/mach-ep93xx/clock.c +59 -0

+};
+
+static struct clk clk_i2s_sclk = {
+	.sw_locked	= 1,
+	.parent		= &clk_i2s_mclk,
+	.enable_reg	= EP93XX_SYSCON_I2SCLKDIV,
+	.enable_mask	= EP93XX_SYSCON_I2SCLKDIV_SENA,
+	.set_rate	= set_i2s_sclk_rate,
+};
+
+static struct clk clk_i2s_lrclk = {
+	.sw_locked	= 1,
+	.parent		= &clk_i2s_sclk,
+	.enable_reg	= EP93XX_SYSCON_I2SCLKDIV,
+	.enable_mask	= EP93XX_SYSCON_I2SCLKDIV_SENA,
+	.set_rate	= set_i2s_lrclk_rate,
+};
+
 /* DMA Clocks */
 static struct clk clk_m2p0 = {
 	.parent		= &clk_h,

@@ -186,6 +212,9 @@ static struct clk_lookup clocks[] = {
 	INIT_CK("ep93xx-ohci",		NULL,		&clk_usb_host),
 	INIT_CK("ep93xx-keypad",	NULL,		&clk_keypad),
 	INIT_CK("ep93xx-fb",		NULL,		&clk_video),
+	INIT_CK("ep93xx-i2s",		"mclk",		&clk_i2s_mclk),
+	INIT_CK("ep93xx-i2s",		"sclk",		&clk_i2s_sclk),
+	INIT_CK("ep93xx-i2s",		"lrclk",	&clk_i2s_lrclk),
 	INIT_CK(NULL,			"pwm_clk",	&clk_pwm),
 	INIT_CK(NULL,			"m2p0",		&clk_m2p0),
 	INIT_CK(NULL,			"m2p1",		&clk_m2p1),

@@ -396,6 +425,44 @@ static int set_div_rate(struct clk *clk, unsigned long rate)
 	return 0;
 }
 
+static int set_i2s_sclk_rate(struct clk *clk, unsigned long rate)
+{
+	unsigned val = __raw_readl(clk->enable_reg);
+
+	if (rate == clk_i2s_mclk.rate / 2)
+		ep93xx_syscon_swlocked_write(val & ~EP93XX_I2SCLKDIV_SDIV, 
+					     clk->enable_reg);
+	else if (rate == clk_i2s_mclk.rate / 4)
+		ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_SDIV, 
+					     clk->enable_reg);
+	else
+		return -EINVAL;
+
+	clk_i2s_sclk.rate = rate;
+	return 0;
+}
+
+static int set_i2s_lrclk_rate(struct clk *clk, unsigned long rate)
+{
+	unsigned val = __raw_readl(clk->enable_reg) & 
+		~EP93XX_I2SCLKDIV_LRDIV_MASK;
+	
+	if (rate == clk_i2s_sclk.rate / 32)
+		ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_LRDIV32,
+					     clk->enable_reg);
+	else if (rate == clk_i2s_sclk.rate / 64)
+		ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_LRDIV64,
+					     clk->enable_reg);
+	else if (rate == clk_i2s_sclk.rate / 128)
+		ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_LRDIV128,
+					     clk->enable_reg);
+	else
+		return -EINVAL;
+
+	clk_i2s_lrclk.rate = rate;
+	return 0;
+}
+
 int clk_set_rate(struct clk *clk, unsigned long rate)
 {
 	if (clk->set_rate)

arch/arm/mach-ep93xx/core.c +31 -0

index 90fb591..c04fd6f 100644
@@ -617,6 +617,37 @@ void ep93xx_keypad_release_gpio(struct platform_device *pdev)
 }
 EXPORT_SYMBOL(ep93xx_keypad_release_gpio);
 
+/*************************************************************************
+ * EP93xx I2S audio peripheral handling
+ *************************************************************************/
+static struct resource ep93xx_i2s_resource[] = {
+	{
+		.start	= EP93XX_I2S_PHYS_BASE,
+		.end	= EP93XX_I2S_PHYS_BASE + 0x100 - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+};
+
+static struct platform_device ep93xx_i2s_device = {
+	.name		= "ep93xx-i2s",
+	.id		= -1,
+	.num_resources	= ARRAY_SIZE(ep93xx_i2s_resource),
+	.resource	= ep93xx_i2s_resource,
+};
+
+void __init ep93xx_register_i2s(unsigned pins)
+{
+	if (pins != EP93XX_SYSCON_DEVCFG_I2SONSSP &&
+	    pins != EP93XX_SYSCON_DEVCFG_I2SONAC97) {
+		pr_err("Invalid I2S pin configuration - not registering\n");
+		return;
+	}
+
+	ep93xx_devcfg_clear_bits(EP93XX_SYSCON_DEVCFG_I2SONSSP |
+				 EP93XX_SYSCON_DEVCFG_I2SONAC97);
+	ep93xx_devcfg_set_bits(pins);
+	platform_device_register(&ep93xx_i2s_device);
+}
 
 extern void ep93xx_gpio_init(void);
 

arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h +10 -0

index 93e2ecc..3fbb095 100644
@@ -93,6 +93,7 @@
 /* APB peripherals */
 #define EP93XX_TIMER_BASE		EP93XX_APB_IOMEM(0x00010000)
 
+#define EP93XX_I2S_PHYS_BASE		EP93XX_APB_PHYS(0x00020000)
 #define EP93XX_I2S_BASE			EP93XX_APB_IOMEM(0x00020000)
 
 #define EP93XX_SECURITY_BASE		EP93XX_APB_IOMEM(0x00030000)

@@ -193,6 +194,15 @@
 #define EP93XX_SYSCON_CLKDIV_ESEL	(1<<14)
 #define EP93XX_SYSCON_CLKDIV_PSEL	(1<<13)
 #define EP93XX_SYSCON_CLKDIV_PDIV_SHIFT	8
+#define EP93XX_SYSCON_I2SCLKDIV		EP93XX_SYSCON_REG(0x8c)
+#define EP93XX_SYSCON_I2SCLKDIV_SENA	(1<<31)
+#define EP93XX_SYSCON_I2SCLKDIV_ORIDE   (1<<29)
+#define EP93XX_SYSCON_I2SCLKDIV_SPOL	(1<<19)
+#define EP93XX_I2SCLKDIV_SDIV		(1 << 16)
+#define EP93XX_I2SCLKDIV_LRDIV32	(0 << 17)
+#define EP93XX_I2SCLKDIV_LRDIV64	(1 << 17)
+#define EP93XX_I2SCLKDIV_LRDIV128 	(2 << 17)
+#define EP93XX_I2SCLKDIV_LRDIV_MASK 	(3 << 17)
 #define EP93XX_SYSCON_KEYTCHCLKDIV	EP93XX_SYSCON_REG(0x90)
 #define EP93XX_SYSCON_KEYTCHCLKDIV_TSEN	(1<<31)
 #define EP93XX_SYSCON_KEYTCHCLKDIV_ADIV	(1<<16)

arch/arm/mach-ep93xx/include/mach/platform.h +0 -0

index c6dc14d..9252adf 100644

Quoted 25 lines · Ryan Mallon

Add ep93xx core support for i2s audio

Signed-off-by Ryan Mallon <[email protected]>

---
 arch/arm/mach-ep93xx/clock.c                    |   69 ++++++++++++++++++++++-
 arch/arm/mach-ep93xx/core.c                     |   31 ++++++++++
 arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h |   10 +++
 arch/arm/mach-ep93xx/include/mach/platform.h    |    1 +
 4 files changed, 110 insertions(+), 1 deletions(-)

arch/arm/mach-ep93xx/clock.c +2 -1

index 5f80092..503d430 100644
@@ -43,7 +43,8 @@ static unsigned long get_uart_rate(struct clk *clk);
 
 static int set_keytchclk_rate(struct clk *clk, unsigned long rate);
 static int set_div_rate(struct clk *clk, unsigned long rate);
-
+static int set_i2s_sclk_rate(struct clk *clk, unsigned long rate);
+static int set_i2s_lrclk_rate(struct clk *clk, unsigned long rate);
 
 static struct clk clk_xtali = {
 	.rate		= EP93XX_EXT_CLK_RATE,

arch/arm/mach-ep93xx/clock.c static struct clk clk_video = { · line 117

Quoted 9 lines

arch/arm/mach-ep93xx/clock.c +6 -0

@@ -108,6 +109,31 @@ static struct clk clk_video = {
 	.set_rate	= set_div_rate,
 };
 
+static struct clk clk_i2s_mclk = {
+	.sw_locked	= 1,
+	.enable_reg	= EP93XX_SYSCON_I2SCLKDIV,
+	.enable_mask	= (EP93XX_SYSCON_CLKDIV_ENABLE  |
+			   EP93XX_SYSCON_I2SCLKDIV_SPOL |
+			   EP93XX_SYSCON_I2SCLKDIV_ORIDE),

Setting the SPOL and ORIDE bits here might cause problems in the future. Granted, your i2s driver is currently the only user so its probably ok for now.

But, you might want to move the setting of those two bits along with the SLAVE and DROP bits to the core registration function. The clock support should only be enabling/disabling and setting the rates for the clocks.

arch/arm/mach-ep93xx/clock.c static struct clk clk_video = { · line 118

Quoted 1 line

arch/arm/mach-ep93xx/clock.c +1 -0

+	.set_rate	= set_div_rate,

By calling the set_div_rate routine your only updating the master clock rate. Should the new rate be pushed down to the children? Actually the new rates for the children will be established automatically when the master clock rate is changed. But a clk_get_rate for the children will return an incorrect value. Maybe just add a get_rate method for the children?

The following patch series adds support for i2s audio on the ep93xx, with the Snapper CL15 used as an example implementation.

This version fixes a number of things from the previous round:
- Removed unused #defines
- Set symmetric rates for the cpu dai
- Fixed the sdiv/lrdiv calculation loop
- Moved the cpu dai registration
- Removed empty ep93xx_pcm_prepare callback
- Fixed enable/disable when both capture and playback are running

Capture still does not work. The dma is running, but the captured data is all zeros (tested used arecord and loopback). I have a 2.6.20 kernel with ep93xx i2s audio working an capture works there on the same hardware. I have spent sometime looking into this, but can't see the problem. Would appreciate if someone can lend some insight as to what I have done wrong.

Ryan Mallon (3):
ep93xx i2s core support
ep93xx i2s audio driver
Snapper cl15 audio support

Quoted 18 lines · Ryan Mallon

The following patch series adds support for i2s audio on the ep93xx, with the Snapper CL15 used as an example implementation.

This version fixes a number of things from the previous round:
- Removed unused #defines
- Set symmetric rates for the cpu dai
- Fixed the sdiv/lrdiv calculation loop
- Moved the cpu dai registration
- Removed empty ep93xx_pcm_prepare callback
- Fixed enable/disable when both capture and playback are running

Capture still does not work. The dma is running, but the captured data is all zeros (tested used arecord and loopback). I have a 2.6.20 kernel with ep93xx i2s audio working an capture works there on the same hardware. I have spent sometime looking into this, but can't see the problem. Would appreciate if someone can lend some insight as to what I have done wrong.

Quoted 4 lines

Ryan Mallon (3):
ep93xx i2s core support
ep93xx i2s audio driver
Snapper cl15 audio support

All

Acked-by Liam Girdwood <[email protected]>

Russell, Mark has picked up patch 2/3 via the alsa tree. Should I submit 1/3 and 3/3 via the arm patch system with Liam's ack?

Quoted 2 lines · Ryan Mallon

Russell, Mark has picked up patch 2/3 via the alsa tree. Should I submit 1/3 and 3/3 via the arm patch system with Liam's ack?

At least 3/3 needs to go via the ASoC tree since it depends on 2/3. It may make sense for all of them to go that way, or perhaps 1/3 could go separately via the ARM tree (in which case I'd ack it too).

The following patch series adds support for i2s audio on the ep93xx, with the Snapper CL15 used as an example implementation.

Quoted 2 lines · Ryan Mallon

The following patch series adds support for i2s audio on the ep93xx, with the Snapper CL15 used as an example implementation.

Please do remember to CC maintainers on patches. I've had to remind you about this before, it's really not helpful to drop the people you're expecting to review the patches - it'll tend to delay things or lead to the patches getting missed. From a code point of view this looks fine but we'll need an arch maintainer to sign off on that bit of the code. I've applied 2/3 since that has no arch/arm elements.