SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
all references for it from the source code.
Signed-off-by: Christoph Egger <[email protected]>
---
arch/arm/mach-s3c2443/mach-smdk2443.c | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-s3c2443/mach-smdk2443.c b/arch/arm/mach-s3c2443/mach-smdk2443.c
index 4c863d3..47414c9 100644
--- a/arch/arm/mach-s3c2443/mach-smdk2443.c
+++ b/arch/arm/mach-s3c2443/mach-smdk2443.c
@@ -106,9 +106,6 @@ static struct platform_device *smdk2443_devices[] __initdata = {
&s3c_device_wdt,
&s3c_device_i2c0,
&s3c_device_hsmmc0,
-#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
- &s3c_device_ac97,
-#endif
};
static void __init smdk2443_map_io(void)
@@ -122,10 +119,6 @@ static void __init smdk2443_machine_init(void)
{
s3c_i2c0_set_platdata(NULL);
-#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
- s3c24xx_ac97_setup_gpio(S3C24XX_AC97_GPE0);
-#endif
-
platform_add_devices(smdk2443_devices, ARRAY_SIZE(smdk2443_devices));
smdk_machine_init();
}
--
1.7.0.4
On Thu, Jul 1, 2010 at 1:03 AM, Christoph Egger <[email protected]> wrote:
> SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
> all references for it from the source code.
I'd rather have the code compiled unconditionally.
On Thu, Jul 01, 2010 at 09:55:47PM +0900, Jassi Brar wrote:
> On Thu, Jul 1, 2010 at 1:03 AM, Christoph Egger <[email protected]> wrote:
> > SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
> > all references for it from the source code.
> I'd rather have the code compiled unconditionally.
Hrm, if this is part of the default hardware build we should get the
driver merged.
On Thu, Jul 01, 2010 at 09:55:47PM +0900, Jassi Brar wrote:
> On Thu, Jul 1, 2010 at 1:03 AM, Christoph Egger <[email protected]> wrote:
> > SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
> > all references for it from the source code.
> I'd rather have the code compiled unconditionally.
OK that would be done by the patch below
----
From: Christoph Egger <[email protected]>
Date: Wed, 30 Jun 2010 17:18:52 +0200
Subject: [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
all references for it from the source code, building the parts
unconditionally
Signed-off-by: Christoph Egger <[email protected]>
---
arch/arm/mach-s3c2443/mach-smdk2443.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-s3c2443/mach-smdk2443.c b/arch/arm/mach-s3c2443/mach-smdk2443.c
index 4c863d3..764144a 100644
--- a/arch/arm/mach-s3c2443/mach-smdk2443.c
+++ b/arch/arm/mach-s3c2443/mach-smdk2443.c
@@ -106,9 +106,7 @@ static struct platform_device *smdk2443_devices[] __initdata = {
&s3c_device_wdt,
&s3c_device_i2c0,
&s3c_device_hsmmc0,
-#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
&s3c_device_ac97,
-#endif
};
static void __init smdk2443_map_io(void)
@@ -122,9 +120,7 @@ static void __init smdk2443_machine_init(void)
{
s3c_i2c0_set_platdata(NULL);
-#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
s3c24xx_ac97_setup_gpio(S3C24XX_AC97_GPE0);
-#endif
platform_add_devices(smdk2443_devices, ARRAY_SIZE(smdk2443_devices));
smdk_machine_init();
--
1.7.0.4
On Thu, Jul 1, 2010 at 10:07 PM, Mark Brown
<[email protected]> wrote:
> On Thu, Jul 01, 2010 at 09:55:47PM +0900, Jassi Brar wrote:
>> On Thu, Jul 1, 2010 at 1:03 AM, Christoph Egger <[email protected]> wrote:
>> > SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
>> > all references for it from the source code.
>
>> I'd rather have the code compiled unconditionally.
>
> Hrm, if this is part of the default hardware build we should get the
> driver merged.
But the machine driver is already there
sound/soc/s3c24xx/smdk2443_wm9710.c
On Thu, Jul 1, 2010 at 10:25 PM, Christoph Egger <[email protected]> wrote:
> On Thu, Jul 01, 2010 at 09:55:47PM +0900, Jassi Brar wrote:
>> On Thu, Jul 1, 2010 at 1:03 AM, Christoph Egger <[email protected]> wrote:
>> > SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
>> > all references for it from the source code.
>> I'd rather have the code compiled unconditionally.
>
> OK that would be done by the patch below
>
> ----
> From: Christoph Egger <[email protected]>
> Date: Wed, 30 Jun 2010 17:18:52 +0200
> Subject: [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
>
> SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
> all references for it from the source code, building the parts
> unconditionally
>
> Signed-off-by: Christoph Egger <[email protected]>
> ---
> arch/arm/mach-s3c2443/mach-smdk2443.c | 4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-s3c2443/mach-smdk2443.c b/arch/arm/mach-s3c2443/mach-smdk2443.c
> index 4c863d3..764144a 100644
> --- a/arch/arm/mach-s3c2443/mach-smdk2443.c
> +++ b/arch/arm/mach-s3c2443/mach-smdk2443.c
> @@ -106,9 +106,7 @@ static struct platform_device *smdk2443_devices[] __initdata = {
> &s3c_device_wdt,
> &s3c_device_i2c0,
> &s3c_device_hsmmc0,
> -#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
> &s3c_device_ac97,
> -#endif
This is ok provided 2440 support is included.
> };
>
> static void __init smdk2443_map_io(void)
> @@ -122,9 +120,7 @@ static void __init smdk2443_machine_init(void)
> {
> s3c_i2c0_set_platdata(NULL);
>
> -#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
> s3c24xx_ac97_setup_gpio(S3C24XX_AC97_GPE0);
> -#endif
This gpio setup is nowhere implemented. So might as well discard it.
On Fri, Jul 02, 2010 at 04:08:56PM +0900, Jassi Brar wrote:
> On Thu, Jul 1, 2010 at 10:07 PM, Mark Brown
> > Hrm, if this is part of the default hardware build we should get the
> > driver merged.
> But the machine driver is already there
> sound/soc/s3c24xx/smdk2443_wm9710.c
Oh, right. I was just assuming that it wasn't there since the symbol
isn't defined in mainline, I hadn't actually looked.