Skip to contentSkip to conversation

ARM: S5PV210: Add init code of audio to Goni and Aquila board

PATCH Superseded Chanwoo Choi 5 participants 7 messages Oct 1, 2010 – Oct 14, 2010

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 2/3 ARM: S5PV210: Add init code of audio to Goni and Aquila board

This patch add initializtion code of audio and I2S platform drivers to Goni and Aquila board.

---
 arch/arm/mach-s5pv210/mach-aquila.c |   24 ++++++++++++++++++++++++
 arch/arm/mach-s5pv210/mach-goni.c   |   11 +++++++++++
 2 files changed, 35 insertions(+), 0 deletions(-)
arch/arm/mach-s5pv210/mach-aquila.c +24 -0
index 0663ec4..92dad41 100644
@@ -507,8 +507,31 @@ static struct platform_device *aquila_devices[] __initdata = {
 	&s5p_device_fimc0,
 	&s5p_device_fimc1,
 	&s5p_device_fimc2,
+	&s5pv210_device_iis0,
 };
 
+static void __init aquila_sound_init(void)
+{
+	unsigned int gpio;
+
+	/* CODEC_XTAL_EN 
+	 *
+	 * The Aquila board have a oscillator which provide main clock
+	 * to WM8994 codec. The oscillator provide 24MHz clock to WM8994
+	 * clock. Set gpio setting of "CODEC_XTAL_EN" to enable a oscillator.
+	 * */
+	gpio = S5PV210_GPH3(2);		/* XEINT_26 */
+	gpio_request(gpio, "CODEC_XTAL_EN");
+	s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT);
+	s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+
+	/* Ths main clock of WM8994 codec uses the output of CLKOUT pin.
+	 * The CLKOUT[9:8] set to 0x3(XUSBXTI) of 0xE010E000(OTHERS) 
+	 * because it needs 24MHz clock to operate WM8994 codec.
+	 */
+	writel(readl(S5P_OTHERS) | (0x3 << 8), S5P_OTHERS);
+}
+
 static void __init aquila_map_io(void)
 {
 	s5p_init_io(NULL, 0, S5P_VA_CHIPID);
@@ -530,6 +553,7 @@ static void __init aquila_machine_init(void)
 	s3c_fimc_setname(2, "s5p-fimc");
 
 	/* SOUND */
+	aquila_sound_init();
 	i2c_register_board_info(AP_I2C_GPIO_BUS_5, i2c_gpio5_devs,
 			ARRAY_SIZE(i2c_gpio5_devs));
 
arch/arm/mach-s5pv210/mach-goni.c +11 -0
index df5c2d1..d3bab85 100644
@@ -488,8 +488,18 @@ static struct platform_device *goni_devices[] __initdata = {
 	&s3c_device_hsmmc0,
 	&s3c_device_hsmmc1,
 	&s3c_device_hsmmc2,
+	&s5pv210_device_iis0,
 };
 
+static void __init goni_sound_init(void)
+{
+	/* Ths main clock of WM8994 codec uses the output of CLKOUT pin.
+	 * The CLKOUT[9:8] set to 0x3(XUSBXTI) of 0xE010E000(OTHERS) 
+	 * because it needs 24MHz clock to operate WM8994 codec.
+	 */
+	writel(readl(S5P_OTHERS) | (0x3 << 8), S5P_OTHERS);
+}
+
 static void __init goni_map_io(void)
 {
 	s5p_init_io(NULL, 0, S5P_VA_CHIPID);
@@ -507,6 +517,7 @@ static void __init goni_machine_init(void)
 	goni_setup_sdhci();
 
 	/* SOUND */
+	goni_sound_init();
 	i2c_register_board_info(AP_I2C_GPIO_BUS_5, i2c_gpio5_devs,
 			ARRAY_SIZE(i2c_gpio5_devs));
 
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 2/3 ARM: S5PV210: Add init code of audio to Goni and Aquila board

Quoted 2 lines · Chanwoo Choi

This patch add initializtion code of audio and I2S platform drivers to Goni and Aquila board.

arch/arm/mach-s5pv210/mach-aquila.c static struct platform_device *aquila_devices[] __initdata = { · line 522

Quoted 10 lines
arch/arm/mach-s5pv210/mach-aquila.c +10 -0
+static void __init aquila_sound_init(void)
+{
+	unsigned int gpio;
+
+	/* CODEC_XTAL_EN 
+	 *
+	 * The Aquila board have a oscillator which provide main clock
+	 * to WM8994 codec. The oscillator provide 24MHz clock to WM8994
+	 * clock. Set gpio setting of "CODEC_XTAL_EN" to enable a oscillator.
+	 * */

In future we should be able to arrange for this clock to be disabled when the CODEC is totally idle, giving a marginal power saving.

#2 lore raw

PATCH 2/3 ARM: S5PV210: Add init code of audio to Goni and Aquila board

In reply to Chanwoo Choi
Quoted 84 lines · Chanwoo Choi

This patch add initializtion code of audio and I2S platform drivers to Goni and Aquila board.

---
 arch/arm/mach-s5pv210/mach-aquila.c |   24 ++++++++++++++++++++++++
 arch/arm/mach-s5pv210/mach-goni.c   |   11 +++++++++++
 2 files changed, 35 insertions(+), 0 deletions(-)
arch/arm/mach-s5pv210/mach- renamed from arch/arm/mach-s5pv210/mach-aquila.c +0 -0

aquila.c
index 0663ec4..92dad41 100644

arch/arm/mach-s5pv210/mach-aquila.c +23 -0
@@ -507,8 +507,31 @@ static struct platform_device *aquila_devices[] __initdata
 = {
 	&s5p_device_fimc0,
 	&s5p_device_fimc1,
 	&s5p_device_fimc2,
+	&s5pv210_device_iis0,
 };
 
+static void __init aquila_sound_init(void)
+{
+	unsigned int gpio;
+
+	/* CODEC_XTAL_EN
+	 *
+	 * The Aquila board have a oscillator which provide main clock
+	 * to WM8994 codec. The oscillator provide 24MHz clock to WM8994
+	 * clock. Set gpio setting of "CODEC_XTAL_EN" to enable a oscillator.
+	 * */
+	gpio = S5PV210_GPH3(2);		/* XEINT_26 */
+	gpio_request(gpio, "CODEC_XTAL_EN");
+	s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT);
+	s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+
+	/* Ths main clock of WM8994 codec uses the output of CLKOUT pin.
+	 * The CLKOUT[9:8] set to 0x3(XUSBXTI) of 0xE010E000(OTHERS)
+	 * because it needs 24MHz clock to operate WM8994 codec.
+	 */
+	writel(readl(S5P_OTHERS) | (0x3 << 8), S5P_OTHERS);
+}
+
 static void __init aquila_map_io(void)
 {
arch/arm/mach-s5pv210/mach-aquila.c +1 -0
 	s5p_init_io(NULL, 0, S5P_VA_CHIPID);
@@ -530,6 +553,7 @@ static void __init aquila_machine_init(void)
 	s3c_fimc_setname(2, "s5p-fimc");
 
 	/* SOUND */
+	aquila_sound_init();
 	i2c_register_board_info(AP_I2C_GPIO_BUS_5, i2c_gpio5_devs,
 			ARRAY_SIZE(i2c_gpio5_devs));
 
arch/arm/mach-s5pv210/mach- renamed from arch/arm/mach-s5pv210/mach-goni.c +0 -0

goni.c
index df5c2d1..d3bab85 100644

arch/arm/mach-s5pv210/mach-goni.c +10 -0
@@ -488,8 +488,18 @@ static struct platform_device *goni_devices[] __initdata =
 {
 	&s3c_device_hsmmc0,
 	&s3c_device_hsmmc1,
 	&s3c_device_hsmmc2,
+	&s5pv210_device_iis0,
 };
 
+static void __init goni_sound_init(void)
+{
+	/* Ths main clock of WM8994 codec uses the output of CLKOUT pin.
+	 * The CLKOUT[9:8] set to 0x3(XUSBXTI) of 0xE010E000(OTHERS)
+	 * because it needs 24MHz clock to operate WM8994 codec.
+	 */
+	writel(readl(S5P_OTHERS) | (0x3 << 8), S5P_OTHERS);
+}
+
 static void __init goni_map_io(void)
 {
arch/arm/mach-s5pv210/mach-goni.c +0 -0
 	s5p_init_io(NULL, 0, S5P_VA_CHIPID);

arch/arm/mach-s5pv210/mach-goni.c static void __init goni_machine_init(void)

Quoted 8 lines
arch/arm/mach-s5pv210/mach-goni.c +1 -1
@@ -507,6 +517,7 @@ static void __init goni_machine_init(void)
 	goni_setup_sdhci();
 
 	/* SOUND */
+	goni_sound_init();
 	i2c_register_board_info(AP_I2C_GPIO_BUS_5, i2c_gpio5_devs,
 			ARRAY_SIZE(i2c_gpio5_devs));
 
--

Hi Chanwoo,

I missed your first patch "[PATCH 1/3] ARM: S5P210: Add i2c information to Goni and Aquila board" in my mailbox. Could you please re-send it?

And I prefer __raw_writel() than writel() here, because according to page table setting, the memory type of the area you want to access is shared device. No need memory barrier when you are accessing shared device type of memory.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

#3 lore raw

PATCH 2/3 ARM: S5PV210: Add init code of audio to Goni and Aquila board

Quoted 4 lines · Kukjin Kim
Quoted 3 lines · Chanwoo Choi

This patch add initializtion code of audio and I2S platform drivers to Goni and Aquila board.

GONI and AQUILA are mostly similar devices with different CPUs. I have already merged the ASoC machine drivers for them into one. Maybe you could compress code for other susystems as well ?

#4 lore raw

PATCH 2/3 ARM: S5PV210: Add init code of audio to Goni and Aquila board

Quoted 9 lines · Jassi Brar
Quoted 4 lines · Kukjin Kim
Quoted 3 lines · Chanwoo Choi

This patch add initializtion code of audio and I2S platform drivers to Goni and Aquila board.

GONI and AQUILA are mostly similar devices with different CPUs. I have already merged the ASoC machine drivers for them into one. Maybe you could compress code for other susystems as well ?

It's not exactly. GPIO pins are different.

Thank you,
Kyungmin Park

Quoted 6 lines

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#5 lore raw

PATCH 2/3 ARM: S5PV210: Add init code of audio to Goni and Aquila board

Quoted 11 lines · Kyungmin Park
Quoted 9 lines · Jassi Brar
Quoted 4 lines · Kukjin Kim
Quoted 3 lines · Chanwoo Choi

This patch add initializtion code of audio and I2S platform drivers to Goni and Aquila board.

GONI and AQUILA are mostly similar devices with different CPUs. I have already merged the ASoC machine drivers for them into one. Maybe you could compress code for other susystems as well ?

It's not exactly. GPIO pins are different.

Maybe the GPIO differences could be handled at one place and other codes compressed ?

#6 lore raw

PATCH 2/3 ARM: S5PV210: Add init code of audio to Goni and Aquila board

Quoted 4 lines · Jassi Brar
Quoted 1 line

It's not exactly. GPIO pins are different.

Maybe the GPIO differences could be handled at one place and other codes compressed ?

Platform data for the audio driver, perhaps? That's being used by some other systems, and should be much easier now with multi-component.