* [PATCH] ARM: shmobile: bockw: tidyup select SND_SOC_xxx on Kconfig
@ 2013-09-24 6:00 Kuninori Morimoto
2013-09-24 6:19 ` Simon Horman
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Kuninori Morimoto @ 2013-09-24 6:00 UTC (permalink / raw)
To: linux-sh
bf622b33d6fd40f720430ec2fe3c62a8aee19ee8
(ARM: shmobile: bockw: add R-Car sound support (PIO))
added R-Car sound support on Bock-W, but the Kconfig
file had comflict.
The necessary settings (select SND_SOC_xxx) was added
on MACH_KZM9D, but it was needed on MACH_BOCKW.
This patch fixes it up.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
Simon
This patch is based on renesas-devel-20130922 tag
arch/arm/mach-shmobile/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 50bab8d..eda2857 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -168,6 +168,8 @@ config MACH_BOCKW
select RENESAS_INTC_IRQPIN
select REGULATOR_FIXED_VOLTAGE if REGULATOR
select USE_OF
+ select SND_SOC_AK4554 if SND_SIMPLE_CARD
+ select SND_SOC_AK4642 if SND_SIMPLE_CARD
config MACH_BOCKW_REFERENCE
bool "BOCK-W - Reference Device Tree Implementation"
@@ -229,8 +231,6 @@ config MACH_KZM9D
depends on ARCH_EMEV2
select REGULATOR_FIXED_VOLTAGE if REGULATOR
select USE_OF
- select SND_SOC_AK4554 if SND_SIMPLE_CARD
- select SND_SOC_AK4642 if SND_SIMPLE_CARD
config MACH_KZM9D_REFERENCE
bool "KZM9D board - Reference Device Tree Implementation"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: shmobile: bockw: tidyup select SND_SOC_xxx on Kconfig
2013-09-24 6:00 [PATCH] ARM: shmobile: bockw: tidyup select SND_SOC_xxx on Kconfig Kuninori Morimoto
@ 2013-09-24 6:19 ` Simon Horman
2013-09-24 6:25 ` Kuninori Morimoto
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2013-09-24 6:19 UTC (permalink / raw)
To: linux-sh
On Mon, Sep 23, 2013 at 11:00:16PM -0700, Kuninori Morimoto wrote:
> bf622b33d6fd40f720430ec2fe3c62a8aee19ee8
> (ARM: shmobile: bockw: add R-Car sound support (PIO))
> added R-Car sound support on Bock-W, but the Kconfig
> file had comflict.
> The necessary settings (select SND_SOC_xxx) was added
> on MACH_KZM9D, but it was needed on MACH_BOCKW.
> This patch fixes it up.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> Simon
>
> This patch is based on renesas-devel-20130922 tag
Hi Morimoto-san,
is this a fix for v3.12?
> arch/arm/mach-shmobile/Kconfig | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
> index 50bab8d..eda2857 100644
> --- a/arch/arm/mach-shmobile/Kconfig
> +++ b/arch/arm/mach-shmobile/Kconfig
> @@ -168,6 +168,8 @@ config MACH_BOCKW
> select RENESAS_INTC_IRQPIN
> select REGULATOR_FIXED_VOLTAGE if REGULATOR
> select USE_OF
> + select SND_SOC_AK4554 if SND_SIMPLE_CARD
> + select SND_SOC_AK4642 if SND_SIMPLE_CARD
>
> config MACH_BOCKW_REFERENCE
> bool "BOCK-W - Reference Device Tree Implementation"
> @@ -229,8 +231,6 @@ config MACH_KZM9D
> depends on ARCH_EMEV2
> select REGULATOR_FIXED_VOLTAGE if REGULATOR
> select USE_OF
> - select SND_SOC_AK4554 if SND_SIMPLE_CARD
> - select SND_SOC_AK4642 if SND_SIMPLE_CARD
>
> config MACH_KZM9D_REFERENCE
> bool "KZM9D board - Reference Device Tree Implementation"
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: shmobile: bockw: tidyup select SND_SOC_xxx on Kconfig
2013-09-24 6:00 [PATCH] ARM: shmobile: bockw: tidyup select SND_SOC_xxx on Kconfig Kuninori Morimoto
2013-09-24 6:19 ` Simon Horman
@ 2013-09-24 6:25 ` Kuninori Morimoto
2013-09-24 7:34 ` Simon Horman
2013-09-24 8:05 ` Kuninori Morimoto
3 siblings, 0 replies; 5+ messages in thread
From: Kuninori Morimoto @ 2013-09-24 6:25 UTC (permalink / raw)
To: linux-sh
Hi Simon
> > bf622b33d6fd40f720430ec2fe3c62a8aee19ee8
> > (ARM: shmobile: bockw: add R-Car sound support (PIO))
> > added R-Car sound support on Bock-W, but the Kconfig
> > file had comflict.
> > The necessary settings (select SND_SOC_xxx) was added
> > on MACH_KZM9D, but it was needed on MACH_BOCKW.
> > This patch fixes it up.
> >
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > ---
> > Simon
> >
> > This patch is based on renesas-devel-20130922 tag
>
> Hi Morimoto-san,
>
> is this a fix for v3.12?
Yes, Bock-W can't use sound without this patch
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: shmobile: bockw: tidyup select SND_SOC_xxx on Kconfig
2013-09-24 6:00 [PATCH] ARM: shmobile: bockw: tidyup select SND_SOC_xxx on Kconfig Kuninori Morimoto
2013-09-24 6:19 ` Simon Horman
2013-09-24 6:25 ` Kuninori Morimoto
@ 2013-09-24 7:34 ` Simon Horman
2013-09-24 8:05 ` Kuninori Morimoto
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2013-09-24 7:34 UTC (permalink / raw)
To: linux-sh
On Mon, Sep 23, 2013 at 11:25:03PM -0700, Kuninori Morimoto wrote:
>
> Hi Simon
>
> > > bf622b33d6fd40f720430ec2fe3c62a8aee19ee8
> > > (ARM: shmobile: bockw: add R-Car sound support (PIO))
> > > added R-Car sound support on Bock-W, but the Kconfig
> > > file had comflict.
> > > The necessary settings (select SND_SOC_xxx) was added
> > > on MACH_KZM9D, but it was needed on MACH_BOCKW.
> > > This patch fixes it up.
> > >
> > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > > ---
> > > Simon
> > >
> > > This patch is based on renesas-devel-20130922 tag
> >
> > Hi Morimoto-san,
> >
> > is this a fix for v3.12?
>
> Yes, Bock-W can't use sound without this patch
Hi Morimoto-san,
I looked a little closer and it seems that
bf622b33d6fd40f720430ec2fe3c62a8aee19ee8 is queued up for v3.13
rather than v3.12. (i.e. its not present in v3.12-rc1).
With this in mind I will queue up this patch for v3.13.
This will most likely occur tomorrow.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: shmobile: bockw: tidyup select SND_SOC_xxx on Kconfig
2013-09-24 6:00 [PATCH] ARM: shmobile: bockw: tidyup select SND_SOC_xxx on Kconfig Kuninori Morimoto
` (2 preceding siblings ...)
2013-09-24 7:34 ` Simon Horman
@ 2013-09-24 8:05 ` Kuninori Morimoto
3 siblings, 0 replies; 5+ messages in thread
From: Kuninori Morimoto @ 2013-09-24 8:05 UTC (permalink / raw)
To: linux-sh
Hi Simon
> > > is this a fix for v3.12?
> >
> > Yes, Bock-W can't use sound without this patch
>
> Hi Morimoto-san,
>
> I looked a little closer and it seems that
> bf622b33d6fd40f720430ec2fe3c62a8aee19ee8 is queued up for v3.13
> rather than v3.12. (i.e. its not present in v3.12-rc1).
>
> With this in mind I will queue up this patch for v3.13.
> This will most likely occur tomorrow.
Oops, sorry, yes, it was v3.13 fixup
Thank you for your help
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-09-24 8:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-24 6:00 [PATCH] ARM: shmobile: bockw: tidyup select SND_SOC_xxx on Kconfig Kuninori Morimoto
2013-09-24 6:19 ` Simon Horman
2013-09-24 6:25 ` Kuninori Morimoto
2013-09-24 7:34 ` Simon Horman
2013-09-24 8:05 ` Kuninori Morimoto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox