From patchwork Sat Feb 11 11:51:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 55793 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1455222wrn; Sat, 11 Feb 2023 03:54:00 -0800 (PST) X-Google-Smtp-Source: AK7set9+uWcIe+xhy5T83S/aJ9kSktRq2uPiYdfjG4cchzSpuii4H6J2xR/vePhX6INL1ns4LnwW X-Received: by 2002:a17:906:830c:b0:878:5d46:9ed2 with SMTP id j12-20020a170906830c00b008785d469ed2mr18157139ejx.39.1676116440575; Sat, 11 Feb 2023 03:54:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676116440; cv=none; d=google.com; s=arc-20160816; b=h8u07ikWa366RJgG1vnXG17fofb7U5Dyf0FEyjo0zEVRL+VGRQTFZo+IMx9UX8b2+C vH8ypK3QRcdVrpZporO+FCa5mKQ+xCXAb9Jb0GqVSFaReqqh9QI9UQ6JgY6kZ097IaAA FB9xmnP+0U7Ps5u3kqxH78wiL2oW3HV/5+YNoe+3+88bwNVT7urmHq5Ax6GP1y6yTfdO vP9+UJ22K2VuRlBedl7Mm2WeQku4TdatI6apjEVclMoKoISIfbdeFwcwaIKT0J7/M9J6 +/SAJEWCbBMAFOBo6XxZlcDXntoDAxjXRKqaK8oc84/Ju84swTw3QSCUK/KyW05HCzXk H9vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Xu29OnoYbs7XlgjQ7eQ5Uic7usShH1dqxj/7r0Nr9hA=; b=ieExwGY6+yDbLEeBzt8xXkgjq4zt0bO8bDbOcMIVXw2mXC89Ay3TOjMGk9ZYDpvp7a HPdT//Cb0nMZ6DMZ49Tc1bhdKCd2t48y/qwDvwHFg2k4K6aBwFwxAqXxL3c9OHdE5P+M OeSjFXpXawc2tbhHfU3k9unJxgrI976/SGj08hVuLo5cafFeAdR95/NT7x6LLSENUaVd SA9wq8ZykgnpcX7FKg33a2deAVfuyH+yccX3DOijJkWHBlbDO8Rk3bvDTV4a+fUvy9HU tdldsGXWGMSjNgIFcDDT2S1TNK63HJ5E4nGUK8Pj7RfC0cLSZbQoAtoOufDRqIDblyFT jQSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Azhb35xQ; 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 wj13-20020a170907050d00b0088d5dc62a29si6345136ejb.200.2023.02.11.03.53.38; Sat, 11 Feb 2023 03:54:00 -0800 (PST) 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=Azhb35xQ; 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 S229601AbjBKLwh (ORCPT + 99 others); Sat, 11 Feb 2023 06:52:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230220AbjBKLwP (ORCPT ); Sat, 11 Feb 2023 06:52:15 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5061D28231 for ; Sat, 11 Feb 2023 03:52:04 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id d40so6069571eda.8 for ; Sat, 11 Feb 2023 03:52:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Xu29OnoYbs7XlgjQ7eQ5Uic7usShH1dqxj/7r0Nr9hA=; b=Azhb35xQfIkRkppUDbGElCHDXkOGIHdkj1Wv+qJ9Ee16d9Isac9HTm6yCOEXSMRLCI xtpA8d+cpYU/ZIYscQwv9uDWxWMpLgT1wl/6JirdYNKfZ/Jz9Tx7N22uGIBi/qZLhsed RTNgmdvFI/iWwkiySU9bWbkOtdvmIl/64w3c8qECr+fV/bkKxIoyjqvH6qofhw2pV+/B d/ul1NoifWxFv0E7kVA46uZOfWZLjGr8VHGUPlZFSY/h4XAnI7beO+Yw9V/3U5p/AP+q cF4JXHsznSlH+gNl632wsRfoqbsJu6QflbMJrhF8itMclgsZYKxRQ1sa1ht4EPSJccRM KL+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xu29OnoYbs7XlgjQ7eQ5Uic7usShH1dqxj/7r0Nr9hA=; b=mj3HztG6VUBmp6FhHPjxN11+u0m2GgirI0AUxYlz97hqn3ktSOIPvj0JOpRqBiV6q8 CQl+AgA1lQfM7DxGQMl1Kd3eJxLgTTgTo/CBniF3OcZI+YjtMeevnwJFRhXB873ebkGu jo/DL+CgpWXqb3LX3SMgI59zBN8Kkju7LWmNP+fJm6rL6LTyy3mXEZPBMHj7z6jhwpsr il+I+kN8dncsNNgMbLl4DLXOHNpsMfZ4AdtWcW/ewU+YBmhlkM4CWMTaXMRwMhNr92Tz 99g9tn+1Pr6B1Vigb1Pv67DP/iCoH9JeLWEVoW73ubdWePRs2IMswVFRrWEtOy4jLQ+A AqgA== X-Gm-Message-State: AO0yUKXzl0lHJFUQtiIirxonquUCUqdH3x3I9KoD3tyZsHS6qcIopoZ8 iZ8CmjeDxwTgN9MEhqG/cZ/bQg== X-Received: by 2002:a50:9f28:0:b0:4ab:b0d5:6bb0 with SMTP id b37-20020a509f28000000b004abb0d56bb0mr4200948edf.18.1676116322880; Sat, 11 Feb 2023 03:52:02 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id r10-20020a50d68a000000b004aabb714230sm3636070edi.35.2023.02.11.03.52.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 03:52:02 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , 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 Subject: [PATCH 06/10] drm/msm/dsi: dsi_cfg: Merge SC7180 config into SDM845 Date: Sat, 11 Feb 2023 12:51:06 +0100 Message-Id: <20230211115110.1462920-7-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211115110.1462920-1-konrad.dybcio@linaro.org> References: <20230211115110.1462920-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 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 autolearn=ham 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?1757535472573233246?= X-GMAIL-MSGID: =?utf-8?q?1757535472573233246?= 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") Signed-off-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- 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,