Samsung: Enable Audio Devices
Subsystems (3)
cover Samsung: Enable Audio Devices
From: Jassi Brar <[email protected]>
Hi,
Next come patches that lay ground to enable audio devices on
various latest SMDKS like 6440, 6442, 6450, C110, V210, V310 and C210. Actual enabing of these devices will be done by patchset to be sent to ASoC tree.
Thanks,
Jassi
PATCH 1/17 ARM: S5P6442: Implement i2c-gpio config
From: Jassi Brar <[email protected]>
--- arch/arm/mach-s5p6442/setup-i2c0.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
arch/arm/mach-s5p6442/setup-i2c0.c +4 -1
@@ -14,12 +14,15 @@#include <linux/kernel.h> #include <linux/types.h> +#include <linux/gpio.h> struct platform_device ;/* don't need the contents */ +#include <plat/gpio-cfg.h> #include <plat/iic.h> void s3c_i2c0_cfg_gpio (struct platform_device *dev) { -/* Will be populated later */ +s3c_gpio_cfgall_range (S5P6442_GPD1 (0 ),2 , +S3C_GPIO_SFN (2 ),S3C_GPIO_PULL_UP ); }
Signature · 1 line
1.6.2.5
PATCH 2/17 ARM: SMDK6442: Enable I2C0 device on board
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
--- arch/arm/mach-s5p6442/mach-smdk6442.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
arch/arm/mach-s5p6442/mach-smdk6442.c +10 -0
@@ -12,6 +12,7 @@#include <linux/types.h> #include <linux/init.h> #include <linux/serial_core.h> +#include <linux/i2c.h> #include <asm/mach/arch.h> #include <asm/mach/map.h>
@@ -25,6 +26,7 @@#include <plat/s5p6442.h> #include <plat/devs.h> #include <plat/cpu.h> +#include <plat/iic.h> /* Following are default values for UCON, ULCON and UFCON UART registers */ #define SMDK6442_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \
@@ -65,10 +67,15 @@ static struct s3c2410_uartcfg smdk6442_uartcfgs[] __initdata = { };static struct platform_device *smdk6442_devices[]__initdata = { + &s3c_device_i2c0, &s5p6442_device_iis0, &s3c_device_wdt, }; +static struct i2c_board_info smdk6442_i2c_devs0[]__initdata = { + {I2C_BOARD_INFO ("wm8580" ,0x1b ), }, +}; +static void __init smdk6442_map_io (void ) {s5p_init_io (NULL ,0 ,S5P_VA_CHIPID );
@@ -78,6 +85,9 @@ static void __init smdk6442_map_io(void)static void __init smdk6442_machine_init (void ) { +s3c_i2c0_set_platdata (NULL ); +i2c_register_board_info (0 , smdk6442_i2c_devs0, +ARRAY_SIZE (smdk6442_i2c_devs0));platform_add_devices (smdk6442_devices,ARRAY_SIZE (smdk6442_devices)); }
Signature · 1 line
1.6.2.5
PATCH 3/17 ARM: SMDK6442: Enable I2S device to work
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Add missing virtual ASoC DMA device.
--- arch/arm/mach-s5p6442/mach-smdk6442.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/mach-s5p6442/mach-smdk6442.c +1 -0
@@ -68,6 +68,7 @@ static struct s3c2410_uartcfg smdk6442_uartcfgs[] __initdata = {static struct platform_device *smdk6442_devices[]__initdata = { &s3c_device_i2c0, + &samsung_asoc_dma, &s5p6442_device_iis0, &s3c_device_wdt, };
Signature · 1 line
1.6.2.5
PATCH 4/17 ARM: S5P6450: Define clocks for I2S
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Define missing controller clocks for the I2S-0,1 blocks.
--- arch/arm/mach-s5p64x0/clock-s5p6450.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)
arch/arm/mach-s5p64x0/clock-s5p6450.c +12 -0
@@ -261,6 +261,18 @@ static struct clk init_clocks_disable[] = { .enable = s5p64x0_pclk_ctrl, .ctrlbit = (1 << 26), }, { + .name = "iis", + .id = 1, + .parent = &clk_pclk_low.clk, + .enable = s5p64x0_pclk_ctrl, + .ctrlbit = (1 << 15), + }, { + .name = "iis", + .id = 2, + .parent = &clk_pclk_low.clk, + .enable = s5p64x0_pclk_ctrl, + .ctrlbit = (1 << 16), + }, { .name = "i2c", .id = 1, .parent = &clk_pclk_low.clk,
Signature · 1 line
1.6.2.5
PATCH 4/17 ARM: S5P6450: Define clocks for I2S
Quoted 5 lines · Jassi Brar
From: Jassi Brar <[email protected]>
Define missing controller clocks for the I2S-0,1 blocks.
Should be "for the I2S-1 and 2 blocks"?
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 31 lines
Signed-off-by Jassi Brar <[email protected]>--- arch/arm/mach-s5p64x0/clock-s5p6450.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)arch/arm/mach- renamed from arch/arm/mach-s5p64x0/clock-s5p6450.c +0
-0
s5p64x0/clock-s5p6450.c
index 7fc6abd..d8b20ee 100644arch/arm/mach-s5p64x0/clock-s5p6450.c +12
-1@@ -261,6 +261,18 @@ static struct clk init_clocks_disable[] = { .enable = s5p64x0_pclk_ctrl, .ctrlbit = (1 << 26), }, { + .name = "iis", + .id = 1, + .parent = &clk_pclk_low.clk, + .enable = s5p64x0_pclk_ctrl, + .ctrlbit = (1 << 15), + }, { + .name = "iis", + .id = 2, + .parent = &clk_pclk_low.clk, + .enable = s5p64x0_pclk_ctrl, + .ctrlbit = (1 << 16), + }, { .name = "i2c", .id = 1, .parent = &clk_pclk_low.clk, --1.6.2.5
PATCH 4/17 ARM: S5P6450: Define clocks for I2S
Quoted 7 lines · Kukjin Kim
Quoted 5 lines · Jassi Brar
From: Jassi Brar <[email protected]>
Define missing controller clocks for the I2S-0,1 blocks.
Should be "for the I2S-1 and 2 blocks"?
egjactly, yes :)
I am ok if you modify the log, though I can resubmit the patch.
PATCH 5/17 ARM: S5P6450: Define base addresses for I2S
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
--- arch/arm/mach-s5p64x0/include/mach/map.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/mach-s5p64x0/include/mach/map.h +2 -0
@@ -63,6 +63,8 @@#define S5P64X0_PA_HSMMC (x) (0xED800000 + ((x) * 0x100000))#define S5P64X0_PA_I2S (0xF2000000) +#define S5P6450_PA_I2S1 0xF2800000 +#define S5P6450_PA_I2S2 0xF2900000#define S5P64X0_PA_PCM (0xF2100000)
Signature · 1 line
1.6.2.5
PATCH 6/17 ARM: S5P64X0: Segregate audio devices
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Segregate I2S devices for S5P6440 and S5P6450.
--- arch/arm/mach-s5p64x0/dev-audio.c | 123 ++++++++++++++++++++++++++--- arch/arm/plat-samsung/include/plat/devs.h | 2 + 2 files changed, 112 insertions(+), 13 deletions(-)
arch/arm/mach-s5p64x0/dev-audio.c +110 -13
@@ -24,13 +24,13 @@ static const char *rclksrc[] = { [1] = "sclk_audio2", }; -static int s5p64x0_cfg_i2s (struct platform_device *pdev) +static int s5p6440_cfg_i2s (struct platform_device *pdev) { -/* configure GPIO for i2s port */ switch (pdev->id) {case 0 : -s3c_gpio_cfgpin_range (S5P6440_GPR (4 ),5 ,S3C_GPIO_SFN (5 )); -s3c_gpio_cfgpin_range (S5P6440_GPR (13 ),2 ,S3C_GPIO_SFN (5 )); +s3c_gpio_cfgpin_range (S5P6440_GPC (4 ),2 ,S3C_GPIO_SFN (5 )); +s3c_gpio_cfgpin (S5P6440_GPC (7 ),S3C_GPIO_SFN (5 )); +s3c_gpio_cfgpin_range (S5P6440_GPH (6 ),4 ,S3C_GPIO_SFN (5 ));break ;default :printk (KERN_ERR "Invalid Device %d\n" , pdev->id);
@@ -40,8 +40,8 @@ static int s5p64x0_cfg_i2s(struct platform_device *pdev)return 0 ; } -static struct s3c_audio_pdata s5p64x0_i2s_pdata = { - .cfg_gpio = s5p64x0_cfg_i2s, +static struct s3c_audio_pdata s5p6440_i2s_pdata = { + .cfg_gpio = s5p6440_cfg_i2s, .type = { .i2s = { .quirks =QUIRK_PRI_6CHAN ,
@@ -50,7 +50,7 @@ static struct s3c_audio_pdata s5p64x0_i2s_pdata = { }, }; -static struct resource s5p64x0_iis0_resource[] = { +static struct resource s5p64x0_i2s0_resource[] = { [0 ] = { .start =S5P64X0_PA_I2S , .end =S5P64X0_PA_I2S +0x100 -1 ,
@@ -71,20 +71,117 @@ static struct resource s5p64x0_iis0_resource[] = {struct platform_device s5p6440_device_iis = { .name ="samsung-i2s" , .id =0 , - .num_resources =ARRAY_SIZE (s5p64x0_iis0_resource), - .resource = s5p64x0_iis0_resource, + .num_resources =ARRAY_SIZE (s5p64x0_i2s0_resource), + .resource = s5p64x0_i2s0_resource, .dev = { - .platform_data = &s5p64x0_i2s_pdata, + .platform_data = &s5p6440_i2s_pdata, + }, +}; + +static int s5p6450_cfg_i2s (struct platform_device *pdev) +{ +switch (pdev->id) { +case 0 : +s3c_gpio_cfgpin_range (S5P6450_GPR (4 ),5 ,S3C_GPIO_SFN (5 )); +s3c_gpio_cfgpin_range (S5P6450_GPR (13 ),2 ,S3C_GPIO_SFN (5 )); +break ; +case 1 : +s3c_gpio_cfgpin (S5P6440_GPB (4 ),S3C_GPIO_SFN (5 )); +s3c_gpio_cfgpin_range (S5P6450_GPC (0 ),4 ,S3C_GPIO_SFN (5 )); +break ; +case 2 : +s3c_gpio_cfgpin_range (S5P6450_GPK (0 ),5 ,S3C_GPIO_SFN (5 )); +break ; +default : +printk (KERN_ERR "Invalid Device %d\n" , pdev->id); +return -EINVAL ; + } + +return 0 ; +} + +static struct s3c_audio_pdata s5p6450_i2s0_pdata = { + .cfg_gpio = s5p6450_cfg_i2s, + .type = { + .i2s = { + .quirks =QUIRK_PRI_6CHAN , + .src_clk = rclksrc, + }, }, };struct platform_device s5p6450_device_iis0 = { .name ="samsung-i2s" , .id =0 , - .num_resources =ARRAY_SIZE (s5p64x0_iis0_resource), - .resource = s5p64x0_iis0_resource, + .num_resources =ARRAY_SIZE (s5p64x0_i2s0_resource), + .resource = s5p64x0_i2s0_resource, + .dev = { + .platform_data = &s5p6450_i2s0_pdata, + }, +}; + +static struct s3c_audio_pdata s5p6450_i2s_pdata = { + .cfg_gpio = s5p6450_cfg_i2s, + .type = { + .i2s = { + .src_clk = rclksrc, + }, + }, +}; + +static struct resource s5p6450_i2s1_resource[] = { + [0 ] = { + .start =S5P6450_PA_I2S1 , + .end =S5P6450_PA_I2S1 +0x100 -1 , + .flags =IORESOURCE_MEM , + }, + [1 ] = { + .start =DMACH_I2S1_TX , + .end =DMACH_I2S1_TX , + .flags =IORESOURCE_DMA , + }, + [2 ] = { + .start =DMACH_I2S1_RX , + .end =DMACH_I2S1_RX , + .flags =IORESOURCE_DMA , + }, +}; + +struct platform_device s5p6450_device_iis1 = { + .name ="samsung-i2s" , + .id =1 , + .num_resources =ARRAY_SIZE (s5p6450_i2s1_resource), + .resource = s5p6450_i2s1_resource, + .dev = { + .platform_data = &s5p6450_i2s_pdata, + }, +}; + +static struct resource s5p6450_i2s2_resource[] = { + [0 ] = { + .start =S5P6450_PA_I2S2 , + .end =S5P6450_PA_I2S2 +0x100 -1 , + .flags =IORESOURCE_MEM , + }, + [1 ] = { + .start =DMACH_I2S2_TX , + .end =DMACH_I2S2_TX , + .flags =IORESOURCE_DMA , + }, + [2 ] = { + .start =DMACH_I2S2_RX , + .end =DMACH_I2S2_RX , + .flags =IORESOURCE_DMA , + }, +}; + +struct platform_device s5p6450_device_iis2 = { + .name ="samsung-i2s" , + .id =2 , + .num_resources =ARRAY_SIZE (s5p6450_i2s2_resource), + .resource = s5p6450_i2s2_resource, .dev = { - .platform_data = &s5p64x0_i2s_pdata, + .platform_data = &s5p6450_i2s_pdata, }, };
arch/arm/plat-samsung/include/plat/devs.h +2 -0
@@ -115,6 +115,8 @@ extern struct platform_device s5p6440_device_pcm;extern struct platform_device s5p6440_device_iis;extern struct platform_device s5p6450_device_iis0; +extern struct platform_device s5p6450_device_iis1; +extern struct platform_device s5p6450_device_iis2;extern struct platform_device s5p6450_device_pcm0;extern struct platform_device s5pc100_device_ac97;
Signature · 1 line
1.6.2.5
PATCH 6/17 ARM: S5P64X0: Segregate audio devices
Quoted 3 lines · Jassi Brar
From: Jassi Brar <[email protected]>
Hi Jassi,
Maybe this is from Rajeshwari Shinde?
From: Rajeshwari Shinde <[email protected]>
Quoted 4 lines
Segregate I2S devices for S5P6440 and S5P6450.
Signed-off-by Rajeshwari Shinde <[email protected]>Signed-off-by Jassi Brar <[email protected]>
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 2 lines
--- arch/arm/mach-s5p64x0/dev-audio.c | 123
++++++++++++++++++++++++++-
Review
Quoted 5 lines
--
arch/arm/plat-samsung/include/plat/devs.h | 2 + 2 files changed, 112 insertions(+), 13 deletions(-)(quoted diff) +0
-0
b/arch/arm/mach-s5p64x0/dev-
Quoted 182 lines
audio.c
index 14f89e7..35f1f22 100644arch/arm/mach-s5p64x0/dev-audio.c +110
-13@@ -24,13 +24,13 @@ static const char *rclksrc[] = { [1] = "sclk_audio2", }; -static int s5p64x0_cfg_i2s (struct platform_device *pdev) +static int s5p6440_cfg_i2s (struct platform_device *pdev) { -/* configure GPIO for i2s port */ switch (pdev->id) {case 0 : -s3c_gpio_cfgpin_range (S5P6440_GPR (4 ),5 ,S3C_GPIO_SFN (5 )); -s3c_gpio_cfgpin_range (S5P6440_GPR (13 ),2 ,S3C_GPIO_SFN (5 )); +s3c_gpio_cfgpin_range (S5P6440_GPC (4 ),2 ,S3C_GPIO_SFN (5 )); +s3c_gpio_cfgpin (S5P6440_GPC (7 ),S3C_GPIO_SFN (5 )); +s3c_gpio_cfgpin_range (S5P6440_GPH (6 ),4 ,S3C_GPIO_SFN (5 ));break ;default :printk (KERN_ERR "Invalid Device %d\n" , pdev->id);@@ -40,8 +40,8 @@ static int s5p64x0_cfg_i2s(struct platform_device *pdev)return 0 ; } -static struct s3c_audio_pdata s5p64x0_i2s_pdata = { - .cfg_gpio = s5p64x0_cfg_i2s, +static struct s3c_audio_pdata s5p6440_i2s_pdata = { + .cfg_gpio = s5p6440_cfg_i2s, .type = { .i2s = { .quirks =QUIRK_PRI_6CHAN ,@@ -50,7 +50,7 @@ static struct s3c_audio_pdata s5p64x0_i2s_pdata = { }, }; -static struct resource s5p64x0_iis0_resource[] = { +static struct resource s5p64x0_i2s0_resource[] = { [0 ] = { .start =S5P64X0_PA_I2S , .end =S5P64X0_PA_I2S +0x100 -1 ,@@ -71,20 +71,117 @@ static struct resource s5p64x0_iis0_resource[] = {struct platform_device s5p6440_device_iis = { .name ="samsung-i2s" , .id =0 , - .num_resources =ARRAY_SIZE (s5p64x0_iis0_resource), - .resource = s5p64x0_iis0_resource, + .num_resources =ARRAY_SIZE (s5p64x0_i2s0_resource), + .resource = s5p64x0_i2s0_resource, .dev = { - .platform_data = &s5p64x0_i2s_pdata, + .platform_data = &s5p6440_i2s_pdata, + }, +}; + +static int s5p6450_cfg_i2s (struct platform_device *pdev) +{ +switch (pdev->id) { +case 0 : +s3c_gpio_cfgpin_range (S5P6450_GPR (4 ),5 ,S3C_GPIO_SFN (5 )); +s3c_gpio_cfgpin_range (S5P6450_GPR (13 ),2 ,S3C_GPIO_SFN (5 )); +break ; +case 1 : +s3c_gpio_cfgpin (S5P6440_GPB (4 ),S3C_GPIO_SFN (5 )); +s3c_gpio_cfgpin_range (S5P6450_GPC (0 ),4 ,S3C_GPIO_SFN (5 )); +break ; +case 2 : +s3c_gpio_cfgpin_range (S5P6450_GPK (0 ),5 ,S3C_GPIO_SFN (5 )); +break ; +default : +printk (KERN_ERR "Invalid Device %d\n" , pdev->id); +return -EINVAL ; + } + +return 0 ; +} + +static struct s3c_audio_pdata s5p6450_i2s0_pdata = { + .cfg_gpio = s5p6450_cfg_i2s, + .type = { + .i2s = { + .quirks =QUIRK_PRI_6CHAN , + .src_clk = rclksrc, + }, }, };struct platform_device s5p6450_device_iis0 = { .name ="samsung-i2s" , .id =0 , - .num_resources =ARRAY_SIZE (s5p64x0_iis0_resource), - .resource = s5p64x0_iis0_resource, + .num_resources =ARRAY_SIZE (s5p64x0_i2s0_resource), + .resource = s5p64x0_i2s0_resource, + .dev = { + .platform_data = &s5p6450_i2s0_pdata, + }, +}; + +static struct s3c_audio_pdata s5p6450_i2s_pdata = { + .cfg_gpio = s5p6450_cfg_i2s, + .type = { + .i2s = { + .src_clk = rclksrc, + }, + }, +}; + +static struct resource s5p6450_i2s1_resource[] = { + [0 ] = { + .start =S5P6450_PA_I2S1 , + .end =S5P6450_PA_I2S1 +0x100 -1 , + .flags =IORESOURCE_MEM , + }, + [1 ] = { + .start =DMACH_I2S1_TX , + .end =DMACH_I2S1_TX , + .flags =IORESOURCE_DMA , + }, + [2 ] = { + .start =DMACH_I2S1_RX , + .end =DMACH_I2S1_RX , + .flags =IORESOURCE_DMA , + }, +}; + +struct platform_device s5p6450_device_iis1 = { + .name ="samsung-i2s" , + .id =1 , + .num_resources =ARRAY_SIZE (s5p6450_i2s1_resource), + .resource = s5p6450_i2s1_resource, + .dev = { + .platform_data = &s5p6450_i2s_pdata, + }, +}; + +static struct resource s5p6450_i2s2_resource[] = { + [0 ] = { + .start =S5P6450_PA_I2S2 , + .end =S5P6450_PA_I2S2 +0x100 -1 , + .flags =IORESOURCE_MEM , + }, + [1 ] = { + .start =DMACH_I2S2_TX , + .end =DMACH_I2S2_TX , + .flags =IORESOURCE_DMA , + }, + [2 ] = { + .start =DMACH_I2S2_RX , + .end =DMACH_I2S2_RX , + .flags =IORESOURCE_DMA , + }, +}; + +struct platform_device s5p6450_device_iis2 = { + .name ="samsung-i2s" , + .id =2 , + .num_resources =ARRAY_SIZE (s5p6450_i2s2_resource), + .resource = s5p6450_i2s2_resource, .dev = { - .platform_data = &s5p64x0_i2s_pdata, + .platform_data = &s5p6450_i2s_pdata, }, };arch/arm/plat- renamed from arch/arm/plat-samsung/include/plat/devs.h +0
-0
samsung/include/plat/devs.h
index e9e3b6e..ec23691 100644arch/arm/plat-samsung/include/plat/devs.h +2
-1@@ -115,6 +115,8 @@ extern struct platform_device s5p6440_device_pcm;extern struct platform_device s5p6440_device_iis;extern struct platform_device s5p6450_device_iis0; +extern struct platform_device s5p6450_device_iis1; +extern struct platform_device s5p6450_device_iis2;extern struct platform_device s5p6450_device_pcm0;extern struct platform_device s5pc100_device_ac97; --1.6.2.5
PATCH 6/17 ARM: S5P64X0: Segregate audio devices
Quoted 7 lines · Kukjin Kim
Quoted 3 lines · Jassi Brar
From: Jassi Brar <[email protected]>
Hi Jassi,
Maybe this is from Rajeshwari Shinde?
Not exactly, though I am ok if you modify it so.
I prepared the patch independently, but credited her because she had sent me a similar patch in a patchset. I couldn't accept her other patches but this one was ok.
PATCH 7/17 ARM: SMDK6440: Enable I2S device to work
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Add missing virtual ASoC DMA device and WM8580 as I2C slave, so that the I2S can work on SMDK.
--- arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/mach-s5p64x0/mach-smdk6440.c +2 -0
@@ -95,6 +95,7 @@ static struct platform_device *smdk6440_devices[] __initdata = { &s3c_device_i2c1, &s3c_device_ts, &s3c_device_wdt, + &samsung_asoc_dma, &s5p6440_device_iis, };
@@ -117,6 +118,7 @@ static struct s3c2410_platform_i2c s5p6440_i2c1_data __initdata = {static struct i2c_board_info smdk6440_i2c_devs0[]__initdata = { {I2C_BOARD_INFO ("24c08" ,0x50 ), }, + {I2C_BOARD_INFO ("wm8580" ,0x1b ), }, };static struct i2c_board_info smdk6440_i2c_devs1[]__initdata = {
Signature · 1 line
1.6.2.5
PATCH 8/17 ARM: SMDK6450: Enable I2S device to work
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Add missing virtual ASoC DMA device and WM8580 as I2C slave, so that the I2S can work on SMDK.
--- arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/mach-s5p64x0/mach-smdk6450.c +2 -0
@@ -113,6 +113,7 @@ static struct platform_device *smdk6450_devices[] __initdata = { &s3c_device_i2c1, &s3c_device_ts, &s3c_device_wdt, + &samsung_asoc_dma, &s5p6450_device_iis0, /* s5p6450_device_spi0 will be added */ };
@@ -135,6 +136,7 @@ static struct s3c2410_platform_i2c s5p6450_i2c1_data __initdata = { };static struct i2c_board_info smdk6450_i2c_devs0[]__initdata = { + {I2C_BOARD_INFO ("wm8580" ,0x1b ), }, {I2C_BOARD_INFO ("24c08" ,0x50 ), },/* Samsung KS24C080C EEPROM */ };
Signature · 1 line
1.6.2.5
PATCH 9/17 ARM: SMDKC110: Enable I2S device to work
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Add missing virtual ASoC DMA device and WM8580 as I2C slave, so that the I2S can work on SMDK.
--- arch/arm/mach-s5pv210/mach-smdkc110.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/mach-s5pv210/mach-smdkc110.c +2 -0
@@ -81,6 +81,7 @@ static struct s3c_ide_platdata smdkc110_ide_pdata __initdata = { };static struct platform_device *smdkc110_devices[]__initdata = { + &samsung_asoc_dma, &s5pv210_device_iis0, &s5pv210_device_ac97, &s5pv210_device_spdif,
@@ -94,6 +95,7 @@ static struct platform_device *smdkc110_devices[] __initdata = {static struct i2c_board_info smdkc110_i2c_devs0[]__initdata = { {I2C_BOARD_INFO ("24c08" ,0x50 ), },/* Samsung S524AD0XD1 */ + {I2C_BOARD_INFO ("wm8580" ,0x1b ), }, };static struct i2c_board_info smdkc110_i2c_devs1[]__initdata = {
Signature · 1 line
1.6.2.5
PATCH 10/17 ARM: SMDKV210: Enable I2S device to work
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Add missing virtual ASoC DMA device and WM8580 as I2C slave, so that the I2S can work on SMDK.
--- arch/arm/mach-s5pv210/mach-smdkv210.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/mach-s5pv210/mach-smdkv210.c +2 -0
@@ -103,6 +103,7 @@ static struct samsung_keypad_platdata smdkv210_keypad_data __initdata = { };static struct platform_device *smdkv210_devices[]__initdata = { + &samsung_asoc_dma, &s5pv210_device_iis0, &s5pv210_device_ac97, &s5pv210_device_spdif,
@@ -123,6 +124,7 @@ static struct platform_device *smdkv210_devices[] __initdata = {static struct i2c_board_info smdkv210_i2c_devs0[]__initdata = { {I2C_BOARD_INFO ("24c08" ,0x50 ), },/* Samsung S524AD0XD1 */ + {I2C_BOARD_INFO ("wm8580" ,0x1b ), }, };static struct i2c_board_info smdkv210_i2c_devs1[]__initdata = {
Signature · 1 line
1.6.2.5
PATCH 11/17 ARM: SMDKV310: Enable I2C1 device
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Enable the I2C_1 device on SMDKV310 and SMDKC210
--- arch/arm/mach-s5pv310/Kconfig | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
arch/arm/mach-s5pv310/Kconfig +4 -0
@@ -75,6 +75,8 @@ config MACH_SMDKC210 select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC3 select S5PV310_SETUP_SDHCI + select S3C_DEV_I2C1 + select S5PV310_SETUP_I2C1 help Machine support for Samsung SMDKC210 S5PC210(MCP) is one of package option of S5PV310
@@ -103,6 +105,8 @@ config MACH_SMDKV310 select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC3 select S5PV310_SETUP_SDHCI + select S3C_DEV_I2C1 + select S5PV310_SETUP_I2C1 help Machine support for Samsung SMDKV310
Signature · 1 line
1.6.2.5
PATCH 12/17 ARM: S5PV310: Add PDMA clocks
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Define PDMA clocks for the controller 0 & 1.
--- arch/arm/mach-s5pv310/clock.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
arch/arm/mach-s5pv310/clock.c +10 -0
@@ -467,6 +467,16 @@ static struct clk init_clocks_disable[] = { .enable = s5pv310_clk_ip_fsys_ctrl, .ctrlbit = (1 << 10), }, { + .name = "pdma", + .id = 0, + .enable = s5pv310_clk_ip_fsys_ctrl, + .ctrlbit = (1 << 0), + }, { + .name = "pdma", + .id = 1, + .enable = s5pv310_clk_ip_fsys_ctrl, + .ctrlbit = (1 << 1), + }, { .name = "adc", .id = -1, .enable = s5pv310_clk_ip_peril_ctrl,
Signature · 1 line
1.6.2.5
PATCH 13/17 ARM: S5PV310: Add AC97 clocks
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Define clock for the AC97 controller
--- arch/arm/mach-s5pv310/clock.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
arch/arm/mach-s5pv310/clock.c +5 -0
@@ -517,6 +517,11 @@ static struct clk init_clocks_disable[] = { .enable = s5pv310_clk_ip_peril_ctrl, .ctrlbit = (1 << 18), }, { + .name = "ac97", + .id = -1, + .enable = s5pv310_clk_ip_peril_ctrl, + .ctrlbit = (1 << 27), + }, { .name = "fimg2d", .id = -1, .enable = s5pv310_clk_ip_image_ctrl,
Signature · 1 line
1.6.2.5
PATCH 14/17 ARM: S5PV310: Define I2S clocks
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
--- arch/arm/mach-s5pv310/clock.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)
arch/arm/mach-s5pv310/clock.c +15 -0
@@ -517,6 +517,21 @@ static struct clk init_clocks_disable[] = { .enable = s5pv310_clk_ip_peril_ctrl, .ctrlbit = (1 << 18), }, { + .name = "iis", + .id = 0, + .enable = s5pv310_clk_ip_peril_ctrl, + .ctrlbit = (1 << 19), + }, { + .name = "iis", + .id = 1, + .enable = s5pv310_clk_ip_peril_ctrl, + .ctrlbit = (1 << 20), + }, { + .name = "iis", + .id = 2, + .enable = s5pv310_clk_ip_peril_ctrl, + .ctrlbit = (1 << 21), + }, { .name = "ac97", .id = -1, .enable = s5pv310_clk_ip_peril_ctrl,
Signature · 1 line
1.6.2.5
PATCH 14/17 ARM: S5PV310: Define I2S clocks
Hi,
Don't you use the i2s instead of iis?
Thank you,
Kyungmin Park
Quoted 42 lines · Jassi Brar
From: Jassi Brar <[email protected]>
Signed-off-by Jassi Brar <[email protected]>---
?arch/arm/mach-s5pv310/clock.c | ? 15 +++++++++++++++ ?1 files changed, 15 insertions(+), 0 deletions(-)arch/arm/mach-s5pv310/clock.c +15
-1@@ -517,6 +517,21 @@ static struct clk init_clocks_disable[] = { ? ? ? ? ? ? ? ?.enable ? ? ? ? = s5pv310_clk_ip_peril_ctrl, ? ? ? ? ? ? ? ?.ctrlbit ? ? ? ?= (1 << 18), ? ? ? ?}, { + ? ? ? ? ? ? ? .name ? ? ? ? ? = "iis", + ? ? ? ? ? ? ? .id ? ? ? ? ? ? = 0, + ? ? ? ? ? ? ? .enable ? ? ? ? = s5pv310_clk_ip_peril_ctrl, + ? ? ? ? ? ? ? .ctrlbit ? ? ? ?= (1 << 19), + ? ? ? }, { + ? ? ? ? ? ? ? .name ? ? ? ? ? = "iis", + ? ? ? ? ? ? ? .id ? ? ? ? ? ? = 1, + ? ? ? ? ? ? ? .enable ? ? ? ? = s5pv310_clk_ip_peril_ctrl, + ? ? ? ? ? ? ? .ctrlbit ? ? ? ?= (1 << 20), + ? ? ? }, { + ? ? ? ? ? ? ? .name ? ? ? ? ? = "iis", + ? ? ? ? ? ? ? .id ? ? ? ? ? ? = 2, + ? ? ? ? ? ? ? .enable ? ? ? ? = s5pv310_clk_ip_peril_ctrl, + ? ? ? ? ? ? ? .ctrlbit ? ? ? ?= (1 << 21), + ? ? ? }, { ? ? ? ? ? ? ? ?.name ? ? ? ? ? = "ac97", ? ? ? ? ? ? ? ?.id ? ? ? ? ? ? = -1, ? ? ? ? ? ? ? ?.enable ? ? ? ? = s5pv310_clk_ip_peril_ctrl, --1.6.2.5
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 14/17 ARM: S5PV310: Define I2S clocks
Quoted 2 lines · Kyungmin Park
Don't you use the i2s instead of iis?
The already present driver expects 'iis' so we have to call it so, atm.
PATCH 14/17 ARM: S5PV310: Define I2S clocks
Quoted 5 lines · Jassi Brar
Quoted 2 lines · Kyungmin Park
Don't you use the i2s instead of iis?
The already present driver expects 'iis' so we have to call it so, atm.
Then code clean is first?
Your logic same as you complained about code consistency.
PATCH 14/17 ARM: S5PV310: Define I2S clocks
Quoted 8 lines · Kyungmin Park
Quoted 5 lines · Jassi Brar
Quoted 2 lines · Kyungmin Park
Don't you use the i2s instead of iis?
The already present driver expects 'iis' so we have to call it so, atm.
Then code clean is first?
Yes, the code needs cleaning, but i have more important tasks right now.
Quoted 1 line
Your logic same as you complained about code consistency.
Nopes.
If I simply change from 'iis' to 'i2s' here, audio would break. My suggestion, the other day, to simply drop brackets from around _constants_ couldn't break anything. And I didn't ask anybody to first submit patch that removes all instances of brackets around constants.
PATCH 15/17 ARM: S5PV310: Add AC97 support for SMDK
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Enable AC97 audio device on SMDKV310 and SMDKC210.
--- arch/arm/mach-s5pv310/mach-smdkc210.c | 2 ++ arch/arm/mach-s5pv310/mach-smdkv310.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
arch/arm/mach-s5pv310/mach-smdkc210.c +2 -0
@@ -147,6 +147,8 @@ static struct platform_device *smdkc210_devices[] __initdata = { &s3c_device_rtc, &s3c_device_wdt, &smdkc210_smsc911x, + &samsung_asoc_dma, + &s5pv310_device_ac97, };static void __init smdkc210_smsc911x_init (void )
arch/arm/mach-s5pv310/mach-smdkv310.c +2 -0
@@ -147,6 +147,8 @@ static struct platform_device *smdkv310_devices[] __initdata = { &s3c_device_rtc, &s3c_device_wdt, &smdkv310_smsc911x, + &samsung_asoc_dma, + &s5pv310_device_ac97, };static void __init smdkv310_smsc911x_init (void )
Signature · 1 line
1.6.2.5
PATCH 16/17 ARM: SMDKV310: Enable I2S device
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Enable I2S_0 device on the SMDK.
Also, add the dependency I2C_1 device.
--- arch/arm/mach-s5pv310/mach-smdkv310.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)
arch/arm/mach-s5pv310/mach-smdkv310.c +11 -0
@@ -14,6 +14,7 @@#include <linux/platform_device.h> #include <linux/smsc911x.h> #include <linux/io.h> +#include <linux/i2c.h> #include <asm/mach/arch.h> #include <asm/mach-types.h>
@@ -23,6 +24,7 @@#include <plat/cpu.h> #include <plat/devs.h> #include <plat/sdhci.h> +#include <plat/iic.h> #include <mach/map.h> #include <mach/regs-srom.h>
@@ -139,7 +141,12 @@ static struct platform_device smdkv310_smsc911x = { }, }; +static struct i2c_board_info i2c_devs1[]__initdata = { + {I2C_BOARD_INFO ("wm8994" ,0x1a ),}, +}; +static struct platform_device *smdkv310_devices[]__initdata = { + &s3c_device_i2c1, &s3c_device_hsmmc0, &s3c_device_hsmmc1, &s3c_device_hsmmc2,
@@ -149,6 +156,7 @@ static struct platform_device *smdkv310_devices[] __initdata = { &smdkv310_smsc911x, &samsung_asoc_dma, &s5pv310_device_ac97, + &s5pv310_device_i2s0, };static void __init smdkv310_smsc911x_init (void )
@@ -184,6 +192,9 @@ static void __init smdkv310_map_io(void)static void __init smdkv310_machine_init (void ) { +s3c_i2c1_set_platdata (NULL ); +i2c_register_board_info (1 , i2c_devs1,ARRAY_SIZE (i2c_devs1)); +smdkv310_smsc911x_init ();s3c_sdhci0_set_platdata (&smdkv310_hsmmc0_pdata);
Signature · 1 line
1.6.2.5
PATCH 17/17 ARM: SMDKC210: Enable I2S device
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Enable I2S_0 device on the SMDK.
Also, add the dependency I2C_1 device.
--- arch/arm/mach-s5pv310/mach-smdkc210.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)
arch/arm/mach-s5pv310/mach-smdkc210.c +11 -0
@@ -14,6 +14,7 @@#include <linux/platform_device.h> #include <linux/smsc911x.h> #include <linux/io.h> +#include <linux/i2c.h> #include <asm/mach/arch.h> #include <asm/mach-types.h>
@@ -23,6 +24,7 @@#include <plat/cpu.h> #include <plat/devs.h> #include <plat/sdhci.h> +#include <plat/iic.h> #include <mach/map.h> #include <mach/regs-srom.h>
@@ -139,7 +141,12 @@ static struct platform_device smdkc210_smsc911x = { }, }; +static struct i2c_board_info i2c_devs1[]__initdata = { + {I2C_BOARD_INFO ("wm8994" ,0x1a ),}, +}; +static struct platform_device *smdkc210_devices[]__initdata = { + &s3c_device_i2c1, &s3c_device_hsmmc0, &s3c_device_hsmmc1, &s3c_device_hsmmc2,
@@ -149,6 +156,7 @@ static struct platform_device *smdkc210_devices[] __initdata = { &smdkc210_smsc911x, &samsung_asoc_dma, &s5pv310_device_ac97, + &s5pv310_device_i2s0, };static void __init smdkc210_smsc911x_init (void )
@@ -184,6 +192,9 @@ static void __init smdkc210_map_io(void)static void __init smdkc210_machine_init (void ) { +s3c_i2c1_set_platdata (NULL ); +i2c_register_board_info (1 , i2c_devs1,ARRAY_SIZE (i2c_devs1)); +smdkc210_smsc911x_init ();s3c_sdhci0_set_platdata (&smdkc210_hsmmc0_pdata);
Signature · 1 line
1.6.2.5
cover Samsung: Enable Audio Devices
In reply to Jassi BrarQuoted 4 lines · Jassi Brar
Next come patches that lay ground to enable audio devices on
various latest SMDKS like 6440, 6442, 6450, C110, V210, V310 and C210. Actual enabing of these devices will be done by patchset to be sent to ASoC tree.
cover Samsung: Enable Audio Devices
Quoted 9 lines · Mark Brown
Quoted 4 lines · Jassi Brar
Next come patches that lay ground to enable audio devices on
various latest SMDKS like 6440, 6442, 6450, C110, V210, V310 and C210. Actual enabing of these devices will be done by patchset to be sent to ASoC tree.Acked-by Mark Brown <[email protected]>
Looks ok to me :-) will apply.
Mark, thanks for your ack.
If you need this in your tree, please let me know. Then will separate for you.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
cover Samsung: Enable Audio Devices
Quoted 3 lines · Kukjin Kim
Mark, thanks for your ack.
If you need this in your tree, please let me know. Then will separate for you.
No need, there's no source level dependencies between the arch/arm and sound/soc bits.
cover Samsung: Enable Audio Devices
In reply to Jassi BrarQuoted 9 lines · Jassi Brar
From: Jassi Brar <[email protected]>
Hi,
Next come patches that lay ground to enable audio devices on
various latest SMDKS like 6440, 6442, 6450, C110, V210, V310 and C210. Actual enabing of these devices will be done by patchset to be sent to ASoC tree.
Hi Jassi,
To apply your patches happen following build error in my for-next.
'error: 'samsung_asoc_dma' undeclared here (not in a function)'
How can prevent build error?
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
cover Samsung: Enable Audio Devices
Quoted 10 lines · Kukjin Kim
Quoted 9 lines · Jassi Brar
From: Jassi Brar <[email protected]>
Hi,
? Next come patches that lay ground to enable audio devices on various latest SMDKS like 6440, 6442, 6450, C110, V210, V310 and C210. Actual enabing of these devices will be done by patchset to be sent to ASoC tree.
Quoted 7 lines
Hi Jassi,
To apply your patches happen following build error in my for-next.
'error: '
samsung_asoc_dma' undeclared here (not in a function)'How can prevent build error?
hmmm... your tree doesn't have the commit 'ARM: Samsung: Define common audio-dma
device' that I submitted to Mark.
cover Samsung: Enable Audio Devices
Quoted 16 lines · Jassi Brar
Quoted 14 lines · Kukjin Kim
Quoted 9 lines · Jassi Brar
From: Jassi Brar <[email protected]>
Hi,
Next come patches that lay ground to enable audio devices on
various latest SMDKS like 6440, 6442, 6450, C110, V210, V310 and C210. Actual enabing of these devices will be done by patchset to be sent to ASoC tree.Hi Jassi,
To apply your patches happen following build error in my for-next.
Quoted 7 lines
Quoted 3 lines
'error: '
samsung_asoc_dma' undeclared here (not in a function)'How can prevent build error?
hmmm... your tree doesn't have the commit 'ARM: Samsung: Define common audio-dma
device' that I submitted to Mark.
Ok :-)
Mark,
As a note, I did 'cherry-pick' following 2 commits in my tree for avoiding build error. I couldn?t 'merge' into my tree because there is no suitable branch in your tree...
--
commit 83e37b8e400ca51cc97946815b3055daacd92fa8
Author: Jassi Brar <[email protected]> Date: Mon Nov 22 15:35:53 2010 +0900
ARM: Samsung: Define common audio-dma device
The ASoC uses common DMA driver for Audio devices. So it makes sense to a common audio-dma device shared across all platforms.
commit 58bb4072132c54d832082cc6eac396a6db009cbd
Author: Jassi Brar <[email protected]> Date: Mon Nov 22 15:35:50 2010 +0900
ASoC: Samsung: Rename DMA device
Some Samsung SoCs have a PCM(DSP) controller. So the name s3c24xx-pcm-audio for DMA driver is not very appropraite. This patch moves :-
s3c24xx-pcm-audio -> samsung-audio
--
If any problems, please let me know :-)
Thanks.
Merry Christmas ;-)
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.