| Message ID | 29ad0cbd-b58d-70e3-0647-a2d633b7e57e@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Aug 31, 2017 at 07:04:31AM +1000, Ian W MORRISON wrote:
> v2: Applied and tested again sound -b for-next and linux-next -b master
You're submitting this to me, it needs to apply to *my* tree:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
On 31 August 2017 at 07:12, Mark Brown <broonie@kernel.org> wrote: > On Thu, Aug 31, 2017 at 07:04:31AM +1000, Ian W MORRISON wrote: > >> v2: Applied and tested again sound -b for-next and linux-next -b master > > You're submitting this to me, it needs to apply to *my* tree: > > git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git Yes, v2 is now applied and tested against your git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git using branch for-next. Is that correct or should I use a different branch?
On Thu, Aug 31, 2017 at 07:16:10AM +1000, Ian W MORRISON wrote: > On 31 August 2017 at 07:12, Mark Brown <broonie@kernel.org> wrote: > > On Thu, Aug 31, 2017 at 07:04:31AM +1000, Ian W MORRISON wrote: > >> v2: Applied and tested again sound -b for-next and linux-next -b master > > You're submitting this to me, it needs to apply to *my* tree: > > git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git > Yes, v2 is now applied and tested against your > git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git using > branch for-next. Is that correct or should I use a different branch? Are you sure you're up to date there? It didn't apply against either the rt5645 branch or my for-next branch, I applied a few Realtek patches earlier today.
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index cd82302..6a7778a 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3655,6 +3655,21 @@ static int rt5645_resume(struct snd_soc_codec *codec) { } }; +static struct rt5645_platform_data minix_z83_4_platform_data = { + .jd_mode = 3, +}; + +static struct dmi_system_id dmi_platform_minix_z83_4[] = { + { + .ident = "MINIX Z83-4", + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "MINIX"), + DMI_MATCH(DMI_PRODUCT_NAME, "Z83-4"), + }, + }, + { } +}; + static bool rt5645_check_dp(struct device *dev) { if (device_property_present(dev, "realtek,in2-differential") || @@ -3709,6 +3724,8 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, rt5645->pdata = gpd_win_platform_data; else if (dmi_check_system(dmi_platform_asus_t100ha)) rt5645->pdata = general_platform_data2; + else if (dmi_check_system(dmi_platform_minix_z83_4)) + rt5645->pdata = minix_z83_4_platform_data; if (quirk != -1) { rt5645->pdata.in2_diff = QUIRK_IN2_DIFF(quirk);
The MINIX NEO Z83-4 and MINIX NEO Z83-4 Pro devices requires jd_mode=3 to make the jack detection work. Using a BIOS DMI product of "Z83-4" will match both devices of 'NEO Z83-4' and 'Z83-4 Pro'. Signed-off-by: Ian W Morrison <ianwmorrison@gmail.com> --- v2: Applied and tested again sound -b for-next and linux-next -b master v1: Applied and tested again linux -b master --- sound/soc/codecs/rt5645.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)