From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC743C6FD1F for ; Mon, 13 Mar 2023 23:56:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230130AbjCMX4E (ORCPT ); Mon, 13 Mar 2023 19:56:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229627AbjCMX4A (ORCPT ); Mon, 13 Mar 2023 19:56:00 -0400 Received: from relay02.th.seeweb.it (relay02.th.seeweb.it [IPv6:2001:4b7a:2000:18::163]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15FE0867DD for ; Mon, 13 Mar 2023 16:55:54 -0700 (PDT) Received: from SoMainline.org (94-211-6-86.cable.dynamic.v4.ziggo.nl [94.211.6.86]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by m-r1.th.seeweb.it (Postfix) with ESMTPSA id 0577F2013B; Tue, 14 Mar 2023 00:55:51 +0100 (CET) Date: Tue, 14 Mar 2023 00:55:50 +0100 From: Marijn Suijten To: Konrad Dybcio Cc: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Krishna Manikandan , Bryan O'Donoghue , Andy Gross , Bjorn Andersson , Rob Herring , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 04/10] drm/msm/dsi: dsi_cfg: Deduplicate identical structs Message-ID: <20230313235550.zo243m5qn23yadey@SoMainline.org> References: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@linaro.org> <20230307-topic-dsi_qcm-v3-4-8bd7e1add38a@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230307-topic-dsi_qcm-v3-4-8bd7e1add38a@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2023-03-07 14:01:42, Konrad Dybcio wrote: > Some structs were defined multiple times for no apparent reason. > Deduplicate them. > > Reviewed-by: Dmitry Baryshkov > Signed-off-by: Konrad Dybcio Seems a bit inconsistent to name some of these with their DSI host revision, and keep some named after the SoC. Also in the name of msm_dsi_config. Regardless: Reviewed-by: Marijn Suijten > --- > drivers/gpu/drm/msm/dsi/dsi_cfg.c | 77 +++++++++++++-------------------------- > 1 file changed, 26 insertions(+), 51 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c > index 6c192963c100..d39521850018 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c > @@ -47,41 +47,32 @@ static const struct msm_dsi_config msm8974_apq8084_dsi_cfg = { > }, > }; > > -static const char * const dsi_8916_bus_clk_names[] = { > +static const char * const dsi_v1_3_1_clk_names[] = { > "mdp_core", "iface", "bus", > }; > > -static const struct regulator_bulk_data msm8916_dsi_regulators[] = { > +static const struct regulator_bulk_data dsi_v1_3_1_regulators[] = { > { .supply = "vdda", .init_load_uA = 100000 }, /* 1.2 V */ > { .supply = "vddio", .init_load_uA = 100000 }, /* 1.8 V */ > }; > > static const struct msm_dsi_config msm8916_dsi_cfg = { > .io_offset = DSI_6G_REG_SHIFT, > - .regulator_data = msm8916_dsi_regulators, > - .num_regulators = ARRAY_SIZE(msm8916_dsi_regulators), > - .bus_clk_names = dsi_8916_bus_clk_names, > - .num_bus_clks = ARRAY_SIZE(dsi_8916_bus_clk_names), > + .regulator_data = dsi_v1_3_1_regulators, > + .num_regulators = ARRAY_SIZE(dsi_v1_3_1_regulators), > + .bus_clk_names = dsi_v1_3_1_clk_names, > + .num_bus_clks = ARRAY_SIZE(dsi_v1_3_1_clk_names), > .io_start = { > { 0x1a98000 }, > }, > }; > > -static const char * const dsi_8976_bus_clk_names[] = { > - "mdp_core", "iface", "bus", > -}; > - > -static const struct regulator_bulk_data msm8976_dsi_regulators[] = { > - { .supply = "vdda", .init_load_uA = 100000 }, /* 1.2 V */ > - { .supply = "vddio", .init_load_uA = 100000 }, /* 1.8 V */ > -}; > - > static const struct msm_dsi_config msm8976_dsi_cfg = { > .io_offset = DSI_6G_REG_SHIFT, > - .regulator_data = msm8976_dsi_regulators, > - .num_regulators = ARRAY_SIZE(msm8976_dsi_regulators), > - .bus_clk_names = dsi_8976_bus_clk_names, > - .num_bus_clks = ARRAY_SIZE(dsi_8976_bus_clk_names), > + .regulator_data = dsi_v1_3_1_regulators, > + .num_regulators = ARRAY_SIZE(dsi_v1_3_1_regulators), > + .bus_clk_names = dsi_v1_3_1_clk_names, > + .num_bus_clks = ARRAY_SIZE(dsi_v1_3_1_clk_names), > .io_start = { > { 0x1a94000, 0x1a96000 }, > }, > @@ -107,10 +98,6 @@ static const struct msm_dsi_config msm8994_dsi_cfg = { > }, > }; > > -static const char * const dsi_8996_bus_clk_names[] = { > - "mdp_core", "iface", "bus", "core_mmss", > -}; > - > static const struct regulator_bulk_data msm8996_dsi_regulators[] = { > { .supply = "vdda", .init_load_uA = 18160 }, /* 1.25 V */ > { .supply = "vcca", .init_load_uA = 17000 }, /* 0.925 V */ > @@ -121,8 +108,8 @@ static const struct msm_dsi_config msm8996_dsi_cfg = { > .io_offset = DSI_6G_REG_SHIFT, > .regulator_data = msm8996_dsi_regulators, > .num_regulators = ARRAY_SIZE(msm8996_dsi_regulators), > - .bus_clk_names = dsi_8996_bus_clk_names, > - .num_bus_clks = ARRAY_SIZE(dsi_8996_bus_clk_names), > + .bus_clk_names = dsi_6g_bus_clk_names, > + .num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names), > .io_start = { > { 0x994000, 0x996000 }, > }, > @@ -167,24 +154,20 @@ static const struct msm_dsi_config sdm660_dsi_cfg = { > }, > }; > > -static const char * const dsi_sdm845_bus_clk_names[] = { > +static const char * const dsi_v2_4_clk_names[] = { > "iface", "bus", > }; > > -static const char * const dsi_sc7180_bus_clk_names[] = { > - "iface", "bus", > -}; > - > -static const struct regulator_bulk_data sdm845_dsi_regulators[] = { > +static const struct regulator_bulk_data dsi_v2_4_regulators[] = { > { .supply = "vdda", .init_load_uA = 21800 }, /* 1.2 V */ > }; > > static const struct msm_dsi_config sdm845_dsi_cfg = { > .io_offset = DSI_6G_REG_SHIFT, > - .regulator_data = sdm845_dsi_regulators, > - .num_regulators = ARRAY_SIZE(sdm845_dsi_regulators), > - .bus_clk_names = dsi_sdm845_bus_clk_names, > - .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), > + .regulator_data = dsi_v2_4_regulators, > + .num_regulators = ARRAY_SIZE(dsi_v2_4_regulators), > + .bus_clk_names = dsi_v2_4_clk_names, > + .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), > .io_start = { > { 0xae94000, 0xae96000 }, > }, > @@ -198,32 +181,24 @@ static const struct msm_dsi_config sm8550_dsi_cfg = { > .io_offset = DSI_6G_REG_SHIFT, > .regulator_data = sm8550_dsi_regulators, > .num_regulators = ARRAY_SIZE(sm8550_dsi_regulators), > - .bus_clk_names = dsi_sdm845_bus_clk_names, > - .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), > + .bus_clk_names = dsi_v2_4_clk_names, > + .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), > .io_start = { > { 0xae94000, 0xae96000 }, > }, > }; > > -static const struct regulator_bulk_data sc7180_dsi_regulators[] = { > - { .supply = "vdda", .init_load_uA = 21800 }, /* 1.2 V */ > -}; > - > static const struct msm_dsi_config sc7180_dsi_cfg = { > .io_offset = DSI_6G_REG_SHIFT, > - .regulator_data = sc7180_dsi_regulators, > - .num_regulators = ARRAY_SIZE(sc7180_dsi_regulators), > - .bus_clk_names = dsi_sc7180_bus_clk_names, > - .num_bus_clks = ARRAY_SIZE(dsi_sc7180_bus_clk_names), > + .regulator_data = dsi_v2_4_regulators, > + .num_regulators = ARRAY_SIZE(dsi_v2_4_regulators), > + .bus_clk_names = dsi_v2_4_clk_names, > + .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), > .io_start = { > { 0xae94000 }, > }, > }; > > -static const char * const dsi_sc7280_bus_clk_names[] = { > - "iface", "bus", > -}; > - > static const struct regulator_bulk_data sc7280_dsi_regulators[] = { > { .supply = "vdda", .init_load_uA = 8350 }, /* 1.2 V */ > }; > @@ -232,8 +207,8 @@ static const struct msm_dsi_config sc7280_dsi_cfg = { > .io_offset = DSI_6G_REG_SHIFT, > .regulator_data = sc7280_dsi_regulators, > .num_regulators = ARRAY_SIZE(sc7280_dsi_regulators), > - .bus_clk_names = dsi_sc7280_bus_clk_names, > - .num_bus_clks = ARRAY_SIZE(dsi_sc7280_bus_clk_names), > + .bus_clk_names = dsi_v2_4_clk_names, > + .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), > .io_start = { > { 0xae94000, 0xae96000 }, > }, > > -- > 2.39.2 >