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 254B9C636D4 for ; Mon, 13 Feb 2023 12:11:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230475AbjBMML3 (ORCPT ); Mon, 13 Feb 2023 07:11:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230290AbjBMMKw (ORCPT ); Mon, 13 Feb 2023 07:10:52 -0500 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA4621A660 for ; Mon, 13 Feb 2023 04:10:32 -0800 (PST) Received: by mail-ej1-x636.google.com with SMTP id jg8so31298073ejc.6 for ; Mon, 13 Feb 2023 04:10:32 -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=5CCpIfLPbXHR0+gI6eH61855DNORB1t4V7ruf8s/UBM=; b=e6Aan7qtCOxr5uDXtDUzG8ZzspEzCH1OWMJ0ANGQcXzyajvonRNGcX6E0PQhMK4ubp EsPdEK1Wt604WHWLzA3gocqn/O1Yq94/qGEba8CgTeyagFyb7flx3QKyfofC3W/xkCgX o+sXtRr2XFkzKQ1IHWlOe974Tx8NyoXi7U1wDyvxRwE9dY5XiLtkhS4ZD1H0NH8ZWpoL QmsZQtnpFQUC6s9T5aIBzqb3aZSSAp8pptCpVljhu8TnskssVtGavxxFQh6KU+/uJ2Ku jWqb8xl9JCMUm2kAVGuq7rgS1xyblVvB4EaXZwNwCI1JYGR/a6KtL9g0vx2gUxCoc6p/ BErQ== 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=5CCpIfLPbXHR0+gI6eH61855DNORB1t4V7ruf8s/UBM=; b=DnLyK0tZevfI3va01/AjQXt4PpzWQxdHo7/zDEGWXw1y2iyBkYPZnaPLbMs3efrXzE FdKr9j6pxo+aRTZ9vs89OmX+gaCjKf+DRs3rNZEc3Q0JqyWPQyaSE1107TjBHmdqcP5l ha/RchqQg6qQQAH8G1Po3nGsk6y6AvcsU+nb80lYy+uPHKmDMtUpmqto/z3TrHeDSei6 OPX9zpsU+HkCW9qCSxZCXqqO8sgLI3EhQBJZ/XcdqvQ9pn8icmF1tmfC7vuRBMGXJtYV MUhrNovDTQVD7l5WWmhlvbzlb5IRJUs/cEpkxd0J+ujy1kl0yZKdsbfEM+dC+q0Pvbdt CiBw== X-Gm-Message-State: AO0yUKUx/N6YWQ1n4OxBNQCrgwqxf5YWXsu4A7f1KYIzaQjbf14mdUD/ Q1jeAlGPRqgXkOHOQKAMvTrCzw== X-Google-Smtp-Source: AK7set9FUwNWxLhIYL/63n4aMNiaV4/BAVMRT1B+FTa/0pk9vzPH8kUQq52WhJU8S50AgOqvsrqlYw== X-Received: by 2002:a17:906:584:b0:888:6294:a1fa with SMTP id 4-20020a170906058400b008886294a1famr24306942ejn.14.1676290230754; Mon, 13 Feb 2023 04:10:30 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id dt19-20020a170906b79300b0088ed7de4821sm6651586ejb.158.2023.02.13.04.10.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 04:10:30 -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 , Dmitry Baryshkov , Rob Clark , Abhinav Kumar , Sean Paul , David Airlie , Daniel Vetter , Douglas Anderson , Loic Poulain , Neil Armstrong , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/9] drm/msm/dsi: dsi_cfg: Merge SC7180 config into SDM845 Date: Mon, 13 Feb 2023 13:10:08 +0100 Message-Id: <20230213121012.1768296-6-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230213121012.1768296-1-konrad.dybcio@linaro.org> References: <20230213121012.1768296-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 d39521850018..6d4b2ce4b918 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 */ }; @@ -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, -- 2.39.1