--- /dev/null
+From 984bfb398a3af6fa9b7e80165e524933b0616686 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Sun, 2 Dec 2018 13:21:22 +0100
+Subject: ASoC: intel: cht_bsw_max98090_ti: Add pmc_plt_clk_0 quirk for Chromebook Clapper
+
+From: Hans de Goede <hdegoede@redhat.com>
+
+commit 984bfb398a3af6fa9b7e80165e524933b0616686 upstream.
+
+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>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c
++++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
+@@ -390,6 +390,13 @@ static struct snd_soc_card snd_soc_card_
+
+ 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 = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "Swanky"),
--- /dev/null
+From 94ea56cff506c769a509c5dd87904c7fe3806a81 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Mon, 3 Dec 2018 21:45:14 +0100
+Subject: ASoC: intel: cht_bsw_max98090_ti: Add pmc_plt_clk_0 quirk for Chromebook Gnawty
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Hans de Goede <hdegoede@redhat.com>
+
+commit 94ea56cff506c769a509c5dd87904c7fe3806a81 upstream.
+
+The Gnawty model Chromebook uses pmc_plt_clk_0 instead of pmc_plt_clk_3
+for the mclk, just like the Clapper and Swanky models.
+
+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 Gnawty that was breaking audio support since we were not using the
+right clock in the cht_bsw_max98090_ti machine driver.
+
+BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=201787
+Cc: stable@vger.kernel.org
+Fixes: 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL")
+Reported-and-tested-by: Jaime Pérez <19.jaime.91@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c
++++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
+@@ -397,6 +397,13 @@ static const struct dmi_system_id cht_ma
+ .driver_data = (void *)QUIRK_PMC_PLT_CLK_0,
+ },
+ {
++ /* Gnawty model Chromebook (Acer Chromebook CB3-111) */
++ .matches = {
++ DMI_MATCH(DMI_PRODUCT_NAME, "Gnawty"),
++ },
++ .driver_data = (void *)QUIRK_PMC_PLT_CLK_0,
++ },
++ {
+ /* Swanky model Chromebook (Toshiba Chromebook 2) */
+ .matches = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "Swanky"),
revert-usb-dwc3-pci-use-devm-functions-to-get-the-phy-gpios.patch
usb-roles-add-a-description-for-the-class-to-kconfig.patch
media-dvb-usb-v2-fix-incorrect-use-of-transfer_flags-urb_free_buffer.patch
+staging-wilc1000-fix-missing-read_write-setting-when-reading-data.patch
+asoc-intel-cht_bsw_max98090_ti-add-pmc_plt_clk_0-quirk-for-chromebook-clapper.patch
+asoc-intel-cht_bsw_max98090_ti-add-pmc_plt_clk_0-quirk-for-chromebook-gnawty.patch
--- /dev/null
+From c58eef061dda7d843dcc0ad6fea7e597d4c377c0 Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Wed, 19 Dec 2018 16:30:07 +0000
+Subject: staging: wilc1000: fix missing read_write setting when reading data
+
+From: Colin Ian King <colin.king@canonical.com>
+
+commit c58eef061dda7d843dcc0ad6fea7e597d4c377c0 upstream.
+
+Currently the cmd.read_write setting is not initialized so it contains
+garbage from the stack. Fix this by setting it to 0 to indicate a
+read is required.
+
+Detected by CoverityScan, CID#1357925 ("Uninitialized scalar variable")
+
+Fixes: c5c77ba18ea6 ("staging: wilc1000: Add SDIO/SPI 802.11 driver")
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+Cc: stable <stable@vger.kernel.org>
+Acked-by: Ajay Singh <ajay.kathat@microchip.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/staging/wilc1000/wilc_sdio.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/staging/wilc1000/wilc_sdio.c
++++ b/drivers/staging/wilc1000/wilc_sdio.c
+@@ -831,6 +831,7 @@ static int sdio_read_int(struct wilc *wi
+ if (!g_sdio.irq_gpio) {
+ int i;
+
++ cmd.read_write = 0;
+ cmd.function = 1;
+ cmd.address = 0x04;
+ cmd.data = 0;
projects / thirdparty / kernel / stable-queue.git / commitdiff
