From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756044AbbKRNat (ORCPT ); Wed, 18 Nov 2015 08:30:49 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:51107 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754512AbbKRNao (ORCPT ); Wed, 18 Nov 2015 08:30:44 -0500 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: alsa-devel@alsa-project.org, linux-samsung-soc@vger.kernel.org, Heiko Stuebner , Sangbeom Kim , linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Liam Girdwood , Vinod Koul , Mark Brown , Kukjin Kim Subject: [PATCH v3 2/3] ASoC: s3c24xx-i2s: pass DMA channels as platform data Date: Wed, 18 Nov 2015 14:29:55 +0100 Message-ID: <5998295.uG2eFL3eef@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <4029229.ZxVVfeA0q2@wuerfel> References: <6346833.MfUC71I3uD@wuerfel> <4020501.kQLt6nnIEv@wuerfel> <4029229.ZxVVfeA0q2@wuerfel> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:9JHam2Nx4NfqS8R3HJ6okKYf363PO+X7GOn/N4sa2/9Yvkcskn/ GMuVpiwEP5H8+CjB+AeX5gnI7Sc+Ko9EuhQ4TAbKAay2MT5C6TttIDt3PX6nvf05FmlELcH 6xHB4roRRPFebgI5yNXaM4gm8Cv3LCcCD2ywpILGWn0F8qMY01wSRBKO7F4zr1u8ADqBYUy j1QrHOR4AFtekRQTAzdnQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:9I+y3bSldHE=:54t+QAEpB7sv7TjP1fdrYt 7Vue+w78qpjBUjz/jq1+f5A1T3D78GX7j+DFtcGIWVc//wYTT3ebDlcKcjcSCllKwQJfHPuwq SJfu+LrxWch82f+NE/ehuAn/mj4liPrDfRBbVVYS5vjNK2+WVDD5aY1Hsiau5c+tievcsAGjW XWojBN80iVB6rAAm+YgX/QmSmaEaU9qd22T0zREc5jfYVCFZevMxLQZD+XDBypPnc7rmUZ1yt PLK3vPQhiUSMf9VGoFZEjRh26CE9g1K/ix53XulN53wCca5ehDDVNgYCVgg+rsDJUyxvkGp0H v5MuxKaeSEzjO1zQn1Swxhq6a9VGjvjibZFayywuEwtaTpStLBDgVofx+ESxhLcaSVDohnN/N B5VIrujBqwtK04G7rAwF/AS06NIFi/KF8tNFbtZT41ESAFZpnkOiJJ6CSSxwWlKiRagHHYYYo j/Jm9UKjffwJyr3oKQ0m9lBchhz3d0GxAS7JCvEVvI0Gvdk7IWaaWvj7uhNB95jBygtGyOVHG szYrpu8K/rsqO0Z2nYeBgFLzDScHWSBvWoy8mmZ9XiQYANKgOd3Fmzjur24Ao1+ymd6i+tUeA 8AQylgk0H0dD3zctxZXJqniK6Zw7QhpjW/2UGXP9zq2y+rtPbLJHepNY90j0yJznzwOcfu0F9 hcBMm0XAWkmf//2m6sOTopLKL73rMJXBk5xl43nz1GewLzRtI7U0z7ZtCFNLEw1elJIPE5RW8 Dk1Ho5q9JAhkeJZa 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 Reviewed-by: Krzysztof Kozlowski --- v3: fix typo in s3c24xx-i2s.c v2: check for NULL pdata diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 9c03b0e83bd5..1c2582f4b587 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..105317f523f2 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,12 @@ 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); + + if (!pdata) { + dev_err(&pdev->dev, "missing platform data"); + return -ENXIO; + } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); s3c2412_i2s.regs = devm_ioremap_resource(&pdev->dev, res); @@ -159,7 +165,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..9e6a5bc012e3 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,12 @@ 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); + + if (!pdata) { + dev_err(&pdev->dev, "missing platform data"); + return -ENXIO; + } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { @@ -465,7 +471,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);