Skip to contentSkip to conversation

OMAP: McBSP: Fix CLKR and FSR signal muxing

PATCH Superseded Jarkko Nikula 4 participants 10 messages Oct 5, 2010 – Oct 6, 2010

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jarkko Nikula

author
#0 lore raw

PATCH 1/3 OMAP: McBSP: Fix CLKR and FSR signal muxing

Fix bit clear. Now it clears all other bits than mask bit where it should clear only it.

Signed-off-by Jarkko Nikula <[email protected]>
Cc Paul Walmsley <[email protected]>
---
 arch/arm/mach-omap2/mcbsp.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/mcbsp.c +2 -2
index eba9fa1..f6b772e 100644
@@ -34,7 +34,7 @@ void omap2_mcbsp1_mux_clkr_src(u8 mux)
 
 	v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
 	if (mux == CLKR_SRC_CLKR)
-		v &= OMAP2_MCBSP1_CLKR_MASK;
+		v &= ~OMAP2_MCBSP1_CLKR_MASK;
 	else if (mux == CLKR_SRC_CLKX)
 		v |= OMAP2_MCBSP1_CLKR_MASK;
 	omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);

@@ -47,7 +47,7 @@ void omap2_mcbsp1_mux_fsr_src(u8 mux)
 
 	v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
 	if (mux == FSR_SRC_FSR)
-		v &= OMAP2_MCBSP1_FSR_MASK;
+		v &= ~OMAP2_MCBSP1_FSR_MASK;
 	else if (mux == FSR_SRC_FSX)
 		v |= OMAP2_MCBSP1_FSR_MASK;
 	omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);
Signature · 1 line
1.7.1
author
#1 lore raw

PATCH 2/3 OMAP: McBSP: Swap CLKS source definition

This is just a readability and debugging improvement. As selection bit in DEVCONF register is cleared when using 96 MHz PRCM source and set when using external CLKS pin, change definitions to be sync with these.

Signed-off-by Jarkko Nikula <[email protected]>
Cc Paul Walmsley <[email protected]>
---
 arch/arm/plat-omap/include/plat/mcbsp.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/plat-omap/include/plat/mcbsp.h +2 -2
index 4da6f94..e19abf2 100644
@@ -321,8 +321,8 @@
 #define FSR_SRC_FSX		1
 
 /* McBSP functional clock sources */
-#define MCBSP_CLKS_PAD_SRC	0
-#define MCBSP_CLKS_PRCM_SRC	1
+#define MCBSP_CLKS_PRCM_SRC	0
+#define MCBSP_CLKS_PAD_SRC	1
 
 /* we don't do multichannel for now */
 struct omap_mcbsp_reg_cfg {
Signature · 1 line
1.7.1
Acked-by on v1 2/3
#2 lore raw

Re: [PATCH 2/3] OMAP: McBSP: Swap CLKS source definition

Quoted 6 lines · Jarkko Nikula

This is just a readability and debugging improvement. As selection bit in DEVCONF register is cleared when using 96 MHz PRCM source and set when using external CLKS pin, change definitions to be sync with these.

Signed-off-by Jarkko Nikula <[email protected]>
Cc Paul Walmsley <[email protected]>
Acked-by Paul Walmsley <[email protected]>

- Paul

Acked-by on v1 2/3
#3 lore raw

Re: [PATCH 2/3] OMAP: McBSP: Swap CLKS source definition

In reply to Jarkko Nikula
Quoted 6 lines · On Tuesday 05 October 2010 15:29:34 ext Jarkko Nikula wrote:

This is just a readability and debugging improvement. As selection bit in DEVCONF register is cleared when using 96 MHz PRCM source and set when using external CLKS pin, change definitions to be sync with these.

Signed-off-by Jarkko Nikula <[email protected]>
Cc Paul Walmsley <[email protected]>
Acked-by Peter Ujfalusi <[email protected]>
author
#4 lore raw

PATCH 3/3 OMAP: McBSP: Remove null omap44xx ops comment

In reply to Jarkko Nikula

It seems these comments where accidentally added so remove them.

Signed-off-by Jarkko Nikula <[email protected]>
Cc Paul Walmsley <[email protected]>
---
 arch/arm/mach-omap2/mcbsp.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/mcbsp.c +0 -3
index f6b772e..f9c9df5 100644
@@ -240,21 +240,18 @@ static struct omap_mcbsp_platform_data omap44xx_mcbsp_pdata[] = {
 		.dma_rx_sync    = OMAP44XX_DMA_MCBSP2_RX,
 		.dma_tx_sync    = OMAP44XX_DMA_MCBSP2_TX,
 		.tx_irq         = OMAP44XX_IRQ_MCBSP2,
-		/* XXX .ops ? */
 	},
 	{
 		.phys_base      = OMAP44XX_MCBSP3_BASE,
 		.dma_rx_sync    = OMAP44XX_DMA_MCBSP3_RX,
 		.dma_tx_sync    = OMAP44XX_DMA_MCBSP3_TX,
 		.tx_irq         = OMAP44XX_IRQ_MCBSP3,
-		/* XXX .ops ? */
 	},
 	{
 		.phys_base      = OMAP44XX_MCBSP4_BASE,
 		.dma_rx_sync    = OMAP44XX_DMA_MCBSP4_RX,
 		.dma_tx_sync    = OMAP44XX_DMA_MCBSP4_TX,
 		.tx_irq         = OMAP44XX_IRQ_MCBSP4,
-		/* XXX .ops ? */
 	},
 };
 #define OMAP44XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap44xx_mcbsp_pdata)
Signature · 1 line
1.7.1
maintainer
#8 lore raw
Quoted 5 lines · Paul Walmsley
Quoted 3 lines · Jarkko Nikula

Fix bit clear. Now it clears all other bits than mask bit where it should clear only it.

Quoted 8 lines
Quoted 2 lines
Signed-off-by Jarkko Nikula <[email protected]>
Cc Paul Walmsley <[email protected]>

Doh. Thanks Jarkko.

Obviously this is an important patch and should go in ASAP.

Acked-by Paul Walmsley <[email protected]>

Jarkko, please repost this one more time with linux-arm-kernel list Cc'd so I don't need to repost it before applying.

Regards,

Tony

Acked-by on v1 1/3
#9 lore raw
In reply to Jarkko Nikula
Quoted 5 lines · On Tuesday 05 October 2010 15:29:33 ext Jarkko Nikula wrote:

Fix bit clear. Now it clears all other bits than mask bit where it should clear only it.

Signed-off-by Jarkko Nikula <[email protected]>
Cc Paul Walmsley <[email protected]>
Acked-by Peter Ujfalusi <[email protected]>
Signature · 5 lines
Péter
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html