-LINUX_VERSION-6.6 = .77
-LINUX_KERNEL_HASH-6.6.77 = 081089dfcf125aef67aa940ebb995ff789b646129f5d4b2365e1d5685b29a84e
+LINUX_VERSION-6.6 = .78
+LINUX_KERNEL_HASH-6.6.78 = 5aa39a9bd555133ad741058f9908a277e6b36bb928481e747d885b50aaaa93ed
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
-@@ -1330,6 +1330,7 @@ static const struct of_device_id pca953x
+@@ -1311,6 +1311,7 @@ static const struct of_device_id pca953x
{ .compatible = "ti,tca6424", .data = OF_953X(24, PCA_INT), },
{ .compatible = "ti,tca9538", .data = OF_953X( 8, PCA_INT), },
{ .compatible = "ti,tca9539", .data = OF_953X(16, PCA_INT), },
+++ /dev/null
-From 7713ce38e6a26425ace3a57b3d03ba0125c16f89 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Fri, 28 Jul 2023 12:00:40 +0100
-Subject: [PATCH 0487/1085] drivers: media: imx296: Add standby delay during
- probe
-
-Add a 2-5ms delay when coming out of standby and before reading the
-sensor info register durning probe, as instructed by the datasheet. This
-standby delay is already present when the sensor starts streaming.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx296.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/media/i2c/imx296.c
-+++ b/drivers/media/i2c/imx296.c
-@@ -940,6 +940,8 @@ static int imx296_identify_model(struct
- return ret;
- }
-
-+ usleep_range(2000, 5000);
-+
- ret = imx296_read(sensor, IMX296_SENSOR_INFO);
- if (ret < 0) {
- dev_err(sensor->dev, "failed to read sensor information (%d)\n",
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
-@@ -1851,7 +1851,7 @@ __drm_fb_helper_initial_config_and_unloc
+@@ -1853,7 +1853,7 @@ __drm_fb_helper_initial_config_and_unloc
struct drm_device *dev = fb_helper->dev;
struct fb_info *info;
unsigned int width, height;
width = dev->mode_config.max_width;
height = dev->mode_config.max_height;
-@@ -1879,6 +1879,15 @@ __drm_fb_helper_initial_config_and_unloc
+@@ -1881,6 +1881,15 @@ __drm_fb_helper_initial_config_and_unloc
* register the fbdev emulation instance in kernel_fb_helper_list. */
mutex_unlock(&fb_helper->lock);
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
-@@ -1879,11 +1879,11 @@ __drm_fb_helper_initial_config_and_unloc
+@@ -1881,11 +1881,11 @@ __drm_fb_helper_initial_config_and_unloc
* register the fbdev emulation instance in kernel_fb_helper_list. */
mutex_unlock(&fb_helper->lock);
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
-@@ -1049,6 +1049,7 @@ static const struct drm_prop_enum_list d
+@@ -1050,6 +1050,7 @@ static const struct drm_prop_enum_list d
{ DRM_MODE_TV_MODE_PAL_M, "PAL-M" },
{ DRM_MODE_TV_MODE_PAL_N, "PAL-N" },
{ DRM_MODE_TV_MODE_SECAM, "SECAM" },
};
DRM_ENUM_NAME_FN(drm_get_tv_mode_name, drm_tv_mode_enum_list)
-@@ -1735,6 +1736,12 @@ EXPORT_SYMBOL(drm_connector_attach_dp_su
+@@ -1736,6 +1737,12 @@ EXPORT_SYMBOL(drm_connector_attach_dp_su
* TV Mode is CCIR System B (aka 625-lines) together with
* the SECAM Color Encoding.
*
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
-@@ -2697,10 +2697,15 @@ int drm_connector_set_orientation_from_p
+@@ -2698,10 +2698,15 @@ int drm_connector_set_orientation_from_p
{
enum drm_panel_orientation orientation;
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
-@@ -361,7 +361,8 @@ static int __drm_connector_init(struct d
+@@ -362,7 +362,8 @@ static int __drm_connector_init(struct d
drm_object_attach_property(&connector->base,
config->non_desktop_property,
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
-@@ -362,7 +362,7 @@ static int __drm_connector_init(struct d
+@@ -363,7 +363,7 @@ static int __drm_connector_init(struct d
drm_object_attach_property(&connector->base,
config->non_desktop_property,
(connector_type != DRM_MODE_CONNECTOR_VIRTUAL &&
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
-@@ -4269,7 +4269,8 @@ static int tg3_power_down_prepare(struct
+@@ -4270,7 +4270,8 @@ static int tg3_power_down_prepare(struct
static void tg3_power_down(struct tg3 *tp)
{
pci_wake_from_d3(tp->pdev, tg3_flag(tp, WOL_ENABLE));
}
EXPORT_SYMBOL_GPL(nvmem_cell_put);
-@@ -2116,11 +2057,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_size);
+@@ -2118,11 +2059,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_size);
static int __init nvmem_init(void)
{
FUSE_INVALID = -1
};
-@@ -93,7 +94,10 @@ static int imx_ocotp_reg_read(void *cont
+@@ -95,7 +96,10 @@ static int imx_ocotp_reg_read(void *cont
continue;
}
+ *buf++ = readl_relaxed(reg + (i << 2));
}
- memcpy(val, (u8 *)p, bytes);
-@@ -155,8 +159,30 @@ static const struct ocotp_devtype_data i
+ memcpy(val, ((u8 *)p) + skipbytes, bytes);
+@@ -157,8 +161,30 @@ static const struct ocotp_devtype_data i
},
};
+MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -4483,6 +4483,7 @@ int wake_up_state(struct task_struct *p,
+@@ -4485,6 +4485,7 @@ int wake_up_state(struct task_struct *p,
{
return try_to_wake_up(p, state, 0);
}
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
-@@ -17731,8 +17731,10 @@ static int tg3_init_one(struct pci_dev *
+@@ -17732,8 +17732,10 @@ static int tg3_init_one(struct pci_dev *
} else
persist_dma_mask = dma_mask = DMA_BIT_MASK(64);
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
-@@ -2320,7 +2320,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat
+@@ -2369,7 +2369,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat
static const struct sdhci_ops sdhci_msm_ops = {
.reset = sdhci_and_cqhci_reset,
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
-@@ -1755,49 +1755,49 @@ static unsigned int sdhci_msm_get_min_cl
+@@ -1804,49 +1804,49 @@ static unsigned int sdhci_msm_get_min_cl
return SDHCI_MSM_MIN_CLOCK;
}
+++ /dev/null
-From patchwork Sun Dec 15 22:13:49 2024
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org>
-X-Patchwork-Id: 13909005
-Date: Sun, 15 Dec 2024 22:13:49 +0000
-From: Daniel Golle <daniel@makrotopia.org>
-To: Michael Turquette <mturquette@baylibre.com>,
- Stephen Boyd <sboyd@kernel.org>, Matthias Brugger <matthias.bgg@gmail.com>,
- AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>,
- Alexandre Mergnat <amergnat@baylibre.com>,
- Geert Uytterhoeven <geert+renesas@glider.be>,
- Daniel Golle <daniel@makrotopia.org>,
- Uwe =?iso-8859-1?q?Kleine-K=F6nig?= <u.kleine-koenig@baylibre.com>,
- Miles Chen <miles.chen@mediatek.com>, Chen-Yu Tsai <wenst@chromium.org>,
- Frank Wunderlich <frank-w@public-files.de>, John Crispin <john@phrozen.org>,
- linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org,
- linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org,
- stable@vger.kernel.org
-Subject: [PATCH 1/5] clk: mediatek: mt2701-vdec: fix conversion to
- mtk_clk_simple_probe
-Message-ID:
- <b126a5577f3667ef19b1b5feea5e70174084fb03.1734300668.git.daniel@makrotopia.org>
-Precedence: bulk
-X-Mailing-List: linux-clk@vger.kernel.org
-List-Id: <linux-clk.vger.kernel.org>
-List-Subscribe: <mailto:linux-clk+subscribe@vger.kernel.org>
-List-Unsubscribe: <mailto:linux-clk+unsubscribe@vger.kernel.org>
-MIME-Version: 1.0
-Content-Disposition: inline
-
-Commit 973d1607d936 ("clk: mediatek: mt2701: use mtk_clk_simple_probe to
-simplify driver") broke DT bindings as the highest index was reduced by
-1 because the id count starts from 1 and not from 0.
-
-Fix this, like for other drivers which had the same issue, by adding a
-dummy clk at index 0.
-
-Fixes: 973d1607d936 ("clk: mediatek: mt2701: use mtk_clk_simple_probe to simplify driver")
-Cc: stable@vger.kernel.org
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- drivers/clk/mediatek/clk-mt2701-vdec.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/clk/mediatek/clk-mt2701-vdec.c
-+++ b/drivers/clk/mediatek/clk-mt2701-vdec.c
-@@ -31,6 +31,7 @@ static const struct mtk_gate_regs vdec1_
- GATE_MTK(_id, _name, _parent, &vdec1_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv)
-
- static const struct mtk_gate vdec_clks[] = {
-+ GATE_DUMMY(CLK_DUMMY, "vdec_dummy"),
- GATE_VDEC0(CLK_VDEC_CKGEN, "vdec_cken", "vdec_sel", 0),
- GATE_VDEC1(CLK_VDEC_LARB, "vdec_larb_cken", "mm_sel", 0),
- };
+++ /dev/null
-From patchwork Sun Dec 15 22:14:11 2024
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org>
-X-Patchwork-Id: 13909006
-Date: Sun, 15 Dec 2024 22:14:11 +0000
-From: Daniel Golle <daniel@makrotopia.org>
-To: Michael Turquette <mturquette@baylibre.com>,
- Stephen Boyd <sboyd@kernel.org>, Matthias Brugger <matthias.bgg@gmail.com>,
- AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>,
- Alexandre Mergnat <amergnat@baylibre.com>,
- Geert Uytterhoeven <geert+renesas@glider.be>,
- Daniel Golle <daniel@makrotopia.org>,
- Uwe =?iso-8859-1?q?Kleine-K=F6nig?= <u.kleine-koenig@baylibre.com>,
- Miles Chen <miles.chen@mediatek.com>, Chen-Yu Tsai <wenst@chromium.org>,
- Frank Wunderlich <frank-w@public-files.de>, John Crispin <john@phrozen.org>,
- linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org,
- linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org,
- stable@vger.kernel.org
-Subject: [PATCH 2/5] clk: mediatek: mt2701-aud: fix conversion to
- mtk_clk_simple_probe
-Message-ID:
- <a07584d803af57b9ce4b5df5e122c09bf5a56ac9.1734300668.git.daniel@makrotopia.org>
-References:
- <b126a5577f3667ef19b1b5feea5e70174084fb03.1734300668.git.daniel@makrotopia.org>
-Precedence: bulk
-X-Mailing-List: linux-clk@vger.kernel.org
-List-Id: <linux-clk.vger.kernel.org>
-List-Subscribe: <mailto:linux-clk+subscribe@vger.kernel.org>
-List-Unsubscribe: <mailto:linux-clk+unsubscribe@vger.kernel.org>
-MIME-Version: 1.0
-Content-Disposition: inline
-In-Reply-To:
- <b126a5577f3667ef19b1b5feea5e70174084fb03.1734300668.git.daniel@makrotopia.org>
-
-Some of the audio subsystem clocks defined in clk-mt2701.h aren't
-actually used by the driver. This broke conversion to
-mtk_clk_simple_probe which expects that the highest possible clk id is
-defined by the ARRAY_SIZE.
-
-Add additional dummy clocks to fill the gaps and remain compatible with
-the existing DT bindings.
-
-Fixes: 0f69a423c458 ("clk: mediatek: Switch to mtk_clk_simple_probe() where possible")
-Cc: stable@vger.kernel.org
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- drivers/clk/mediatek/clk-mt2701-aud.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/clk/mediatek/clk-mt2701-aud.c
-+++ b/drivers/clk/mediatek/clk-mt2701-aud.c
-@@ -55,10 +55,16 @@ static const struct mtk_gate audio_clks[
- GATE_DUMMY(CLK_DUMMY, "aud_dummy"),
- /* AUDIO0 */
- GATE_AUDIO0(CLK_AUD_AFE, "audio_afe", "aud_intbus_sel", 2),
-+ GATE_DUMMY(CLK_AUD_LRCK_DETECT, "audio_lrck_detect_dummy"),
-+ GATE_DUMMY(CLK_AUD_I2S, "audio_i2c_dummy"),
-+ GATE_DUMMY(CLK_AUD_APLL_TUNER, "audio_apll_tuner_dummy"),
- GATE_AUDIO0(CLK_AUD_HDMI, "audio_hdmi", "audpll_sel", 20),
- GATE_AUDIO0(CLK_AUD_SPDF, "audio_spdf", "audpll_sel", 21),
- GATE_AUDIO0(CLK_AUD_SPDF2, "audio_spdf2", "audpll_sel", 22),
- GATE_AUDIO0(CLK_AUD_APLL, "audio_apll", "audpll_sel", 23),
-+ GATE_DUMMY(CLK_AUD_TML, "audio_tml_dummy"),
-+ GATE_DUMMY(CLK_AUD_AHB_IDLE_EXT, "audio_ahb_idle_ext_dummy"),
-+ GATE_DUMMY(CLK_AUD_AHB_IDLE_INT, "audio_ahb_idle_int_dummy"),
- /* AUDIO1 */
- GATE_AUDIO1(CLK_AUD_I2SIN1, "audio_i2sin1", "aud_mux1_sel", 0),
- GATE_AUDIO1(CLK_AUD_I2SIN2, "audio_i2sin2", "aud_mux1_sel", 1),
-@@ -76,10 +82,12 @@ static const struct mtk_gate audio_clks[
- GATE_AUDIO1(CLK_AUD_ASRCI2, "audio_asrci2", "asm_h_sel", 13),
- GATE_AUDIO1(CLK_AUD_ASRCO1, "audio_asrco1", "asm_h_sel", 14),
- GATE_AUDIO1(CLK_AUD_ASRCO2, "audio_asrco2", "asm_h_sel", 15),
-+ GATE_DUMMY(CLK_AUD_HDMIRX, "audio_hdmirx_dummy"),
- GATE_AUDIO1(CLK_AUD_INTDIR, "audio_intdir", "intdir_sel", 20),
- GATE_AUDIO1(CLK_AUD_A1SYS, "audio_a1sys", "aud_mux1_sel", 21),
- GATE_AUDIO1(CLK_AUD_A2SYS, "audio_a2sys", "aud_mux2_sel", 22),
- GATE_AUDIO1(CLK_AUD_AFE_CONN, "audio_afe_conn", "aud_mux1_sel", 23),
-+ GATE_DUMMY(CLK_AUD_AFE_PCMIF, "audio_afe_pcmif_dummy"),
- GATE_AUDIO1(CLK_AUD_AFE_MRGIF, "audio_afe_mrgif", "aud_mux1_sel", 25),
- /* AUDIO2 */
- GATE_AUDIO2(CLK_AUD_MMIF_UL1, "audio_ul1", "aud_mux1_sel", 0),
-@@ -100,6 +108,8 @@ static const struct mtk_gate audio_clks[
- GATE_AUDIO2(CLK_AUD_MMIF_AWB2, "audio_awb2", "aud_mux1_sel", 15),
- GATE_AUDIO2(CLK_AUD_MMIF_DAI, "audio_dai", "aud_mux1_sel", 16),
- /* AUDIO3 */
-+ GATE_DUMMY(CLK_AUD_DMIC1, "audio_dmic1_dummy"),
-+ GATE_DUMMY(CLK_AUD_DMIC2, "audio_dmic2_dummy"),
- GATE_AUDIO3(CLK_AUD_ASRCI3, "audio_asrci3", "asm_h_sel", 2),
- GATE_AUDIO3(CLK_AUD_ASRCI4, "audio_asrci4", "asm_h_sel", 3),
- GATE_AUDIO3(CLK_AUD_ASRCI5, "audio_asrci5", "asm_h_sel", 4),
+++ /dev/null
-From patchwork Sun Dec 15 22:14:24 2024
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org>
-X-Patchwork-Id: 13909007
-Date: Sun, 15 Dec 2024 22:14:24 +0000
-From: Daniel Golle <daniel@makrotopia.org>
-To: Michael Turquette <mturquette@baylibre.com>,
- Stephen Boyd <sboyd@kernel.org>, Matthias Brugger <matthias.bgg@gmail.com>,
- AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>,
- Alexandre Mergnat <amergnat@baylibre.com>,
- Geert Uytterhoeven <geert+renesas@glider.be>,
- Daniel Golle <daniel@makrotopia.org>,
- Uwe =?iso-8859-1?q?Kleine-K=F6nig?= <u.kleine-koenig@baylibre.com>,
- Miles Chen <miles.chen@mediatek.com>, Chen-Yu Tsai <wenst@chromium.org>,
- Frank Wunderlich <frank-w@public-files.de>, John Crispin <john@phrozen.org>,
- linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org,
- linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org,
- stable@vger.kernel.org
-Subject: [PATCH 3/5] clk: mediatek: mt2701-bdp: add missing dummy clk
-Message-ID:
- <b8526c882a50f2b158df0eccb4a165956fd8fa13.1734300668.git.daniel@makrotopia.org>
-References:
- <b126a5577f3667ef19b1b5feea5e70174084fb03.1734300668.git.daniel@makrotopia.org>
-Precedence: bulk
-X-Mailing-List: linux-clk@vger.kernel.org
-List-Id: <linux-clk.vger.kernel.org>
-List-Subscribe: <mailto:linux-clk+subscribe@vger.kernel.org>
-List-Unsubscribe: <mailto:linux-clk+unsubscribe@vger.kernel.org>
-MIME-Version: 1.0
-Content-Disposition: inline
-In-Reply-To:
- <b126a5577f3667ef19b1b5feea5e70174084fb03.1734300668.git.daniel@makrotopia.org>
-
-Add dummy clk for index 0 which was missed during the conversion to
-mtk_clk_simple_probe().
-
-Fixes: 973d1607d936 ("clk: mediatek: mt2701: use mtk_clk_simple_probe to simplify driver")
-Cc: stable@vger.kernel.org
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- drivers/clk/mediatek/clk-mt2701-bdp.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/clk/mediatek/clk-mt2701-bdp.c
-+++ b/drivers/clk/mediatek/clk-mt2701-bdp.c
-@@ -31,6 +31,7 @@ static const struct mtk_gate_regs bdp1_c
- GATE_MTK(_id, _name, _parent, &bdp1_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv)
-
- static const struct mtk_gate bdp_clks[] = {
-+ GATE_DUMMY(CLK_DUMMY, "bdp_dummy"),
- GATE_BDP0(CLK_BDP_BRG_BA, "brg_baclk", "mm_sel", 0),
- GATE_BDP0(CLK_BDP_BRG_DRAM, "brg_dram", "mm_sel", 1),
- GATE_BDP0(CLK_BDP_LARB_DRAM, "larb_dram", "mm_sel", 2),
+++ /dev/null
-From patchwork Sun Dec 15 22:14:34 2024
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org>
-X-Patchwork-Id: 13909008
-Date: Sun, 15 Dec 2024 22:14:34 +0000
-From: Daniel Golle <daniel@makrotopia.org>
-To: Michael Turquette <mturquette@baylibre.com>,
- Stephen Boyd <sboyd@kernel.org>, Matthias Brugger <matthias.bgg@gmail.com>,
- AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>,
- Alexandre Mergnat <amergnat@baylibre.com>,
- Geert Uytterhoeven <geert+renesas@glider.be>,
- Daniel Golle <daniel@makrotopia.org>,
- Uwe =?iso-8859-1?q?Kleine-K=F6nig?= <u.kleine-koenig@baylibre.com>,
- Miles Chen <miles.chen@mediatek.com>, Chen-Yu Tsai <wenst@chromium.org>,
- Frank Wunderlich <frank-w@public-files.de>, John Crispin <john@phrozen.org>,
- linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org,
- linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org,
- stable@vger.kernel.org
-Subject: [PATCH 4/5] clk: mediatek: mt2701-mm: add missing dummy clk
-Message-ID:
- <9de23440fcba1ffef9e77d58c9f505105e57a250.1734300668.git.daniel@makrotopia.org>
-References:
- <b126a5577f3667ef19b1b5feea5e70174084fb03.1734300668.git.daniel@makrotopia.org>
-Precedence: bulk
-X-Mailing-List: linux-clk@vger.kernel.org
-List-Id: <linux-clk.vger.kernel.org>
-List-Subscribe: <mailto:linux-clk+subscribe@vger.kernel.org>
-List-Unsubscribe: <mailto:linux-clk+unsubscribe@vger.kernel.org>
-MIME-Version: 1.0
-Content-Disposition: inline
-In-Reply-To:
- <b126a5577f3667ef19b1b5feea5e70174084fb03.1734300668.git.daniel@makrotopia.org>
-
-Add dummy clk which was missed during the conversion to
-mtk_clk_pdev_probe() and is required for the existing DT bindings to
-keep working.
-
-Fixes: 65c10c50c9c7 ("clk: mediatek: Migrate to mtk_clk_pdev_probe() for multimedia clocks")
-Cc: stable@vger.kernel.org
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- drivers/clk/mediatek/clk-mt2701-mm.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/clk/mediatek/clk-mt2701-mm.c
-+++ b/drivers/clk/mediatek/clk-mt2701-mm.c
-@@ -31,6 +31,7 @@ static const struct mtk_gate_regs disp1_
- GATE_MTK(_id, _name, _parent, &disp1_cg_regs, _shift, &mtk_clk_gate_ops_setclr)
-
- static const struct mtk_gate mm_clks[] = {
-+ GATE_DUMMY(CLK_DUMMY, "mm_dummy"),
- GATE_DISP0(CLK_MM_SMI_COMMON, "mm_smi_comm", "mm_sel", 0),
- GATE_DISP0(CLK_MM_SMI_LARB0, "mm_smi_larb0", "mm_sel", 1),
- GATE_DISP0(CLK_MM_CMDQ, "mm_cmdq", "mm_sel", 2),
+++ /dev/null
-From patchwork Sun Dec 15 22:14:48 2024
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org>
-X-Patchwork-Id: 13909009
-Date: Sun, 15 Dec 2024 22:14:48 +0000
-From: Daniel Golle <daniel@makrotopia.org>
-To: Michael Turquette <mturquette@baylibre.com>,
- Stephen Boyd <sboyd@kernel.org>, Matthias Brugger <matthias.bgg@gmail.com>,
- AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>,
- Alexandre Mergnat <amergnat@baylibre.com>,
- Geert Uytterhoeven <geert+renesas@glider.be>,
- Daniel Golle <daniel@makrotopia.org>,
- Uwe =?iso-8859-1?q?Kleine-K=F6nig?= <u.kleine-koenig@baylibre.com>,
- Miles Chen <miles.chen@mediatek.com>, Chen-Yu Tsai <wenst@chromium.org>,
- Frank Wunderlich <frank-w@public-files.de>, John Crispin <john@phrozen.org>,
- linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org,
- linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org,
- stable@vger.kernel.org
-Subject: [PATCH 5/5] clk: mediatek: mt2701-img: add missing dummy clk
-Message-ID:
- <d677486a5c563fe5c47aa995841adc2aaa183b8a.1734300668.git.daniel@makrotopia.org>
-References:
- <b126a5577f3667ef19b1b5feea5e70174084fb03.1734300668.git.daniel@makrotopia.org>
-Precedence: bulk
-X-Mailing-List: linux-clk@vger.kernel.org
-List-Id: <linux-clk.vger.kernel.org>
-List-Subscribe: <mailto:linux-clk+subscribe@vger.kernel.org>
-List-Unsubscribe: <mailto:linux-clk+unsubscribe@vger.kernel.org>
-MIME-Version: 1.0
-Content-Disposition: inline
-In-Reply-To:
- <b126a5577f3667ef19b1b5feea5e70174084fb03.1734300668.git.daniel@makrotopia.org>
-
-Add dummy clk for index 0 which was missed during the conversion to
-mtk_clk_simple_probe().
-
-Fixes: 973d1607d936 ("clk: mediatek: mt2701: use mtk_clk_simple_probe to simplify driver")
-Cc: stable@vger.kernel.org
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- drivers/clk/mediatek/clk-mt2701-img.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/clk/mediatek/clk-mt2701-img.c
-+++ b/drivers/clk/mediatek/clk-mt2701-img.c
-@@ -22,6 +22,7 @@ static const struct mtk_gate_regs img_cg
- GATE_MTK(_id, _name, _parent, &img_cg_regs, _shift, &mtk_clk_gate_ops_setclr)
-
- static const struct mtk_gate img_clks[] = {
-+ GATE_DUMMY(CLK_DUMMY, "img_dummy"),
- GATE_IMG(CLK_IMG_SMI_COMM, "img_smi_comm", "mm_sel", 0),
- GATE_IMG(CLK_IMG_RESZ, "img_resz", "mm_sel", 1),
- GATE_IMG(CLK_IMG_JPGDEC_SMI, "img_jpgdec_smi", "mm_sel", 5),
static struct platform_driver disp_cc_sm6125_driver = {
--- a/drivers/clk/qcom/dispcc-sm6350.c
+++ b/drivers/clk/qcom/dispcc-sm6350.c
-@@ -761,7 +761,7 @@ static int disp_cc_sm6350_probe(struct p
+@@ -760,7 +760,7 @@ static int disp_cc_sm6350_probe(struct p
clk_fabia_pll_configure(&disp_cc_pll0, regmap, &disp_cc_pll0_config);
static struct platform_driver gcc_sm6125_driver = {
--- a/drivers/clk/qcom/gcc-sm6350.c
+++ b/drivers/clk/qcom/gcc-sm6350.c
-@@ -2559,7 +2559,7 @@ static int gcc_sm6350_probe(struct platf
+@@ -2565,7 +2565,7 @@ static int gcc_sm6350_probe(struct platf
if (ret)
return ret;
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
-@@ -3271,6 +3271,18 @@ static const struct usb_device_id uvc_id
+@@ -3269,6 +3269,18 @@ static const struct usb_device_id uvc_id
.bInterfaceSubClass = 1,
.bInterfaceProtocol = 0,
.driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
#include <media/v4l2-common.h>
-@@ -1275,9 +1280,149 @@ static void uvc_video_decode_data(struct
+@@ -1296,9 +1301,149 @@ static void uvc_video_decode_data(struct
uvc_urb->async_operations++;
}
/* Mark the buffer as done if the EOF marker is set. */
if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) {
uvc_dbg(stream->dev, FRAME, "Frame complete (EOF found)\n");
-@@ -1859,6 +2004,8 @@ static int uvc_init_video_isoc(struct uv
+@@ -1880,6 +2025,8 @@ static int uvc_init_video_isoc(struct uv
if (npackets == 0)
return -ENOMEM;
/* Format flags */
#define UVC_FMT_FLAG_COMPRESSED 0x00000001
-@@ -585,6 +587,7 @@ struct uvc_device {
+@@ -586,6 +588,7 @@ struct uvc_device {
struct input_dev *input;
char input_phys[64];
projects / openwrt / openwrt.git / commitdiff