[PATCH 1/2] ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SOUND_SOC

[PATCH 1/2] ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SOUND_SOC

[Uwe Kleine-König]

This fixes:
	warning: (MACH_HARMONY && MACH_KAEN && MACH_SEABOARD) selects MACH_HAS_SND_SOC_TEGRA_WM8903 which has unmet direct dependencies (SOUND && !M68K && SND && SND_SOC)

Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
 arch/arm/mach-tegra/Kconfig |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 5ec1846..33acbd9 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -27,14 +27,14 @@ comment "Tegra board type"
 
 config MACH_HARMONY
        bool "Harmony board"
-       select MACH_HAS_SND_SOC_TEGRA_WM8903
+       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SOUND_SOC
        help
          Support for nVidia Harmony development platform
 
 config MACH_KAEN
        bool "Kaen board"
        select MACH_SEABOARD
-       select MACH_HAS_SND_SOC_TEGRA_WM8903
+       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SOUND_SOC
        help
          Support for the Kaen version of Seaboard
 
@@ -45,7 +45,7 @@ config MACH_PAZ00
 
 config MACH_SEABOARD
        bool "Seaboard board"
-       select MACH_HAS_SND_SOC_TEGRA_WM8903
+       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SOUND_SOC
        help
          Support for nVidia Seaboard development platform. It will
 	 also be included for some of the derivative boards that
-- 
1.7.5.4

[PATCH 2/2] ARM: tegra: enable rtc driver in defconfig

[Uwe Kleine-König]

Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
 arch/arm/configs/tegra_defconfig |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 8845f1c..d87631f 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -98,6 +98,8 @@ CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_TEGRA=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_TEGRA=m
 CONFIG_STAGING=y
 # CONFIG_STAGING_EXCLUDE_BUILD is not set
 CONFIG_IIO=y
-- 
1.7.5.4

[PATCH 1/2] ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SOUND_SOC

[Stephen Warren]

Uwe Kleine-K?nig wrote at Monday, July 25, 2011 9:48 AM:
> This fixes:
> 	warning: (MACH_HARMONY && MACH_KAEN && MACH_SEABOARD) selects MACH_HAS_SND_SOC_TEGRA_WM8903
> which has unmet direct dependencies (SOUND && !M68K && SND && SND_SOC)

> diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
...
>  config MACH_HARMONY
>         bool "Harmony board"
> -       select MACH_HAS_SND_SOC_TEGRA_WM8903
> +       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SOUND_SOC

Shouldn't that be SND_SOC?

-- 
nvpublic

[PATCH 1/2] ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SOUND_SOC

[Uwe Kleine-König]

On Mon, Jul 25, 2011 at 09:14:49AM -0700, Stephen Warren wrote:
> Uwe Kleine-K?nig wrote at Monday, July 25, 2011 9:48 AM:
> > This fixes:
> > 	warning: (MACH_HARMONY && MACH_KAEN && MACH_SEABOARD) selects MACH_HAS_SND_SOC_TEGRA_WM8903
> > which has unmet direct dependencies (SOUND && !M68K && SND && SND_SOC)
> 
> > diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
> ...
> >  config MACH_HARMONY
> >         bool "Harmony board"
> > -       select MACH_HAS_SND_SOC_TEGRA_WM8903
> > +       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SOUND_SOC
> 
> Shouldn't that be SND_SOC?
Hmm, with SOUND_SOC the warning is gone, too :-)

Yeah, will send a fixed patch tomorrow.

Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[PATCH v2] ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC

[Uwe Kleine-König]

This fixes:
	warning: (MACH_HARMONY && MACH_KAEN && MACH_SEABOARD) selects MACH_HAS_SND_SOC_TEGRA_WM8903 which has unmet direct dependencies (SOUND && !M68K && SND && SND_SOC)

Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
Changes since (implicit) v1:
 - correctly depend on SND_SOC instead of the non-existent SOUND_SOC
 - fix commit log accordingly

Thanks to Stephen Warren for noticing.

Best regards
Uwe

 arch/arm/mach-tegra/Kconfig |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 5ec1846..fec64f3 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -27,14 +27,14 @@ comment "Tegra board type"
 
 config MACH_HARMONY
        bool "Harmony board"
-       select MACH_HAS_SND_SOC_TEGRA_WM8903
+       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
        help
          Support for nVidia Harmony development platform
 
 config MACH_KAEN
        bool "Kaen board"
        select MACH_SEABOARD
-       select MACH_HAS_SND_SOC_TEGRA_WM8903
+       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
        help
          Support for the Kaen version of Seaboard
 
@@ -45,7 +45,7 @@ config MACH_PAZ00
 
 config MACH_SEABOARD
        bool "Seaboard board"
-       select MACH_HAS_SND_SOC_TEGRA_WM8903
+       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
        help
          Support for nVidia Seaboard development platform. It will
 	 also be included for some of the derivative boards that
-- 
1.7.5.4

[PATCH v2] ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC

[Stephen Warren]

Uwe Kleine-K?nig wrote at Tuesday, July 26, 2011 2:16 AM:
> This fixes:
> 	warning: (MACH_HARMONY && MACH_KAEN && MACH_SEABOARD) selects MACH_HAS_SND_SOC_TEGRA_WM8903
> which has unmet direct dependencies (SOUND && !M68K && SND && SND_SOC)
> 
> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>

Acked-by: Stephen Warren <swarren@nvidia.com>

(I'm also CC'ing the various maintainers explicitly, so they see the patch,
and can decide which git tree to take this through)

