| Message ID | 1387468508-12286-2-git-send-email-lee.jones@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Dec 19, 2013 at 4:54 PM, Lee Jones <lee.jones@linaro.org> wrote: > Signed-off-by: Lee Jones <lee.jones@linaro.org> I guess it's best to merge this with the other ASoC patches through Mark's tree? Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Tue, 07 Jan 2014, Linus Walleij wrote: > On Thu, Dec 19, 2013 at 4:54 PM, Lee Jones <lee.jones@linaro.org> wrote: > > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > > I guess it's best to merge this with the other ASoC patches > through Mark's tree? > Acked-by: Linus Walleij <linus.walleij@linaro.org> I'm happy with that, although I haven't heard from Mark for ages. Mark, are you still tracking this?
On Tue, Jan 07, 2014 at 02:11:54PM +0000, Lee Jones wrote: > > Acked-by: Linus Walleij <linus.walleij@linaro.org> > I'm happy with that, although I haven't heard from Mark for ages. > Mark, are you still tracking this? Yes, I've been waiting for both Linus and your testing of Takashi's fix.
On Tue, 07 Jan 2014, Mark Brown wrote: > On Tue, Jan 07, 2014 at 02:11:54PM +0000, Lee Jones wrote: > > > > Acked-by: Linus Walleij <linus.walleij@linaro.org> > > > I'm happy with that, although I haven't heard from Mark for ages. > > > Mark, are you still tracking this? > > Yes, I've been waiting for both Linus and your testing of Takashi's fix. Hmm... yes I need to get round to that, but it's not dependant on the other patches in the set.
On Thu, Dec 19, 2013 at 03:54:58PM +0000, Lee Jones wrote:
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied, thanks.
diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c index 154e15f..43d6cb8 100644 --- a/arch/arm/mach-ux500/board-mop500-audio.c +++ b/arch/arm/mach-ux500/board-mop500-audio.c @@ -31,7 +31,7 @@ static struct stedma40_chan_cfg msp0_dma_tx = { }; struct msp_i2s_platform_data msp0_platform_data = { - .id = MSP_I2S_0, + .id = 0, .msp_i2s_dma_rx = &msp0_dma_rx, .msp_i2s_dma_tx = &msp0_dma_tx, }; @@ -49,7 +49,7 @@ static struct stedma40_chan_cfg msp1_dma_tx = { }; struct msp_i2s_platform_data msp1_platform_data = { - .id = MSP_I2S_1, + .id = 1, .msp_i2s_dma_rx = NULL, .msp_i2s_dma_tx = &msp1_dma_tx, }; @@ -69,13 +69,13 @@ static struct stedma40_chan_cfg msp2_dma_tx = { }; struct msp_i2s_platform_data msp2_platform_data = { - .id = MSP_I2S_2, + .id = 2, .msp_i2s_dma_rx = &msp2_dma_rx, .msp_i2s_dma_tx = &msp2_dma_tx, }; struct msp_i2s_platform_data msp3_platform_data = { - .id = MSP_I2S_3, + .id = 3, .msp_i2s_dma_rx = &msp1_dma_rx, .msp_i2s_dma_tx = NULL, }; diff --git a/include/linux/platform_data/asoc-ux500-msp.h b/include/linux/platform_data/asoc-ux500-msp.h index 9991aea..2f34bb9 100644 --- a/include/linux/platform_data/asoc-ux500-msp.h +++ b/include/linux/platform_data/asoc-ux500-msp.h @@ -10,16 +10,9 @@ #include <linux/platform_data/dma-ste-dma40.h> -enum msp_i2s_id { - MSP_I2S_0 = 0, - MSP_I2S_1, - MSP_I2S_2, - MSP_I2S_3, -}; - /* Platform data structure for a MSP I2S-device */ struct msp_i2s_platform_data { - enum msp_i2s_id id; + int id; struct stedma40_chan_cfg *msp_i2s_dma_rx; struct stedma40_chan_cfg *msp_i2s_dma_tx; }; diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index 258d0bce..875de0f 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h @@ -475,7 +475,7 @@ struct ux500_msp_dma_params { }; struct ux500_msp { - enum msp_i2s_id id; + int id; void __iomem *registers; struct device *dev; struct ux500_msp_dma_params playback_dma_data;
Signed-off-by: Lee Jones <lee.jones@linaro.org> --- arch/arm/mach-ux500/board-mop500-audio.c | 8 ++++---- include/linux/platform_data/asoc-ux500-msp.h | 9 +-------- sound/soc/ux500/ux500_msp_i2s.h | 2 +- 3 files changed, 6 insertions(+), 13 deletions(-)