| Message ID | 20181202122122.17808-1-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 984bfb398a3af6fa9b7e80165e524933b0616686 |
| Headers | show |
| Series | ASoC: intel: cht_bsw_max98090_ti: Add pmc_plt_clk_0 quirk for Chromebook Clapper | expand |
On 12/2/18 6:21 AM, Hans de Goede wrote: > The Clapper model Chromebook uses pmc_plt_clk_0 instead of pmc_plt_clk_3 > for the mclk, just like the Swanky model. > > This commit adds a DMI based quirk for this. > > This fixing audio no longer working on these devices after > commit 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL") > that commit fixes us unnecessary keeping unused clocks on, but in case of > the Clapper that was breaking audio support since we were not using the > right clock in the cht_bsw_max98090_ti machine driver. > > Cc: stable@vger.kernel.org > Fixes: 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL") > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > sound/soc/intel/boards/cht_bsw_max98090_ti.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c > index 9d9f6e41d81c..ad0c98383853 100644 > --- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c > +++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c > @@ -389,6 +389,13 @@ static struct snd_soc_card snd_soc_card_cht = { > }; > > static const struct dmi_system_id cht_max98090_quirk_table[] = { > + { > + /* Clapper model Chromebook */ > + .matches = { > + DMI_MATCH(DMI_PRODUCT_NAME, "Clapper"), > + }, > + .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > + }, > { > /* Swanky model Chromebook (Toshiba Chromebook 2) */ > .matches = {
diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c index 9d9f6e41d81c..ad0c98383853 100644 --- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c +++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c @@ -389,6 +389,13 @@ static struct snd_soc_card snd_soc_card_cht = { }; static const struct dmi_system_id cht_max98090_quirk_table[] = { + { + /* Clapper model Chromebook */ + .matches = { + DMI_MATCH(DMI_PRODUCT_NAME, "Clapper"), + }, + .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, + }, { /* Swanky model Chromebook (Toshiba Chromebook 2) */ .matches = {
The Clapper model Chromebook uses pmc_plt_clk_0 instead of pmc_plt_clk_3 for the mclk, just like the Swanky model. This commit adds a DMI based quirk for this. This fixing audio no longer working on these devices after commit 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL") that commit fixes us unnecessary keeping unused clocks on, but in case of the Clapper that was breaking audio support since we were not using the right clock in the cht_bsw_max98090_ti machine driver. Cc: stable@vger.kernel.org Fixes: 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL") Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 7 +++++++ 1 file changed, 7 insertions(+)