| Message ID | 20211002211459.110124-1-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d316597c538abd110ff32761fc79f7adff8d619a |
| Headers | show |
| Series | [1/4] ASoC: nau8824: Fix NAU8824_JACK_LOGIC define | expand |
On 10/2/21 4:14 PM, Hans de Goede wrote: > The NAU8824_JACK_LOGIC define was wrong, for active high jack-detect > to work bit 1 needs to be set, rather then bit 0. > > The correct bit was found in the Android kernel source dump for > a Cyberbook T116 tablet; and this was also tested on that same tablet. For the series Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > sound/soc/codecs/nau8824.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/codecs/nau8824.h b/sound/soc/codecs/nau8824.h > index 1d7bdd8e0523..6e61405f623b 100644 > --- a/sound/soc/codecs/nau8824.h > +++ b/sound/soc/codecs/nau8824.h > @@ -197,7 +197,7 @@ > /* JACK_DET_CTRL (0x0D) */ > #define NAU8824_JACK_EJECT_DT_SFT 2 > #define NAU8824_JACK_EJECT_DT_MASK (0x3 << NAU8824_JACK_EJECT_DT_SFT) > -#define NAU8824_JACK_LOGIC 0x1 > +#define NAU8824_JACK_LOGIC (0x1 << 1) > > > /* INTERRUPT_SETTING_1 (0x0F) */ >
On Sat, 2 Oct 2021 23:14:56 +0200, Hans de Goede wrote: > The NAU8824_JACK_LOGIC define was wrong, for active high jack-detect > to work bit 1 needs to be set, rather then bit 0. > > The correct bit was found in the Android kernel source dump for > a Cyberbook T116 tablet; and this was also tested on that same tablet. > > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/4] ASoC: nau8824: Fix NAU8824_JACK_LOGIC define commit: d316597c538abd110ff32761fc79f7adff8d619a [2/4] ASoC: nau8824: Add DMI quirk mechanism for active-high jack-detect commit: 92d3360108f1839ca40451bad20ff67dd24a1964 [3/4] ASoC: nau8824: Add a nau8824_components() helper commit: efee0fca19cbc9a0946a2d7dab2d5546aee2098f [4/4] ASoC: Intel: cht_bsw_nau8824: Set card.components string commit: 7924f1bc94041a3d512f2922065b196ca8e1210e All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/codecs/nau8824.h b/sound/soc/codecs/nau8824.h index 1d7bdd8e0523..6e61405f623b 100644 --- a/sound/soc/codecs/nau8824.h +++ b/sound/soc/codecs/nau8824.h @@ -197,7 +197,7 @@ /* JACK_DET_CTRL (0x0D) */ #define NAU8824_JACK_EJECT_DT_SFT 2 #define NAU8824_JACK_EJECT_DT_MASK (0x3 << NAU8824_JACK_EJECT_DT_SFT) -#define NAU8824_JACK_LOGIC 0x1 +#define NAU8824_JACK_LOGIC (0x1 << 1) /* INTERRUPT_SETTING_1 (0x0F) */
The NAU8824_JACK_LOGIC define was wrong, for active high jack-detect to work bit 1 needs to be set, rather then bit 0. The correct bit was found in the Android kernel source dump for a Cyberbook T116 tablet; and this was also tested on that same tablet. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- sound/soc/codecs/nau8824.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)