From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933011AbbKMRYr (ORCPT ); Fri, 13 Nov 2015 12:24:47 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:62406 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932557AbbKMRYq (ORCPT ); Fri, 13 Nov 2015 12:24:46 -0500 From: Arnd Bergmann To: Mark Brown Cc: alsa-devel@alsa-project.org, Liam Girdwood , Heiko Stuebner , Kukjin Kim , Krzysztof Kozlowski , Sangbeom Kim , linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Vinod Koul , Ben Dooks Subject: [PATCH 2/3] ASoC: s3c24xx-i2s: pass DMA channels as platform data Date: Fri, 13 Nov 2015 18:23:48 +0100 Message-ID: <4171669.Y8FyLG5WLL@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <5466463.9HBcuLFGQf@wuerfel> References: <5466463.9HBcuLFGQf@wuerfel> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:BuFqlBT4nBCcl9pNTGlqcoBwufvPMjQh3OZHSXCjdD7K2AkjUzU yEpyxCfsN6bweNRSzSYBEgek8ZOOxPHTWrGqU95zCAii9YQtVLow6ukf4nMmk80kk65nRdi AU0ed91T7t61Ro6b/J+09Da7rGwqKAwJTCEgTl/sig7yj9FHAqoCh+IwzbGgF+LTNVK84N0 Jctu9RmTKQ0Hp/MZhEenQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:RHnYxoiRAkE=:qtws6cNUW8ItVFUfGIyxzd QIjB5bnXwEsCBOVhYU7yCc2nP9s7GGM41u2+MoUrIgSkru4I61zRDgwoHBSPCeu10lnDe7N2j BDyJZyvxRI5K8RDewAzbiMcCIWYjhApxvsd7Fvms5jjTAtmbfXjQYA+E1kaxTOduySz1HasJs gFwPtWi/O42+pfN+5L24z5mVUMZtMHqGoBPQeZqgwycYHfge6zPR+12cxmmVEvqd54dqd60zy 2aIq8W1v46dE4Torkhytz6Oux2GPR9aZjfzyD3yYhv1FXjlEBovmic4mj/SXtivWIz6W+X6BY UKAKA3DJrR0zZsRmMzCEj/6ykS2ofmzW44jVq2VeO0D6JieHSWs+cbmn5V37LZXLyJVvwQOFr oGVZXFZ5i+6wKIHI2Mq50VEaQBJ80/9bgSCwdqQPmwDzfyEoVG0jr5a88Z1/CqqbBlaowSiCe gdS3hd+KR3AaYHXVYKCswX3fgKdkiwMVswyBdwFlaLWeq5+XSJcVCbnbIcBhEB0T+NOp9fvc9 bPSnuiUYM/bqjTx4jpUE+dKkNdBHJFuHELz39I9imlbcvOtntSzJU0DGGFnCmXIvlSRUYvPsD FXxhzRTIXKKU/y4DJt/bUxVCYLxG1mlV8MSMmkP1TxeZERtTS0kBbw9yxey1omZByuBmMC+f4 sCQIHhMqp86kpdpqmKfBX4Y/ScxlQQbdKti8VtwL90nKeZo535I8K7S6s+z4qFhB1doKNgq/W FaPWcsrS3eIcjmcn Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a minor cleanup to make the s3c2412-i2s and s3c24xx-i2s drivers independent of the mach/dma.h header file and to allow removing the dependency on the specific dmaengine driver in the next patch. As a side not, only the s3c24xx-i2s driver seems to still be used, while the definition of the s3c2412-i2s platform device was removed in commit 6d259a25b56d ("ARM: SAMSUNG: use static declaration when it is not used in other files") after it had never been referenced since its introduction in f0fba2ad1b6b ("ASoC: multi-component - ASoC Multi-Component Support"). Apparently it should have been used by mach-jive.c, but that never happened. My patch at this point leaves the current state unchanged, we can decide whether to fix or delete the jive driver and s3c2412-i2s another time. Signed-off-by: Arnd Bergmann diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 3ce234f4c872..e5e91669dd2b 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -571,6 +571,11 @@ static struct resource s3c_iis_resource[] = { [0] = DEFINE_RES_MEM(S3C24XX_PA_IIS, S3C24XX_SZ_IIS), }; +static struct s3c_audio_pdata s3c_iis_platdata = { + .dma_playback = (void *)DMACH_I2S_OUT, + .dma_capture = (void *)DMACH_I2S_IN, +}; + struct platform_device s3c_device_iis = { .name = "s3c24xx-iis", .id = -1, @@ -579,6 +584,7 @@ struct platform_device s3c_device_iis = { .dev = { .dma_mask = &samsung_device_dma_mask, .coherent_dma_mask = DMA_BIT_MASK(32), + .platform_data = &s3c_iis_platdata, } }; #endif /* CONFIG_PLAT_S3C24XX */ diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index 77d27c85a32a..455a0be2278e 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c @@ -33,14 +33,14 @@ #include "regs-i2s-v2.h" #include "s3c2412-i2s.h" +#include + static struct s3c_dma_params s3c2412_i2s_pcm_stereo_out = { - .slave = (void *)(uintptr_t)DMACH_I2S_OUT, .ch_name = "tx", .dma_size = 4, }; static struct s3c_dma_params s3c2412_i2s_pcm_stereo_in = { - .slave = (void *)(uintptr_t)DMACH_I2S_IN, .ch_name = "rx", .dma_size = 4, }; @@ -152,6 +152,7 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev) { int ret = 0; struct resource *res; + struct s3c_audio_pdata *pdata = dev_get_platdata(&pdev->dev); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); s3c2412_i2s.regs = devm_ioremap_resource(&pdev->dev, res); @@ -159,7 +160,9 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev) return PTR_ERR(s3c2412_i2s.regs); s3c2412_i2s_pcm_stereo_out.dma_addr = res->start + S3C2412_IISTXD; + s3c2412_i2s_pcm_stereo_out.slave = pdata->dma_playback; s3c2412_i2s_pcm_stereo_in.dma_addr = res->start + S3C2412_IISRXD; + s3c2412_i2s_pcm_stereo_in.slave = pdata->dma_capture; ret = s3c_i2sv2_register_component(&pdev->dev, -1, &s3c2412_i2s_component, diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 9da3a77ea2c7..807dcc0d7421 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -31,14 +31,14 @@ #include "dma.h" #include "s3c24xx-i2s.h" +#include + static struct s3c_dma_params s3c24xx_i2s_pcm_stereo_out = { - .slave = (void *)(uintptr_t)DMACH_I2S_OUT, .ch_name = "tx", .dma_size = 2, }; static struct s3c_dma_params s3c24xx_i2s_pcm_stereo_in = { - .slave = (void *)(uintptr_t)DMACH_I2S_IN, .ch_name = "rx", .dma_size = 2, }; @@ -454,6 +454,7 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) { int ret = 0; struct resource *res; + struct s3c_audio_pdata *pdata = dev_get_platdata(&pdev->dev); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { @@ -465,7 +466,9 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) return PTR_ERR(s3c24xx_i2s.regs); s3c24xx_i2s_pcm_stereo_out.dma_addr = res->start + S3C2410_IISFIFO; + s3c24xx_i2s_pcm_stereo_out.slave = pdata->dma_playback; s3c24xx_i2s_pcm_stereo_in.dma_addr = res->start + S3C2410_IISFIFO; + s3c24xx_i2s_pcm_stereo_in.slave = pdata->dma_capture; ret = devm_snd_soc_register_component(&pdev->dev, &s3c24xx_i2s_component, &s3c24xx_i2s_dai, 1);