Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753186AbbLKCqF (ORCPT ); Thu, 10 Dec 2015 21:46:05 -0500 Received: from smtp.csie.ntu.edu.tw ([140.112.30.61]:51724 "EHLO smtp.csie.ntu.edu.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752093AbbLKCqD (ORCPT ); Thu, 10 Dec 2015 21:46:03 -0500 MIME-Version: 1.0 In-Reply-To: <20151210215227.6453acc8@dayas> References: <20151208042013.11d31f09@dayas> <20151210175420.GH27957@lukather> <20151210215227.6453acc8@dayas> From: Chen-Yu Tsai Date: Fri, 11 Dec 2015 10:45:37 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v5] sun4i-codec: add inputs To: Danny Milosavljevic Cc: Maxime Ripard , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Chen-Yu Tsai , alsa-devel@alsa-project.org, linux-arm-kernel , linux-kernel Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2542 Lines: 73 On Fri, Dec 11, 2015 at 4:52 AM, Danny Milosavljevic wrote: > Hi Maxime, > > On Thu, 10 Dec 2015 18:54:20 +0100 > Maxime Ripard wrote: >> > + SOC_DAPM_SINGLE("Mic1-In Playback Switch", SUN4I_CODEC_DAC_ACTL, >> > + SUN4I_CODEC_DAC_ACTL_MIC1RS, 1, 0), >> > + SOC_DAPM_SINGLE("Mic2-In Playback Switch", SUN4I_CODEC_DAC_ACTL, >> > + SUN4I_CODEC_DAC_ACTL_MIC2RS, 1, 0), >> > }; >> >> Do we need the -In part of FM, Mic1 and Mic2? > > For consistency to what's in linux-sunxi.git, I will remove the "-In" from > the Mic names in v7. > > For FM, do we? I don't know. Are there ALSA devices which output to FM? > >> Mic1 is already defined a few lines above. >> And you have the Mixers routes a bit above too. > > Aha, Mic1 is there in > branch "sunxi-next". > In > branch "sunxi/for-next", it's not there. > This patch is for the latter. linux-sunxi/sunxi-next is a branch we maintain that has "most" new features and patches aimed at the next release. It is not an official kernel branch, nor is it always up to date (though we try to merge new things in). mripard/linux sunxi/for-next is Maxime's sunxi branches, which is mostly clock and dts patches. You should always base your patches on the "next" branch of the maintainer that will take your patches. In this case, ASoC: https://git.kernel.org/cgit/linux/kernel/git/broonie/sound.git/log/?h=for-next There's also a sunxi topic branch: https://git.kernel.org/cgit/linux/kernel/git/broonie/sound.git/log/?h=topic/sunxi Or you can just base them off linux-next. Regards ChenYu > > I'm currently rebasing on the former, but it will take some time. > The differences between these driver versions are: > - Mic1 Preamplifier is registered as PGA instead of switch in the former. > - Mic1 is already an input in the former. > - VMIC is handled in the former. > - ADC Capturing support exists in the former. > That's it. > > I'll retest a patch based on the former... > >> [global mutation] >> We'll need to fix that, see the other discussion. > > Yeah, I think I found a nicer way to do it in v6. > > Thanks, > Danny -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/