aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.10/950-0561-drm-vc4-dsi-Use-snprintf-for-the-PHY-clocks-instead-.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-08-28 15:09:23 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-08-28 16:56:01 +0200
commit9703a2adcc9511a8db33427e8110642b6a197873 (patch)
tree2ed55e96b82e6a95a2318b20db803b695bc8237e /target/linux/bcm27xx/patches-5.10/950-0561-drm-vc4-dsi-Use-snprintf-for-the-PHY-clocks-instead-.patch
parent251336639c7c6d5e9ab5d0e4491089c08749ce3c (diff)
downloadupstream-9703a2adcc9511a8db33427e8110642b6a197873.tar.gz
upstream-9703a2adcc9511a8db33427e8110642b6a197873.tar.bz2
upstream-9703a2adcc9511a8db33427e8110642b6a197873.zip
kernel: Refresh on 5.10.138
Refresh all patches on top of kernel 5.10.138. The following patches were applied upstream: bcm27xx/patches-5.10/950-0311-drm-vc4-Adopt-the-dma-configuration-from-the-HVS-or-.patch bcm27xx/patches-5.10/950-0317-vc4_hdmi-Remove-firmware-logic-for-MAI-threshold-set.patch bcm27xx/patches-5.10/950-0346-drm-vc4-A-present-but-empty-dmas-disables-audio.patch bcm27xx/patches-5.10/950-0354-drm-vc4-Add-the-2711-HVS-as-a-suitable-DMA-node.patch bcm27xx/patches-5.10/950-0413-drm-vc4-hdmi-Don-t-access-the-connector-state-in-res.patch bcm27xx/patches-5.10/950-0505-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch bcm27xx/patches-5.10/950-0512-vc4-drm-vc4_plane-Remove-subpixel-positioning-check.patch bcm27xx/patches-5.10/950-0560-drm-vc4-drv-Remove-the-DSI-pointer-in-vc4_drv.patch bcm27xx/patches-5.10/950-0561-drm-vc4-dsi-Use-snprintf-for-the-PHY-clocks-instead-.patch bcm27xx/patches-5.10/950-0562-drm-vc4-dsi-Introduce-a-variant-structure.patch bcm27xx/patches-5.10/950-0565-drm-vc4-Correct-pixel-order-for-DSI0.patch bcm27xx/patches-5.10/950-0566-drm-vc4-Register-dsi0-as-the-correct-vc4-encoder-typ.patch bcm27xx/patches-5.10/950-0567-drm-vc4-Fix-dsi0-interrupt-support.patch bcm27xx/patches-5.10/950-0568-drm-vc4-Add-correct-stop-condition-to-vc4_dsi_encode.patch bcm27xx/patches-5.10/950-0647-drm-vc4-Fix-timings-for-interlaced-modes.patch bcm27xx/patches-5.10/950-0695-drm-vc4-Fix-margin-calculations-for-the-right-bottom.patch Upstream sets the pixel clock to 340MHz now, do not set it to 600MHz any more. bcm27xx/patches-5.10/950-0576-drm-vc4-hdmi-Raise-the-maximum-clock-rate.patch Fixes: 89956c653252 ("kernel: bump 5.10 to 5.10.138") Fixes: 4209c33ae27d ("kernel: bump 5.10 to 5.10.137") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0561-drm-vc4-dsi-Use-snprintf-for-the-PHY-clocks-instead-.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0561-drm-vc4-dsi-Use-snprintf-for-the-PHY-clocks-instead-.patch66
1 files changed, 0 insertions, 66 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0561-drm-vc4-dsi-Use-snprintf-for-the-PHY-clocks-instead-.patch b/target/linux/bcm27xx/patches-5.10/950-0561-drm-vc4-dsi-Use-snprintf-for-the-PHY-clocks-instead-.patch
deleted file mode 100644
index b1b0fb5e4e..0000000000
--- a/target/linux/bcm27xx/patches-5.10/950-0561-drm-vc4-dsi-Use-snprintf-for-the-PHY-clocks-instead-.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 7fe646b726b66c16f731e36e95d7eda9f182ba4d Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 3 Dec 2020 14:25:38 +0100
-Subject: [PATCH] drm/vc4: dsi: Use snprintf for the PHY clocks instead
- of an array
-
-Commit dc0bf36401e891c853e0a25baeb4e0b4e6f3626d upstream.
-
-The DSI clocks setup function has been using an array to store the clock
-name of either the DSI0 or DSI1 blocks, using the port ID to choose the
-proper one.
-
-Let's switch to an snprintf call to do the same thing and simplify the
-array a bit.
-
-Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
-Link: https://patchwork.freedesktop.org/patch/msgid/20201203132543.861591-4-maxime@cerno.tech
----
- drivers/gpu/drm/vc4/vc4_dsi.c | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_dsi.c
-+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
-@@ -1390,12 +1390,12 @@ vc4_dsi_init_phy_clocks(struct vc4_dsi *
- struct device *dev = &dsi->pdev->dev;
- const char *parent_name = __clk_get_name(dsi->pll_phy_clock);
- static const struct {
-- const char *dsi0_name, *dsi1_name;
-+ const char *name;
- int div;
- } phy_clocks[] = {
-- { "dsi0_byte", "dsi1_byte", 8 },
-- { "dsi0_ddr2", "dsi1_ddr2", 4 },
-- { "dsi0_ddr", "dsi1_ddr", 2 },
-+ { "byte", 8 },
-+ { "ddr2", 4 },
-+ { "ddr", 2 },
- };
- int i;
-
-@@ -1411,8 +1411,12 @@ vc4_dsi_init_phy_clocks(struct vc4_dsi *
- for (i = 0; i < ARRAY_SIZE(phy_clocks); i++) {
- struct clk_fixed_factor *fix = &dsi->phy_clocks[i];
- struct clk_init_data init;
-+ char clk_name[16];
- int ret;
-
-+ snprintf(clk_name, sizeof(clk_name),
-+ "dsi%u_%s", dsi->port, phy_clocks[i].name);
-+
- /* We just use core fixed factor clock ops for the PHY
- * clocks. The clocks are actually gated by the
- * PHY_AFEC0_DDRCLK_EN bits, which we should be
-@@ -1429,10 +1433,7 @@ vc4_dsi_init_phy_clocks(struct vc4_dsi *
- memset(&init, 0, sizeof(init));
- init.parent_names = &parent_name;
- init.num_parents = 1;
-- if (dsi->port == 1)
-- init.name = phy_clocks[i].dsi1_name;
-- else
-- init.name = phy_clocks[i].dsi0_name;
-+ init.name = clk_name;
- init.ops = &clk_fixed_factor_ops;
-
- ret = devm_clk_hw_register(dev, &fix->hw);