From 11f8d0a905177eb17098b1be287eb28f0df4b70e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 16 Jul 2023 19:03:05 +0200 Subject: [PATCH] some more fixups --- ...com-mmcc-msm8974-fix-mdss_gdsc-power-flags.patch | 9 ++------- ...mcc-msm8974-use-clk_rcg2_shared_ops-for-md.patch | 13 ++++--------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/queue-6.1/clk-qcom-mmcc-msm8974-fix-mdss_gdsc-power-flags.patch b/queue-6.1/clk-qcom-mmcc-msm8974-fix-mdss_gdsc-power-flags.patch index 4d9d8e09fad..75f26a6f953 100644 --- a/queue-6.1/clk-qcom-mmcc-msm8974-fix-mdss_gdsc-power-flags.patch +++ b/queue-6.1/clk-qcom-mmcc-msm8974-fix-mdss_gdsc-power-flags.patch @@ -19,14 +19,12 @@ Link: https://lore.kernel.org/r/20230507175335.2321503-2-dmitry.baryshkov@linaro Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- - drivers/clk/qcom/mmcc-msm8974.c | 2 +- + drivers/clk/qcom/mmcc-msm8974.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/clk/qcom/mmcc-msm8974.c b/drivers/clk/qcom/mmcc-msm8974.c -index d2fec5d5b22e2..82f6bad144a9a 100644 --- a/drivers/clk/qcom/mmcc-msm8974.c +++ b/drivers/clk/qcom/mmcc-msm8974.c -@@ -2384,7 +2384,7 @@ static struct gdsc mdss_gdsc = { +@@ -2372,7 +2372,7 @@ static struct gdsc mdss_gdsc = { .pd = { .name = "mdss", }, @@ -35,6 +33,3 @@ index d2fec5d5b22e2..82f6bad144a9a 100644 }; static struct gdsc camss_jpeg_gdsc = { --- -2.39.2 - diff --git a/queue-6.1/clk-qcom-mmcc-msm8974-use-clk_rcg2_shared_ops-for-md.patch b/queue-6.1/clk-qcom-mmcc-msm8974-use-clk_rcg2_shared_ops-for-md.patch index f9804a88f43..8e7cc6b0a69 100644 --- a/queue-6.1/clk-qcom-mmcc-msm8974-use-clk_rcg2_shared_ops-for-md.patch +++ b/queue-6.1/clk-qcom-mmcc-msm8974-use-clk_rcg2_shared_ops-for-md.patch @@ -20,22 +20,17 @@ Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20230507175335.2321503-1-dmitry.baryshkov@linaro.org Signed-off-by: Sasha Levin --- - drivers/clk/qcom/mmcc-msm8974.c | 2 +- + drivers/clk/qcom/mmcc-msm8974.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/clk/qcom/mmcc-msm8974.c b/drivers/clk/qcom/mmcc-msm8974.c -index b90a9f362f5f7..d2fec5d5b22e2 100644 --- a/drivers/clk/qcom/mmcc-msm8974.c +++ b/drivers/clk/qcom/mmcc-msm8974.c -@@ -485,7 +485,7 @@ static struct clk_rcg2 mdp_clk_src = { +@@ -473,7 +473,7 @@ static struct clk_rcg2 mdp_clk_src = { .name = "mdp_clk_src", - .parent_data = mmcc_xo_mmpll0_dsi_hdmi_gpll0, - .num_parents = ARRAY_SIZE(mmcc_xo_mmpll0_dsi_hdmi_gpll0), + .parent_names = mmcc_xo_mmpll0_dsi_hdmi_gpll0, + .num_parents = 6, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, }; --- -2.39.2 - -- 2.47.3