From patchwork Sat Mar 18 13:42:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 71602 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp298824wrt; Sat, 18 Mar 2023 06:53:20 -0700 (PDT) X-Google-Smtp-Source: AK7set+6HCJy7+9L/wWRBfwnWz6ZsNZfuYr5ZE7OqnaeW3TPBvpm91Ve2xkTbB24XKdEwUU32YtL X-Received: by 2002:a62:7bc5:0:b0:623:c943:a2f8 with SMTP id w188-20020a627bc5000000b00623c943a2f8mr10418005pfc.20.1679147600303; Sat, 18 Mar 2023 06:53:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679147600; cv=none; d=google.com; s=arc-20160816; b=q38yXmr41stM+KH+kQ4vmh6cQPWDDF7G+CjuOrkTN8Bf5uYBtkoKzV0F78/F5cXOb0 Glkq/E+5h9V4Y+OrV8yxDaglQjZgiFH5caMCSh4U10fjxze8t9JeftHd2Twd7c3do4WO 3E/jyIL/ygoF2bEnC/QDmJg9zSgBbzhuU+02d+Ngrq+tkhFJEYkq4pb0rQpJGblA2+ln EmBg/h4bnSrSx/CXYAYRwtmRWYq9pUsOLlPLa2XQn4O6nIfUDztKJ2K+kWrXGxCths5k AnjMScaRUUn5GB7z+2cSs76WLajsGtrUUm2Hbnsc/vKr94rTJYWjGUaEOF9P+iSOD8Zo l47A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=FyfU1KJpQXcUs5jhogFBaoFTlgPH63DY/U4xjNHTWjQ=; b=YtmjJAznucxEqf19PknLMOiFqaeiZ+3FUQd0lnqmek8hyYTQaTuoTCNrsxY+kW9JI5 71g4SKm5C14bnp2H2xpGE1D03pmMWG08QV4GYF+/s15JfEiz1506A5JwEee5PbnFq2Ff cQi8TvV8Xqz5ff9JuB5ZUfskDCK4VlBDNlLu5Gr+UmyRCpuo6mBR5JpXJU8jV7ZS8Rcc 23j0KEaWq+3EmkugaiBIJQBbr0Tk6y8eOUf/lXC8kZA3HnGbWJ5rjyGArnSSgKkEgOUZ 3HGTDwBpH8sAB+9x76FR+6OAT5qKkVoqbJulqRwR9d7Apxilxj+vdJKGmvhQMyAhV/+u RJ+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="j/SuZWK4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b14-20020a056a000cce00b005a8e1cc59bfsi5649605pfv.295.2023.03.18.06.53.02; Sat, 18 Mar 2023 06:53:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="j/SuZWK4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229867AbjCRNnV (ORCPT + 99 others); Sat, 18 Mar 2023 09:43:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229822AbjCRNnI (ORCPT ); Sat, 18 Mar 2023 09:43:08 -0400 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D4BC33CD7 for ; Sat, 18 Mar 2023 06:43:02 -0700 (PDT) Received: by mail-lf1-x135.google.com with SMTP id y15so9744214lfa.7 for ; Sat, 18 Mar 2023 06:43:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679146981; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=FyfU1KJpQXcUs5jhogFBaoFTlgPH63DY/U4xjNHTWjQ=; b=j/SuZWK4hGzsjGSVxR7d8gdxnkenVxTgbXW9BWPte7dDWKjpvkRvb1DaNyfRBX4I0W G1bXkkbuItkcaCtiEuozT4vbyXYez0ODAylavTT9AO89s9TCGUCq52Q7v9U9emZ8ZGO8 0ixeuALLMGp9IEpUREfGs5x88UQYFRFt6y8uYYsGi4TamiEBru8aSD7Fq54IkJ7wHUED Vt8ZH1TuoXEBaYTzzJsmhZBpBAIGNdEuTWEolCyfgUUSBnOpy6duLCJAafqlflsvYlNq KW3PjuXgCOhDRhkydqBFNjrTz/7OxQ/WGNlDaKSGDt7RD0EYbHaMidi6KEKKBkyM3jcv TIow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679146981; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FyfU1KJpQXcUs5jhogFBaoFTlgPH63DY/U4xjNHTWjQ=; b=E0XeXPX2/QylKLRdd6i4bG6Le8L9OMICgwdZeIeJeOhj5MWuiRg8MVFlcw3+cbtgp3 fNrdyKkYmnUfBjW9aFI9qFREtPhRK4TsM3HCScEUlOxHa9ToYlTfNShCA/57JAUyy4il Ohhe3gBRfaw3XlWognzyXJfc/TM/khqPolZmvXYxX/vYwcNFcq2X1188qsT7f8af/A3L yx52bse6jS9v8flF91P4sINl7uXvNTqkklxai3fegSkP1mbluNWt6ZX1qHP3ozjf/0D4 MUP2odGdsSGdo47ZoCqbVifxMEVwnJO1FxSGaVRAo3kMYD5R27lq8vPA6pNSfHSuLmS1 Tm/A== X-Gm-Message-State: AO0yUKU1wLE0HDXVKG7L8KviXr3MuWO7H/YJP+VXlSeROqhhKSz1iEY3 hmd4JQhol5M0saFnTHElw8l6LPE14BpvVpVD+m8= X-Received: by 2002:a05:6512:68:b0:4dd:a0f6:8f3b with SMTP id i8-20020a056512006800b004dda0f68f3bmr4918976lfo.15.1679146981212; Sat, 18 Mar 2023 06:43:01 -0700 (PDT) Received: from [192.168.1.101] (abym238.neoplus.adsl.tpnet.pl. [83.9.32.238]) by smtp.gmail.com with ESMTPSA id c2-20020a2e9d82000000b0029a0b50a34asm888367ljj.36.2023.03.18.06.42.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 06:43:00 -0700 (PDT) From: Konrad Dybcio Date: Sat, 18 Mar 2023 14:42:51 +0100 Subject: [PATCH v6 5/9] drm/msm/dsi: dsi_cfg: Merge SC7180 config into SDM845 MIME-Version: 1.0 Message-Id: <20230307-topic-dsi_qcm-v6-5-70e13b1214fa@linaro.org> References: <20230307-topic-dsi_qcm-v6-0-70e13b1214fa@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v6-0-70e13b1214fa@linaro.org> To: 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 Cc: 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, Marijn Suijten , Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1679146971; l=2206; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=+ePdH/Gl1hrkxIW7hm63Vg7SPtBJUhhLLi5EVaR0ltI=; b=w5Qh/YigwR8zbCdmDXGOkZlPU3gF9O6EA79QXQ5pTEeLd1VBTvHZNJbYrKDsfGCO2AS16d1bFlvD uVp8tqA5CgXbiLvyhr8IITU9ATLjE8GSafvPJ5cCcflMzSIQK9/y X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760713873711094986?= X-GMAIL-MSGID: =?utf-8?q?1760713873711094986?= 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. Reviewed-by: Dmitry Baryshkov Reviewed-by: Marijn Suijten 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 039f503233d7..03d98cbcc978 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 }, + { 0xae94000, 0xae96000 }, /* 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 }, - }, -}; - static const struct regulator_bulk_data sc7280_dsi_regulators[] = { { .supply = "vdda", .init_load_uA = 8350 }, /* 1.2 V */ }; @@ -291,7 +280,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,