| Message ID | 8761tqsqs7.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | dd243c1d1826f4aecda1a7109c9506c8fdfbca35 |
| Headers | show |
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 > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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"
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(-)