[alsa-devel] [PATCH 6/7] S3C64XX PCM: Defined PCM controller platform devices
Signed-off-by: Jassi Brar jassi.brar@samsung.com --- arch/arm/plat-s3c/include/plat/devs.h | 3 + arch/arm/plat-s3c64xx/dev-audio.c | 101 ++++++++++++++++++++++++++++++++- 2 files changed, 103 insertions(+), 1 deletions(-)
diff --git a/arch/arm/plat-s3c/include/plat/devs.h b/arch/arm/plat-s3c/include/plat/devs.h index 0f540ea..932cbbb 100644 --- a/arch/arm/plat-s3c/include/plat/devs.h +++ b/arch/arm/plat-s3c/include/plat/devs.h @@ -28,6 +28,9 @@ extern struct platform_device s3c64xx_device_iis0; extern struct platform_device s3c64xx_device_iis1; extern struct platform_device s3c64xx_device_iisv4;
+extern struct platform_device s3c64xx_device_pcm0; +extern struct platform_device s3c64xx_device_pcm1; + extern struct platform_device s3c_device_fb; extern struct platform_device s3c_device_usb; extern struct platform_device s3c_device_lcd; diff --git a/arch/arm/plat-s3c64xx/dev-audio.c b/arch/arm/plat-s3c64xx/dev-audio.c index 1322beb..c7f1acc 100644 --- a/arch/arm/plat-s3c64xx/dev-audio.c +++ b/arch/arm/plat-s3c64xx/dev-audio.c @@ -15,9 +15,14 @@
#include <mach/irqs.h> #include <mach/map.h> +#include <mach/dma.h> +#include <mach/gpio.h>
#include <plat/devs.h> - +#include <plat/audio.h> +#include <plat/gpio-bank-d.h> +#include <plat/gpio-bank-e.h> +#include <plat/gpio-cfg.h>
static struct resource s3c64xx_iis0_resource[] = { [0] = { @@ -66,3 +71,97 @@ struct platform_device s3c64xx_device_iisv4 = { .resource = s3c64xx_iisv4_resource, }; EXPORT_SYMBOL(s3c64xx_device_iisv4); + + +/* PCM Controller platform_devices */ + +static int s3c64xx_pcm_cfg_gpio(struct platform_device *pdev) +{ + switch (pdev->id) { + case 0: + s3c_gpio_cfgpin(S3C64XX_GPD(0), S3C64XX_GPD0_PCM0_SCLK); + s3c_gpio_cfgpin(S3C64XX_GPD(1), S3C64XX_GPD1_PCM0_EXTCLK); + s3c_gpio_cfgpin(S3C64XX_GPD(2), S3C64XX_GPD2_PCM0_FSYNC); + s3c_gpio_cfgpin(S3C64XX_GPD(3), S3C64XX_GPD3_PCM0_SIN); + s3c_gpio_cfgpin(S3C64XX_GPD(4), S3C64XX_GPD4_PCM0_SOUT); + break; + case 1: + s3c_gpio_cfgpin(S3C64XX_GPE(0), S3C64XX_GPE0_PCM1_SCLK); + s3c_gpio_cfgpin(S3C64XX_GPE(1), S3C64XX_GPE1_PCM1_EXTCLK); + s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C64XX_GPE2_PCM1_FSYNC); + s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C64XX_GPE3_PCM1_SIN); + s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_PCM1_SOUT); + break; + default: + printk(KERN_DEBUG "Invalid PCM Controller number!"); + return -EINVAL; + } + + return 0; +} + +static struct resource s3c64xx_pcm0_resource[] = { + [0] = { + .start = S3C64XX_PA_PCM0, + .end = S3C64XX_PA_PCM0 + 0x100 - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = DMACH_PCM0_TX, + .end = DMACH_PCM0_TX, + .flags = IORESOURCE_DMA, + }, + [2] = { + .start = DMACH_PCM0_RX, + .end = DMACH_PCM0_RX, + .flags = IORESOURCE_DMA, + }, +}; + +struct s3c_audio_pdata s3c_pcm0_pdata = { + .cfg_gpio = s3c64xx_pcm_cfg_gpio, +}; + +struct platform_device s3c64xx_device_pcm0 = { + .name = "s3c-pcm", + .id = 0, + .num_resources = ARRAY_SIZE(s3c64xx_pcm0_resource), + .resource = s3c64xx_pcm0_resource, + .dev = { + .platform_data = &s3c_pcm0_pdata, + }, +}; +EXPORT_SYMBOL(s3c64xx_device_pcm0); + +static struct resource s3c64xx_pcm1_resource[] = { + [0] = { + .start = S3C64XX_PA_PCM1, + .end = S3C64XX_PA_PCM1 + 0x100 - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = DMACH_PCM1_TX, + .end = DMACH_PCM1_TX, + .flags = IORESOURCE_DMA, + }, + [2] = { + .start = DMACH_PCM1_RX, + .end = DMACH_PCM1_RX, + .flags = IORESOURCE_DMA, + }, +}; + +struct s3c_audio_pdata s3c_pcm1_pdata = { + .cfg_gpio = s3c64xx_pcm_cfg_gpio, +}; + +struct platform_device s3c64xx_device_pcm1 = { + .name = "s3c-pcm", + .id = 1, + .num_resources = ARRAY_SIZE(s3c64xx_pcm1_resource), + .resource = s3c64xx_pcm1_resource, + .dev = { + .platform_data = &s3c_pcm1_pdata, + }, +}; +EXPORT_SYMBOL(s3c64xx_device_pcm1);
On Thu, Nov 05, 2009 at 10:35:07AM +0900, Jassi Brar wrote:
Signed-off-by: Jassi Brar jassi.brar@samsung.com
arch/arm/plat-s3c/include/plat/devs.h | 3 + arch/arm/plat-s3c64xx/dev-audio.c | 101 ++++++++++++++++++++++++++++++++- 2 files changed, 103 insertions(+), 1 deletions(-)
Might be good to call the devices "samsung-pcm" rather than "s3c-pcm" or whatever the decision is on a common prefix to cope with the s5p CPUs.
On Sat, Nov 7, 2009 at 1:54 AM, Mark Brown broonie@opensource.wolfsonmicro.com wrote:
On Thu, Nov 05, 2009 at 10:35:07AM +0900, Jassi Brar wrote:
Signed-off-by: Jassi Brar jassi.brar@samsung.com
arch/arm/plat-s3c/include/plat/devs.h | 3 + arch/arm/plat-s3c64xx/dev-audio.c | 101 ++++++++++++++++++++++++++++++++- 2 files changed, 103 insertions(+), 1 deletions(-)
Might be good to call the devices "samsung-pcm" rather than "s3c-pcm" or whatever the decision is on a common prefix to cope with the s5p CPUs.
Well, pcm_<version> wud be even better. with 'samsung-pcm' we run out of a good option if the newer SoCs come with different version of the PCM Controller.
On Sat, Nov 07, 2009 at 12:21:43PM +0900, jassi brar wrote:
On Sat, Nov 7, 2009 at 1:54 AM, Mark Brown
Might be good to call the devices "samsung-pcm" rather than "s3c-pcm" or whatever the decision is on a common prefix to cope with the s5p CPUs.
Well, pcm_<version> wud be even better. with 'samsung-pcm' we run out of a good option if the newer SoCs come with different version of the PCM Controller.
That'd be fine as well, though I don't see a problem with omitting the version just now and then adding a second file with a version appended if a second version does crop up.
On Sat, Nov 7, 2009 at 9:14 PM, Mark Brown broonie@opensource.wolfsonmicro.com wrote:
On Sat, Nov 07, 2009 at 12:21:43PM +0900, jassi brar wrote:
On Sat, Nov 7, 2009 at 1:54 AM, Mark Brown
Might be good to call the devices "samsung-pcm" rather than "s3c-pcm" or whatever the decision is on a common prefix to cope with the s5p CPUs.
Well, pcm_<version> wud be even better. with 'samsung-pcm' we run out of a good option if the newer SoCs come with different version of the PCM Controller.
That'd be fine as well, though I don't see a problem with omitting the version just now and then adding a second file with a version appended if a second version does crop up.
Thanks for the feedback. I will wait for Ben's review of the patches before making final changes and re-submitting.
participants (3)
-
Jassi Brar -
jassi brar -
Mark Brown