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 73DE9C61DA4 for ; Sat, 11 Feb 2023 15:52:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229579AbjBKPwy (ORCPT ); Sat, 11 Feb 2023 10:52:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229520AbjBKPww (ORCPT ); Sat, 11 Feb 2023 10:52:52 -0500 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 229BE29427 for ; Sat, 11 Feb 2023 07:52:51 -0800 (PST) Received: by mail-ej1-x62f.google.com with SMTP id hx15so22479841ejc.11 for ; Sat, 11 Feb 2023 07:52:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=RD3LGvNcItKoh4Qy+WFoB4i2+xC3g4uw9rhyGD8W28c=; b=z2tMtZb9pdV3ozSIItY3sh4Hbj7i+1tcyEAoNrsfUIDB0c7Ss2rXGYYdn8Mq2KSTy3 Xb5wMHvVEfaxwOsMDcGrk1mn3jjeSYQECICLGNRfBQS9JVKL5c543t92SQwRMKLcHTF+ LAw8DM1HSHjjWO2D01w0SNu1iIj0Ff54yWMa+1N6BAAJczImOJasdDaMZ/2k7SGgLs2I Q1lrl5wbuV32GL5bdH2XAZ4IIys//H30iLPDENZ4Umjta3Zhv/T2Bi93Ht1TZnfeED7u H4orQzqJXcr+uCQ4IwmuKx3gdUgFTkSHPdyOtejPhmNz9I8BbmgDhsPBcvej+ia8/yOX m2Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=RD3LGvNcItKoh4Qy+WFoB4i2+xC3g4uw9rhyGD8W28c=; b=T32OT6mz/tIME9rTe5LwH6851i3GRs5AxEgfphlHqadS1jDkoKpz4INMHR37dUAmZT n+YY2hEqkGE/0ET+HZgUnlrDcmn/pyjJhQipBTOP2zMCzNj4v0xcUQg5Gqp/YXZg5sQQ mkV3Od2XMt4hl6MSPdI0ztUkLI2MjXu/JpiwOlX6OY/6uMWWFEN+Ny/EhyX7586YDBJF jsya7GtWYiQpwjvxIxUwapBebhNEBqBvHRu5AJrDJUp5hw3qz9XQVl9S/OIJSPjGwJJY sXpBcPc/Z6SIGJYrXyp7IxblQ8DHbLp7SjVtkij1zNjRCkkYH10INsNImHx/5aKQ985m JwTw== X-Gm-Message-State: AO0yUKVl2C6XSE0gV9ZruhEtPrSQOqvKOI/wv7TnzLJ4UMGGi8bvvoxm Ra62+GGl4L0qaX3nRovboG7bow== X-Google-Smtp-Source: AK7set8TM3yDzTZOS10jMd62fzS8ZpnkBCiVfUnEU061UOhji5P2sNCeuSTzUL7yOIo7JdT80eoXIA== X-Received: by 2002:a17:907:608b:b0:8aa:c105:f0bf with SMTP id ht11-20020a170907608b00b008aac105f0bfmr20636268ejc.17.1676130770757; Sat, 11 Feb 2023 07:52:50 -0800 (PST) Received: from ?IPV6:2001:14ba:a085:4d00::8a5? (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id uj9-20020a170907c98900b00884c611145fsm4021992ejc.62.2023.02.11.07.52.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 11 Feb 2023 07:52:49 -0800 (PST) Message-ID: Date: Sat, 11 Feb 2023 17:52:48 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: Re: [PATCH 06/10] drm/msm/dsi: dsi_cfg: Merge SC7180 config into SDM845 Content-Language: en-GB To: Konrad Dybcio , linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Rob Clark , Abhinav Kumar , Sean Paul , David Airlie , Daniel Vetter , Douglas Anderson , Loic Poulain , Neil Armstrong , Harigovindan P , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20230211115110.1462920-1-konrad.dybcio@linaro.org> <20230211115110.1462920-7-konrad.dybcio@linaro.org> From: Dmitry Baryshkov In-Reply-To: <20230211115110.1462920-7-konrad.dybcio@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/02/2023 13:51, Konrad Dybcio wrote: > The configs are identical, other than the number of *maximum* DSI > hosts allowed. This isn't an issue, unless somebody deliberately > tries to access the inexistent host by adding a dt node for it. > > Remove the SC7180 struct and point the hw revision match to the > SDM845's one. On a note, this could have been done back when > 7180 support was introduced. > > Fixes: 6125bd327e16 ("drm/msm: add DSI support for sc7180") Same comment regarding Fixes Other than that: Reviewed-by: Dmitry Baryshkov > Signed-off-by: Konrad Dybcio > --- > drivers/gpu/drm/msm/dsi/dsi_cfg.c | 15 ++------------- > 1 file changed, 2 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c > index 860681bfc084..142a0f1e2576 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c > @@ -169,7 +169,7 @@ static const struct msm_dsi_config sdm845_dsi_cfg = { > .bus_clk_names = dsi_v2_4_clk_names, > .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), > .io_start = { > - { 0xae94000, 0xae96000, 0 }, > + { 0xae94000, 0xae96000, 0 }, /* SDM845 / SDM670 / SC7180 */ > }, > }; > > @@ -188,17 +188,6 @@ static const struct msm_dsi_config sm8550_dsi_cfg = { > }, > }; > > -static const struct msm_dsi_config sc7180_dsi_cfg = { > - .io_offset = DSI_6G_REG_SHIFT, > - .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, 0 }, > - }, > -}; > - > static const struct regulator_bulk_data sc7280_dsi_regulators[] = { > { .supply = "vdda", .init_load_uA = 8350 }, /* 1.2 V */ > }; > @@ -299,7 +288,7 @@ static const struct msm_dsi_cfg_handler dsi_cfg_handlers[] = { > {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_4_0, > &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops}, > {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_4_1, > - &sc7180_dsi_cfg, &msm_dsi_6g_v2_host_ops}, > + &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops}, > {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_5_0, > &sc7280_dsi_cfg, &msm_dsi_6g_v2_host_ops}, > {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_6_0, -- With best wishes Dmitry