> ---
> Changes since (implicit) v1:
>  - correctly depend on SND_SOC instead of the non-existent SOUND_SOC
>  - fix commit log accordingly
> 
> Thanks to Stephen Warren for noticing.
> 
> Best regards
> Uwe
> 
>  arch/arm/mach-tegra/Kconfig |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
> index 5ec1846..fec64f3 100644
> --- a/arch/arm/mach-tegra/Kconfig
> +++ b/arch/arm/mach-tegra/Kconfig
> @@ -27,14 +27,14 @@ comment "Tegra board type"
> 
>  config MACH_HARMONY
>         bool "Harmony board"
> -       select MACH_HAS_SND_SOC_TEGRA_WM8903
> +       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
>         help
>           Support for nVidia Harmony development platform
> 
>  config MACH_KAEN
>         bool "Kaen board"
>         select MACH_SEABOARD
> -       select MACH_HAS_SND_SOC_TEGRA_WM8903
> +       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
>         help
>           Support for the Kaen version of Seaboard
> 
> @@ -45,7 +45,7 @@ config MACH_PAZ00
> 
>  config MACH_SEABOARD
>         bool "Seaboard board"
> -       select MACH_HAS_SND_SOC_TEGRA_WM8903
> +       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
>         help
>           Support for nVidia Seaboard development platform. It will
>  	 also be included for some of the derivative boards that
> --
> 1.7.5.4

-- 
nvpublic

[PATCH v2] ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC

[Colin Cross]

On Tue, Jul 26, 2011 at 8:48 AM, Stephen Warren <swarren@nvidia.com> wrote:
> Uwe Kleine-K?nig wrote at Tuesday, July 26, 2011 2:16 AM:
>> This fixes:
>> ? ? ? warning: (MACH_HARMONY && MACH_KAEN && MACH_SEABOARD) selects MACH_HAS_SND_SOC_TEGRA_WM8903
>> which has unmet direct dependencies (SOUND && !M68K && SND && SND_SOC)
>>
>> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
>
> Acked-by: Stephen Warren <swarren@nvidia.com>
>
> (I'm also CC'ing the various maintainers explicitly, so they see the patch,
> and can decide which git tree to take this through)

Acked-By: Colin Cross <ccross@android.com>

Arnd, can you take this?

>> ---
>> Changes since (implicit) v1:
>> ?- correctly depend on SND_SOC instead of the non-existent SOUND_SOC
>> ?- fix commit log accordingly
>>
>> Thanks to Stephen Warren for noticing.
>>
>> Best regards
>> Uwe
>>
>> ?arch/arm/mach-tegra/Kconfig | ? ?6 +++---
>> ?1 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
>> index 5ec1846..fec64f3 100644
>> --- a/arch/arm/mach-tegra/Kconfig
>> +++ b/arch/arm/mach-tegra/Kconfig
>> @@ -27,14 +27,14 @@ comment "Tegra board type"
>>
>> ?config MACH_HARMONY
>> ? ? ? ? bool "Harmony board"
>> - ? ? ? select MACH_HAS_SND_SOC_TEGRA_WM8903
>> + ? ? ? select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
>> ? ? ? ? help
>> ? ? ? ? ? Support for nVidia Harmony development platform
>>
>> ?config MACH_KAEN
>> ? ? ? ? bool "Kaen board"
>> ? ? ? ? select MACH_SEABOARD
>> - ? ? ? select MACH_HAS_SND_SOC_TEGRA_WM8903
>> + ? ? ? select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
>> ? ? ? ? help
>> ? ? ? ? ? Support for the Kaen version of Seaboard
>>
>> @@ -45,7 +45,7 @@ config MACH_PAZ00
>>
>> ?config MACH_SEABOARD
>> ? ? ? ? bool "Seaboard board"
>> - ? ? ? select MACH_HAS_SND_SOC_TEGRA_WM8903
>> + ? ? ? select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
>> ? ? ? ? help
>> ? ? ? ? ? Support for nVidia Seaboard development platform. It will
>> ? ? ? ?also be included for some of the derivative boards that
>> --
>> 1.7.5.4
>
> --
> nvpublic
>
>

[PATCH v2] ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC

[Arnd Bergmann]

On Wednesday 27 July 2011, Colin Cross wrote:
> >> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> >
> > Acked-by: Stephen Warren <swarren@nvidia.com>
> 
> Acked-By: Colin Cross <ccross@android.com>
> 
> Arnd, can you take this?
> 

Applied to 'fixes' branch, thanks everyone!

	Arnd

[PATCH v2] ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC

[Uwe Kleine-König]

Hello Arnd,

On Wed, Jul 27, 2011 at 05:11:04PM +0200, Arnd Bergmann wrote:
> Applied to 'fixes' branch, thanks everyone!
Would you care to take the other patch in this series, too?
(http://thread.gmane.org/gmane.linux.ports.tegra/1138/focus=1139)

Thanks
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[PATCH v2] ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC

[Arnd Bergmann]

On Wednesday 27 July 2011, Uwe Kleine-K?nig wrote:
> On Wed, Jul 27, 2011 at 05:11:04PM +0200, Arnd Bergmann wrote:
> > Applied to 'fixes' branch, thanks everyone!
> Would you care to take the other patch in this series, too?
> (http://thread.gmane.org/gmane.linux.ports.tegra/1138/focus=1139)

That does not look like a bug fix to me. I don't mind the patch,
but I see no reason to apply it at this point, or to the 'fixes'
branch.

I'll wait for Colin to accumulate more patches and then pull those
from him into a tegra specific branch for 3.2, ok? If Colin wants
to have it 3.1, I can pull it into the fixes branch after -rc1.

	Arnd