[PATCH] ARM: SMDK6410: Register AC97 controller

[PATCH] ARM: SMDK6410: Register AC97 controller

[Mark Brown]

The SMDK6410 has a WM9713 connected to the AC97 interface, by default
on the GPD pins though this can be changed with a switch on the board.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 arch/arm/mach-s3c64xx/mach-smdk6410.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index 2d5afd2..6878fbd 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -64,6 +64,7 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
+#include <plat/audio.h>
 
 #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK
 #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
@@ -254,6 +255,7 @@ static struct platform_device *smdk6410_devices[] __initdata = {
 	&s3c_device_fb,
 	&s3c_device_ohci,
 	&s3c_device_usb_hsotg,
+	&s3c64xx_device_ac97,
 	&s3c64xx_device_iisv4,
 
 #ifdef CONFIG_REGULATOR
@@ -652,6 +654,9 @@ static void __init smdk6410_machine_init(void)
 	i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0));
 	i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));
 
+	/* Board defualt with CFG2.1 off */
+	s3c64xx_ac97_setup_gpio(S3C64XX_AC97_GPD);
+
 	platform_add_devices(smdk6410_devices, ARRAY_SIZE(smdk6410_devices));
 }
 
-- 
1.7.0.2

[PATCH] ARM: SMDK6410: Register AC97 controller

[Ben Dooks]

On Thu, Mar 25, 2010 at 11:52:48AM +0000, Mark Brown wrote:
> The SMDK6410 has a WM9713 connected to the AC97 interface, by default
> on the GPD pins though this can be changed with a switch on the board.

Hmm, I really don't like the fact that we've no good way of finding
out what the switch positions are...
 
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
>  arch/arm/mach-s3c64xx/mach-smdk6410.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
> index 2d5afd2..6878fbd 100644
> --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
> +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
> @@ -64,6 +64,7 @@
>  #include <plat/clock.h>
>  #include <plat/devs.h>
>  #include <plat/cpu.h>
> +#include <plat/audio.h>
>  
>  #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK
>  #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
> @@ -254,6 +255,7 @@ static struct platform_device *smdk6410_devices[] __initdata = {
>  	&s3c_device_fb,
>  	&s3c_device_ohci,
>  	&s3c_device_usb_hsotg,
> +	&s3c64xx_device_ac97,
>  	&s3c64xx_device_iisv4,
>  
>  #ifdef CONFIG_REGULATOR
> @@ -652,6 +654,9 @@ static void __init smdk6410_machine_init(void)
>  	i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0));
>  	i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));
>  
> +	/* Board defualt with CFG2.1 off */
> +	s3c64xx_ac97_setup_gpio(S3C64XX_AC97_GPD);
> +
>  	platform_add_devices(smdk6410_devices, ARRAY_SIZE(smdk6410_devices));
>  }
>  
> -- 
> 1.7.0.2
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

[PATCH] ARM: SMDK6410: Register AC97 controller

[Mark Brown]

On Wed, Mar 31, 2010 at 02:01:59AM +0100, Ben Dooks wrote:
> On Thu, Mar 25, 2010 at 11:52:48AM +0000, Mark Brown wrote:

> > The SMDK6410 has a WM9713 connected to the AC97 interface, by default
> > on the GPD pins though this can be changed with a switch on the board.

> Hmm, I really don't like the fact that we've no good way of finding
> out what the switch positions are...

Not much we can do about the existing hardware, sadly.  There's a bunch
of other similar switches on the board (like the one that selects
between the two ethernet controllers) as well.

[PATCH] ARM: SMDK6410: Register AC97 controller

[Mark Brown]

The SMDK6410 has a WM9713 connected to the AC97 interface, by default
on the GPD pins though this can be changed with a switch on the board.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 arch/arm/mach-s3c64xx/mach-smdk6410.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index 2d5afd2..6878fbd 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -64,6 +64,7 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
+#include <plat/audio.h>
 
 #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK
 #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
@@ -254,6 +255,7 @@ static struct platform_device *smdk6410_devices[] __initdata = {
 	&s3c_device_fb,
 	&s3c_device_ohci,
 	&s3c_device_usb_hsotg,
+	&s3c64xx_device_ac97,
 	&s3c64xx_device_iisv4,
 
 #ifdef CONFIG_REGULATOR
@@ -652,6 +654,9 @@ static void __init smdk6410_machine_init(void)
 	i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0));
 	i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));
 
+	/* Board defualt with CFG2.1 off */
+	s3c64xx_ac97_setup_gpio(S3C64XX_AC97_GPD);
+
 	platform_add_devices(smdk6410_devices, ARRAY_SIZE(smdk6410_devices));
 }
 
-- 
1.7.0.3