Message ID | 20160810200853.24275-2-kbeldan@baylibre.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thursday 11 August 2016 01:38 AM, Karl Beldan wrote: > This is the minimal set of additional modules required to support audio > on the LCDK. > > Signed-off-by: Karl Beldan <kbeldan@baylibre.com> This patch does not apply because Kevin already added some missing audio modules through commit "ARM: davinci_all_defconfig: enable DA850 audio as modules" Can you please rebase on master branch of my tree[1] and resend? Regards, Sekhar [1] https://git.kernel.org/cgit/linux/kernel/git/nsekhar/linux-davinci.git/log/
On Wed, Aug 17, 2016 at 02:20:51PM +0530, Sekhar Nori wrote: > On Thursday 11 August 2016 01:38 AM, Karl Beldan wrote: > > This is the minimal set of additional modules required to support audio > > on the LCDK. > > > > Signed-off-by: Karl Beldan <kbeldan@baylibre.com> > > This patch does not apply because Kevin already added some missing audio > modules through commit "ARM: davinci_all_defconfig: enable DA850 audio > as modules" > > Can you please rebase on master branch of my tree[1] and resend? > I checked out your tree. With Kevin's patch the needed modules get selected without needing 2/2. However I don't know why he used: CONFIG_SND_DA850_SOC_EVM=m instead of: CONFIG_SND_DAVINCI_SOC_MCASP=m CONFIG_SND_SOC_TLV320AIC3X=m The former seems to me to be pre-DT style config. I used the latter in 2/2 and thought that's what we'd start switching to ? Unless it is for pre-DT compatibility ? Karl
On Wednesday 17 August 2016 03:43 PM, Karl Beldan wrote: > On Wed, Aug 17, 2016 at 02:20:51PM +0530, Sekhar Nori wrote: >> On Thursday 11 August 2016 01:38 AM, Karl Beldan wrote: >>> This is the minimal set of additional modules required to support audio >>> on the LCDK. >>> >>> Signed-off-by: Karl Beldan <kbeldan@baylibre.com> >> >> This patch does not apply because Kevin already added some missing audio >> modules through commit "ARM: davinci_all_defconfig: enable DA850 audio >> as modules" >> >> Can you please rebase on master branch of my tree[1] and resend? >> > > I checked out your tree. > With Kevin's patch the needed modules get selected without needing 2/2. > > However I don't know why he used: > CONFIG_SND_DA850_SOC_EVM=m > instead of: > CONFIG_SND_DAVINCI_SOC_MCASP=m > CONFIG_SND_SOC_TLV320AIC3X=m > The former seems to me to be pre-DT style config. I used the latter in > 2/2 and thought that's what we'd start switching to ? Unless it is for > pre-DT compatibility ? I don't think this is related to DT. As you said, CONFIG_SND_DA850_SOC_EVM selects CONFIG_SND_DAVINCI_SOC_MCASP and CONFIG_SND_SOC_TLV320AIC3X anyway. To be honest, I am okay either way. Copying Peter to see if he has any preference. Thanks, Sekhar
On Wed, Aug 17, 2016 at 04:08:03PM +0530, Sekhar Nori wrote: > On Wednesday 17 August 2016 03:43 PM, Karl Beldan wrote: > > On Wed, Aug 17, 2016 at 02:20:51PM +0530, Sekhar Nori wrote: > >> On Thursday 11 August 2016 01:38 AM, Karl Beldan wrote: > >>> This is the minimal set of additional modules required to support audio > >>> on the LCDK. > >>> > >>> Signed-off-by: Karl Beldan <kbeldan@baylibre.com> > >> > >> This patch does not apply because Kevin already added some missing audio > >> modules through commit "ARM: davinci_all_defconfig: enable DA850 audio > >> as modules" > >> > >> Can you please rebase on master branch of my tree[1] and resend? > >> > > > > I checked out your tree. > > With Kevin's patch the needed modules get selected without needing 2/2. > > > > However I don't know why he used: > > CONFIG_SND_DA850_SOC_EVM=m > > instead of: > > CONFIG_SND_DAVINCI_SOC_MCASP=m > > CONFIG_SND_SOC_TLV320AIC3X=m > > The former seems to me to be pre-DT style config. I used the latter in > > 2/2 and thought that's what we'd start switching to ? Unless it is for > > pre-DT compatibility ? > > I don't think this is related to DT. As you said, > CONFIG_SND_DA850_SOC_EVM selects CONFIG_SND_DAVINCI_SOC_MCASP and > CONFIG_SND_SOC_TLV320AIC3X anyway. > > To be honest, I am okay either way. Copying Peter to see if he has any > preference. > Ok, I dropped 2/2 in v2 which will rely on Kevin's change. Rgds, Karl
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 9980d1d..0357e39 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -128,6 +128,10 @@ CONFIG_LOGO=y CONFIG_SOUND=m CONFIG_SND=m CONFIG_SND_SOC=m +CONFIG_SND_EDMA_SOC=m +CONFIG_SND_DAVINCI_SOC_MCASP=m +CONFIG_SND_SOC_TLV320AIC3X=m +CONFIG_SND_SIMPLE_CARD=m CONFIG_HID=m CONFIG_HID_A4TECH=m CONFIG_HID_APPLE=m
This is the minimal set of additional modules required to support audio on the LCDK. Signed-off-by: Karl Beldan <kbeldan@baylibre.com> --- arch/arm/configs/davinci_all_defconfig | 4 ++++ 1 file changed, 4 insertions(+)