From nobody Sat Apr 11 14:30:46 2026 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 E6A9FC6FD1E for ; Tue, 7 Mar 2023 13:01:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230011AbjCGNB4 (ORCPT ); Tue, 7 Mar 2023 08:01:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229830AbjCGNBq (ORCPT ); Tue, 7 Mar 2023 08:01:46 -0500 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B23FE0 for ; Tue, 7 Mar 2023 05:01:45 -0800 (PST) Received: by mail-lf1-x12c.google.com with SMTP id m6so16956350lfq.5 for ; Tue, 07 Mar 2023 05:01:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678194103; 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=ZBjV0MIGjzxWCA4dde9ccbuSp/4SeZ0AfFye0IJguH0=; b=S8K842lXW/grOayUPiw1/stytcPwZSZw0ib3Rwy0G8TyU3BoqzW3i8GNnezA75iJe0 F7HbbM9q2lxbK5+c3ta6HNsfVLqMBtL+CzPhG4mIP/5W7xIU+socPmju4EYLTcIUOU79 +zj5AxGzs7WfjpWK/llomuMJ7Vp3dns4XOpOPPDLIZvJPcHMrWMDIkpBBQ0DVaik4aeC Myyy6/XxwQ8T9XVXJbWlX0/rC6juLAo+ZwwGNEAbopbofiS91kTYa9nKLJpyw/MP7lHw P0jWblIUN56/EU3Een7Ib8YU0ugO5btmCZdq2y6MOVR/gimEISu0JfHR37i7PelEw5ig eetg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678194103; 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=ZBjV0MIGjzxWCA4dde9ccbuSp/4SeZ0AfFye0IJguH0=; b=tOdsln8xU9V4QNhnqKo2oLkYj9mokFmraK53j+m3ZKZontw3Rm9G25btdCW3KtE15R v+7mdXNzqng8G93FUQEGUdwOcQEG/BLGs+THUjR8ZBRvGxTYElCI8aZDl0gf5hvUjPem IQ3avtQAfRiO61ZzZzZZ2DZyOUAmv1cCdbw/uqeTkePLyHrmmkO1JtFJwZwzeQzK90AA 0dbcZZ5sJv0nV375YnGYt4jTgYw8SK+tPDr4tczJl4vLhurcNlu9BM+Pe53efV5GzIZT uaraUvAox+eEvkYeeDC09ZHIyNHujHRpnIJ82POtxDWpgWfvAXo6OTCwDOLyUYDunR2i 1WwQ== X-Gm-Message-State: AO0yUKUpBSBZ8tl+joaQB/eVOKDRuxa0dF6B+5DRMhCwgkGir/UFdjZy TaEczy12nybtzQEbWVq4aQdRow== X-Google-Smtp-Source: AK7set/BUtMgR4MG5rcNS3SZZlwGfqldYfAdp5uYc++c6d8LEm3HWAca8HOGIbFj8Oi5XqD7hswj6A== X-Received: by 2002:ac2:43aa:0:b0:4b5:6042:d136 with SMTP id t10-20020ac243aa000000b004b56042d136mr4125457lfl.22.1678194103253; Tue, 07 Mar 2023 05:01:43 -0800 (PST) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id u2-20020ac248a2000000b004cc5e97d356sm2048265lfg.148.2023.03.07.05.01.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 05:01:42 -0800 (PST) From: Konrad Dybcio Date: Tue, 07 Mar 2023 14:01:39 +0100 Subject: [PATCH v3 01/10] dt-bindings: display/msm: dsi-controller-main: Fix deprecated QCM2290 compatible MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230307-topic-dsi_qcm-v3-1-8bd7e1add38a@linaro.org> References: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@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, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678194100; l=1022; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=yadLtYUd+NaBlrHtthnWah/BoxxYiya5SpI6g5dSH5k=; b=VXFbvloo8L6tf6wwoMkScWR9GbZ6ztU3t6q9TPy+AM8ughrYGsc0FKWNJHCSqgBFQH3zp2bjnBiP 1u/l49IqAkFsvhNRiqUfofrrCrYY3xmsfHQCG0TIA5f8YQPX277W X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The qcom, prefix was missed previously. Fix it. Fixes: 0c0f65c6dd44 ("dt-bindings: msm: dsi-controller-main: Add compatible= strings for every current SoC") Acked-by: Rob Herring Signed-off-by: Konrad Dybcio Reviewed-by: Marijn Suijten --- Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml | 2= +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-m= ain.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-mai= n.yaml index e75a3efe4dac..2494817c1bd6 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml @@ -33,7 +33,7 @@ properties: - const: qcom,mdss-dsi-ctrl - items: - enum: - - dsi-ctrl-6g-qcm2290 + - qcom,dsi-ctrl-6g-qcm2290 - const: qcom,mdss-dsi-ctrl deprecated: true =20 --=20 2.39.2 From nobody Sat Apr 11 14:30:46 2026 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 876A4C6FA99 for ; Tue, 7 Mar 2023 13:02:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230016AbjCGNCB (ORCPT ); Tue, 7 Mar 2023 08:02:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229892AbjCGNBt (ORCPT ); Tue, 7 Mar 2023 08:01:49 -0500 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA5317A8E for ; Tue, 7 Mar 2023 05:01:46 -0800 (PST) Received: by mail-lf1-x132.google.com with SMTP id i28so17038419lfv.0 for ; Tue, 07 Mar 2023 05:01:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678194105; 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=wx65b6tHAAIHsJSsttrbtRIwIAX7Thn6gXbFwUEFkEQ=; b=vTU/OzncrcdvHDBc0YWnwoMNXNf+pFhP2l9Ep80IBtqVAJzJGMcfis0sLnAGf3EjGX SbzGAM8ipRiuTjDY/y/gMpQq7MNtS3D2M0ur2reHgySdAPyktewCFMBhZKmPSlJQCEmi mSwT5yXYq0tiaCP7w9x+dIe3hpHB6gZfsxXWDNCLr/kEGHJorKAF6d1/1GQeUD0psfsF 4SdMFGr63jJCwKUTl0us7+4bqHjUTjsuhXLQFUNINJSIkNs8+7IRxzq8UbFgQi/qKVnv vkJzZsK/757eOebOp/6L0VQueLY04Pg/cy65aV3F/B9UXYyfUjBXaavdRQgBbYMgc3hm uOUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678194105; 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=wx65b6tHAAIHsJSsttrbtRIwIAX7Thn6gXbFwUEFkEQ=; b=T3s7TPMCqKPUftnl0T9Bfk1hzi5PMLjobSmHLUgawg3irCjZ+DZqTb9w2Z+il4qLoQ ff37SScl2z4hSJVSMsLRjMT1omQj1OUNn8LtsJqUYWQMpkRFZwy9keYdVkGnwPpdhJ9M vVKpli/uPz1K5uKiva+ElLFvb3+tg63GUC3zLQ99bPwWYGl53WVkqqd6py2Haruakohm T4/Uqat49WAO9u4K0thxuhurTRctX1W6fvD5SOlAFeemp9pKujMQ8ih/sgujZ6LBq55S Vg+ZOqHBHS4FFDAY7lFul5hC4rXNVPxuUUZVnwmYMM6FLLv5RKy+GkkEy4yHGS2f4GcF 5iPw== X-Gm-Message-State: AO0yUKW92i8gNHjPaV9VANnzlJ39IGQ2TwAAyZfhAaKV/eP5QvIejEue jccsbm/NrZP0gorJOZ7WvD9YvA== X-Google-Smtp-Source: AK7set9jrafvwImhbea+2NwdNxYqe4InfqnkSApRE2IgoEMsIZXl/6vpS8pkuH8DPFUBiaTVGwjYEg== X-Received: by 2002:ac2:4a85:0:b0:4b9:f5e5:8fb4 with SMTP id l5-20020ac24a85000000b004b9f5e58fb4mr3722068lfp.3.1678194104784; Tue, 07 Mar 2023 05:01:44 -0800 (PST) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id u2-20020ac248a2000000b004cc5e97d356sm2048265lfg.148.2023.03.07.05.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 05:01:44 -0800 (PST) From: Konrad Dybcio Date: Tue, 07 Mar 2023 14:01:40 +0100 Subject: [PATCH v3 02/10] drm/msm/dsi: Get rid of msm_dsi_config::num_dsi MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230307-topic-dsi_qcm-v3-2-8bd7e1add38a@linaro.org> References: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@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, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678194100; l=5659; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=qNGmgSDARDPbwjPqlQOeXVvCmCFaveBX4Casc6DHvz4=; b=JDj2+PYyZuOr5jZ965RePL4Lo0u91NdEH45hK5STufYOKg86qRx38/3S1k7lX7SCnycYHyDnYs1b 9Oui7tGTDVChv+I92HbrRBMdFLxeIejvcvXgjh0IpAssADzHnRoG X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation for supporting multiple sets of possible base registers, remove the num_dsi variable. We're comparing the io_start array contents with the reg value from the DTS, so it will either match one of the expected values or don't match against a zero (which we get from partial array initialization). Reviewed-by: Dmitry Baryshkov Signed-off-by: Konrad Dybcio Reviewed-by: Marijn Suijten --- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 13 ------------- drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 - drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/ds= i_cfg.c index 6d21f0b33411..4515f52b407a 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -22,7 +22,6 @@ static const struct msm_dsi_config apq8064_dsi_cfg =3D { .bus_clk_names =3D dsi_v2_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_v2_bus_clk_names), .io_start =3D { 0x4700000, 0x5800000 }, - .num_dsi =3D 2, }; =20 static const char * const dsi_6g_bus_clk_names[] =3D { @@ -42,7 +41,6 @@ static const struct msm_dsi_config msm8974_apq8084_dsi_cf= g =3D { .bus_clk_names =3D dsi_6g_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_6g_bus_clk_names), .io_start =3D { 0xfd922800, 0xfd922b00 }, - .num_dsi =3D 2, }; =20 static const char * const dsi_8916_bus_clk_names[] =3D { @@ -61,7 +59,6 @@ static const struct msm_dsi_config msm8916_dsi_cfg =3D { .bus_clk_names =3D dsi_8916_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_8916_bus_clk_names), .io_start =3D { 0x1a98000 }, - .num_dsi =3D 1, }; =20 static const char * const dsi_8976_bus_clk_names[] =3D { @@ -80,7 +77,6 @@ static const struct msm_dsi_config msm8976_dsi_cfg =3D { .bus_clk_names =3D dsi_8976_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_8976_bus_clk_names), .io_start =3D { 0x1a94000, 0x1a96000 }, - .num_dsi =3D 2, }; =20 static const struct regulator_bulk_data msm8994_dsi_regulators[] =3D { @@ -99,7 +95,6 @@ static const struct msm_dsi_config msm8994_dsi_cfg =3D { .bus_clk_names =3D dsi_6g_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_6g_bus_clk_names), .io_start =3D { 0xfd998000, 0xfd9a0000 }, - .num_dsi =3D 2, }; =20 static const char * const dsi_8996_bus_clk_names[] =3D { @@ -119,7 +114,6 @@ static const struct msm_dsi_config msm8996_dsi_cfg =3D { .bus_clk_names =3D dsi_8996_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_8996_bus_clk_names), .io_start =3D { 0x994000, 0x996000 }, - .num_dsi =3D 2, }; =20 static const char * const dsi_msm8998_bus_clk_names[] =3D { @@ -138,7 +132,6 @@ static const struct msm_dsi_config msm8998_dsi_cfg =3D { .bus_clk_names =3D dsi_msm8998_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_msm8998_bus_clk_names), .io_start =3D { 0xc994000, 0xc996000 }, - .num_dsi =3D 2, }; =20 static const char * const dsi_sdm660_bus_clk_names[] =3D { @@ -156,7 +149,6 @@ static const struct msm_dsi_config sdm660_dsi_cfg =3D { .bus_clk_names =3D dsi_sdm660_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_sdm660_bus_clk_names), .io_start =3D { 0xc994000, 0xc996000 }, - .num_dsi =3D 2, }; =20 static const char * const dsi_sdm845_bus_clk_names[] =3D { @@ -178,7 +170,6 @@ static const struct msm_dsi_config sdm845_dsi_cfg =3D { .bus_clk_names =3D dsi_sdm845_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_sdm845_bus_clk_names), .io_start =3D { 0xae94000, 0xae96000 }, - .num_dsi =3D 2, }; =20 static const struct regulator_bulk_data sm8550_dsi_regulators[] =3D { @@ -192,7 +183,6 @@ static const struct msm_dsi_config sm8550_dsi_cfg =3D { .bus_clk_names =3D dsi_sdm845_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_sdm845_bus_clk_names), .io_start =3D { 0xae94000, 0xae96000 }, - .num_dsi =3D 2, }; =20 static const struct regulator_bulk_data sc7180_dsi_regulators[] =3D { @@ -206,7 +196,6 @@ static const struct msm_dsi_config sc7180_dsi_cfg =3D { .bus_clk_names =3D dsi_sc7180_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_sc7180_bus_clk_names), .io_start =3D { 0xae94000 }, - .num_dsi =3D 1, }; =20 static const char * const dsi_sc7280_bus_clk_names[] =3D { @@ -224,7 +213,6 @@ static const struct msm_dsi_config sc7280_dsi_cfg =3D { .bus_clk_names =3D dsi_sc7280_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_sc7280_bus_clk_names), .io_start =3D { 0xae94000, 0xae96000 }, - .num_dsi =3D 2, }; =20 static const char * const dsi_qcm2290_bus_clk_names[] =3D { @@ -242,7 +230,6 @@ static const struct msm_dsi_config qcm2290_dsi_cfg =3D { .bus_clk_names =3D dsi_qcm2290_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_qcm2290_bus_clk_names), .io_start =3D { 0x5e94000 }, - .num_dsi =3D 1, }; =20 static const struct msm_dsi_host_cfg_ops msm_dsi_v2_host_ops =3D { diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.h b/drivers/gpu/drm/msm/dsi/ds= i_cfg.h index 44be4a88aa83..6b6b16c5fd25 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.h +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.h @@ -39,7 +39,6 @@ struct msm_dsi_config { const char * const *bus_clk_names; const int num_bus_clks; const resource_size_t io_start[DSI_MAX]; - const int num_dsi; }; =20 struct msm_dsi_host_cfg_ops { diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/d= si_host.c index 18fa30e1e858..9021f0d65515 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -1868,7 +1868,7 @@ static int dsi_host_get_id(struct msm_dsi_host *msm_h= ost) if (!res) return -EINVAL; =20 - for (i =3D 0; i < cfg->num_dsi; i++) { + for (i =3D 0; i < DSI_MAX; i++) { if (cfg->io_start[i] =3D=3D res->start) return i; } --=20 2.39.2 From nobody Sat Apr 11 14:30:46 2026 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 D6B90C678D4 for ; Tue, 7 Mar 2023 13:02:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230037AbjCGNCE (ORCPT ); Tue, 7 Mar 2023 08:02:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229897AbjCGNBu (ORCPT ); Tue, 7 Mar 2023 08:01:50 -0500 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34314C15F for ; Tue, 7 Mar 2023 05:01:48 -0800 (PST) Received: by mail-lf1-x12e.google.com with SMTP id d36so13799055lfv.8 for ; Tue, 07 Mar 2023 05:01:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678194106; 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=tKiXCG4bbxlqg4TZuhn1lShaquHQ+BPuyW0xhFs0ICg=; b=tZaZP0FyqV0gNReyC679bi8CT0Th0omgS+EoRTEnAD3riOmZsa+mcSjJyqcfkWH4Ao IvJ9m82jdcjokfNRv3cT+rqdJ1o/OZlV7d669NyXq8esHk+jllnLcGB4khEBa00+gMda +t8fPDutFT07fVECMCXLY48Rzqg/1ut1axARViYSSCqAn+cDA7uhmo1mKuT3WGhlMHIk bAu5VC8ChDxF2CdoshgXTrGAxGDLm/HZ7R+9+RWPRRZfVAkuTPo4fUFdLpnVkpFHqYYH B8gUOLGDThhN/UzwJyYf3TIukCW1XxPeqaMai/ZeYJk9K1OLINUAW5Zpu/wTj6hh+j+t uV7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678194106; 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=tKiXCG4bbxlqg4TZuhn1lShaquHQ+BPuyW0xhFs0ICg=; b=sQBMRTNk0xIJuuc3MNiWQUW+EFM35smpmsBlu3hkwnWKmkO9stfRsXc72AhhGO3ROc sKGjKaATcsmGUGIbHYiiqeAseRxm4EuIKA/7if4aWQ5M2hGOVKDkv5mAymFrdhpsSSD5 9jnwXpTvRlTDOrdj1Ie6bPZ6uic1v0ZDj0fNa2bue2DwT1nYy5duMJg2uKKsvMImE/bW YJLebJ19+FWgAl4QAW6gndevnhslFkqDRpqP19lE5CO9w+UZ+wFM3tIqdgwEbBlWH8N3 WMotj406VIS4ZAx9wAFKFVWnHe/rDwFYMxw4JIvxhSNvnAei3CGMm4CVgG8edGpsxV// RncQ== X-Gm-Message-State: AO0yUKXjCnf4jTeoTGFou90jXVNc5N7UWX7nYQ/Jv3AQHbNrcDSpNB7w S5XyylJZH0YwphW3FU7E4T7tuQ== X-Google-Smtp-Source: AK7set9yRiUK/gXCYxKRurzVGUKwD21wl9+qwBpUD/i/i5FnRraWO9ocW4u/sbjG+BEe3iFx6irhZA== X-Received: by 2002:a19:5212:0:b0:4d5:a0d2:f542 with SMTP id m18-20020a195212000000b004d5a0d2f542mr4223293lfb.18.1678194106320; Tue, 07 Mar 2023 05:01:46 -0800 (PST) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id u2-20020ac248a2000000b004cc5e97d356sm2048265lfg.148.2023.03.07.05.01.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 05:01:46 -0800 (PST) From: Konrad Dybcio Date: Tue, 07 Mar 2023 14:01:41 +0100 Subject: [PATCH v3 03/10] drm/msm/dsi: Fix DSI index detection when version clash occurs MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230307-topic-dsi_qcm-v3-3-8bd7e1add38a@linaro.org> References: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@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, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678194100; l=8155; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=CgPPBWXxtg/cf0U+pXW2+cQoa7CuqDjjXQcr9orrQS4=; b=qXiUBICAvOwDvzHakzzS9oTY5TbLxWE4fBJrqxuJMvESTctvtTtRBrZD/bUOi1pHRYNJd0udFTwB iSLiiAU/B0xoMvN7kRKd+BKOoP3lsU6zQk4WmZx2hTiUiKxm+WWr X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, we allow for MAX_DSI entries in io_start to facilitate for MAX_DSI number of DSI hosts at different addresses. The configuration is matched against the DSI CTRL hardware revision read back from the component. We need a way to resolve situations where multiple SoCs with different register maps may use the same version of DSI CTRL. In preparation to do so, make msm_dsi_config a 2d array where each entry represents a set of configurations adequate for a given SoC. This is totally fine to do, as the only differentiating factors between same-version-different-SoCs configurations are the number of DSI hosts (1 or 2, at least as of today) and the set of base registers. The regulator setup is the same, because the DSI hardware is the same, regardless of the SoC it was implemented in. In addition to that, update the matching logic such that it will loop over VARIANTS_MAX variants, making sure they are all taken into account. Reviewed-by: Dmitry Baryshkov Signed-off-by: Konrad Dybcio Reviewed-by: Marijn Suijten --- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 52 ++++++++++++++++++++++++++++------= ---- drivers/gpu/drm/msm/dsi/dsi_cfg.h | 5 +++- drivers/gpu/drm/msm/dsi/dsi_host.c | 10 ++++---- 3 files changed, 48 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/ds= i_cfg.c index 4515f52b407a..6c192963c100 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -21,7 +21,9 @@ static const struct msm_dsi_config apq8064_dsi_cfg =3D { .num_regulators =3D ARRAY_SIZE(apq8064_dsi_regulators), .bus_clk_names =3D dsi_v2_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_v2_bus_clk_names), - .io_start =3D { 0x4700000, 0x5800000 }, + .io_start =3D { + { 0x4700000, 0x5800000 }, + }, }; =20 static const char * const dsi_6g_bus_clk_names[] =3D { @@ -40,7 +42,9 @@ static const struct msm_dsi_config msm8974_apq8084_dsi_cf= g =3D { .num_regulators =3D ARRAY_SIZE(msm8974_apq8084_regulators), .bus_clk_names =3D dsi_6g_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_6g_bus_clk_names), - .io_start =3D { 0xfd922800, 0xfd922b00 }, + .io_start =3D { + { 0xfd922800, 0xfd922b00 }, + }, }; =20 static const char * const dsi_8916_bus_clk_names[] =3D { @@ -58,7 +62,9 @@ static const struct msm_dsi_config msm8916_dsi_cfg =3D { .num_regulators =3D ARRAY_SIZE(msm8916_dsi_regulators), .bus_clk_names =3D dsi_8916_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_8916_bus_clk_names), - .io_start =3D { 0x1a98000 }, + .io_start =3D { + { 0x1a98000 }, + }, }; =20 static const char * const dsi_8976_bus_clk_names[] =3D { @@ -76,7 +82,9 @@ static const struct msm_dsi_config msm8976_dsi_cfg =3D { .num_regulators =3D ARRAY_SIZE(msm8976_dsi_regulators), .bus_clk_names =3D dsi_8976_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_8976_bus_clk_names), - .io_start =3D { 0x1a94000, 0x1a96000 }, + .io_start =3D { + { 0x1a94000, 0x1a96000 }, + }, }; =20 static const struct regulator_bulk_data msm8994_dsi_regulators[] =3D { @@ -94,7 +102,9 @@ static const struct msm_dsi_config msm8994_dsi_cfg =3D { .num_regulators =3D ARRAY_SIZE(msm8994_dsi_regulators), .bus_clk_names =3D dsi_6g_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_6g_bus_clk_names), - .io_start =3D { 0xfd998000, 0xfd9a0000 }, + .io_start =3D { + { 0xfd998000, 0xfd9a0000 }, + }, }; =20 static const char * const dsi_8996_bus_clk_names[] =3D { @@ -113,7 +123,9 @@ static const struct msm_dsi_config msm8996_dsi_cfg =3D { .num_regulators =3D ARRAY_SIZE(msm8996_dsi_regulators), .bus_clk_names =3D dsi_8996_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_8996_bus_clk_names), - .io_start =3D { 0x994000, 0x996000 }, + .io_start =3D { + { 0x994000, 0x996000 }, + }, }; =20 static const char * const dsi_msm8998_bus_clk_names[] =3D { @@ -131,7 +143,9 @@ static const struct msm_dsi_config msm8998_dsi_cfg =3D { .num_regulators =3D ARRAY_SIZE(msm8998_dsi_regulators), .bus_clk_names =3D dsi_msm8998_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_msm8998_bus_clk_names), - .io_start =3D { 0xc994000, 0xc996000 }, + .io_start =3D { + { 0xc994000, 0xc996000 }, + }, }; =20 static const char * const dsi_sdm660_bus_clk_names[] =3D { @@ -148,7 +162,9 @@ static const struct msm_dsi_config sdm660_dsi_cfg =3D { .num_regulators =3D ARRAY_SIZE(sdm660_dsi_regulators), .bus_clk_names =3D dsi_sdm660_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_sdm660_bus_clk_names), - .io_start =3D { 0xc994000, 0xc996000 }, + .io_start =3D { + { 0xc994000, 0xc996000 }, + }, }; =20 static const char * const dsi_sdm845_bus_clk_names[] =3D { @@ -169,7 +185,9 @@ static const struct msm_dsi_config sdm845_dsi_cfg =3D { .num_regulators =3D ARRAY_SIZE(sdm845_dsi_regulators), .bus_clk_names =3D dsi_sdm845_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_sdm845_bus_clk_names), - .io_start =3D { 0xae94000, 0xae96000 }, + .io_start =3D { + { 0xae94000, 0xae96000 }, + }, }; =20 static const struct regulator_bulk_data sm8550_dsi_regulators[] =3D { @@ -182,7 +200,9 @@ static const struct msm_dsi_config sm8550_dsi_cfg =3D { .num_regulators =3D ARRAY_SIZE(sm8550_dsi_regulators), .bus_clk_names =3D dsi_sdm845_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_sdm845_bus_clk_names), - .io_start =3D { 0xae94000, 0xae96000 }, + .io_start =3D { + { 0xae94000, 0xae96000 }, + }, }; =20 static const struct regulator_bulk_data sc7180_dsi_regulators[] =3D { @@ -195,7 +215,9 @@ static const struct msm_dsi_config sc7180_dsi_cfg =3D { .num_regulators =3D ARRAY_SIZE(sc7180_dsi_regulators), .bus_clk_names =3D dsi_sc7180_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_sc7180_bus_clk_names), - .io_start =3D { 0xae94000 }, + .io_start =3D { + { 0xae94000 }, + }, }; =20 static const char * const dsi_sc7280_bus_clk_names[] =3D { @@ -212,7 +234,9 @@ static const struct msm_dsi_config sc7280_dsi_cfg =3D { .num_regulators =3D ARRAY_SIZE(sc7280_dsi_regulators), .bus_clk_names =3D dsi_sc7280_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_sc7280_bus_clk_names), - .io_start =3D { 0xae94000, 0xae96000 }, + .io_start =3D { + { 0xae94000, 0xae96000 }, + }, }; =20 static const char * const dsi_qcm2290_bus_clk_names[] =3D { @@ -229,7 +253,9 @@ static const struct msm_dsi_config qcm2290_dsi_cfg =3D { .num_regulators =3D ARRAY_SIZE(qcm2290_dsi_cfg_regulators), .bus_clk_names =3D dsi_qcm2290_bus_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_qcm2290_bus_clk_names), - .io_start =3D { 0x5e94000 }, + .io_start =3D { + { 0x5e94000 }, + }, }; =20 static const struct msm_dsi_host_cfg_ops msm_dsi_v2_host_ops =3D { diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.h b/drivers/gpu/drm/msm/dsi/ds= i_cfg.h index 6b6b16c5fd25..8772a3631ac1 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.h +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.h @@ -32,13 +32,16 @@ =20 #define DSI_6G_REG_SHIFT 4 =20 +/* Maximum number of configurations matched against the same hw revision */ +#define VARIANTS_MAX 2 + struct msm_dsi_config { u32 io_offset; const struct regulator_bulk_data *regulator_data; int num_regulators; const char * const *bus_clk_names; const int num_bus_clks; - const resource_size_t io_start[DSI_MAX]; + const resource_size_t io_start[VARIANTS_MAX][DSI_MAX]; }; =20 struct msm_dsi_host_cfg_ops { diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/d= si_host.c index 9021f0d65515..9cfb9e91bfea 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -1862,16 +1862,16 @@ static int dsi_host_get_id(struct msm_dsi_host *msm= _host) struct platform_device *pdev =3D msm_host->pdev; const struct msm_dsi_config *cfg =3D msm_host->cfg_hnd->cfg; struct resource *res; - int i; + int i, j; =20 res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "dsi_ctrl"); if (!res) return -EINVAL; =20 - for (i =3D 0; i < DSI_MAX; i++) { - if (cfg->io_start[i] =3D=3D res->start) - return i; - } + for (i =3D 0; i < VARIANTS_MAX; i++) + for (j =3D 0; j < DSI_MAX; j++) + if (cfg->io_start[i][j] =3D=3D res->start) + return j; =20 return -EINVAL; } --=20 2.39.2 From nobody Sat Apr 11 14:30:46 2026 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 BC612C678D5 for ; Tue, 7 Mar 2023 13:02:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229967AbjCGNCH (ORCPT ); Tue, 7 Mar 2023 08:02:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229905AbjCGNBu (ORCPT ); Tue, 7 Mar 2023 08:01:50 -0500 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 749B6CA1E for ; Tue, 7 Mar 2023 05:01:48 -0800 (PST) Received: by mail-lf1-x12a.google.com with SMTP id s22so16929585lfi.9 for ; Tue, 07 Mar 2023 05:01:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678194108; 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=fjTJZiNd6R83QWqXCKgFPnIkCB7wIuy8qVdIkOb07TA=; b=B0jnwDviZ8EhOE7w6tWBqfeMLopMAcGiR608LOWDrRlR71R/bUdHkK4NtwW1OSjIee wctBeCLwXMGGrHYgvZzrcpUq7hsaQEjSKlTgr9ebz4dnkvAU5+upgCR6Als1+52C1QfE o4E5ZDH/DHsKwQZcaUPcUT1tZfzLf+9pvamao/jhCtrlTYyNe7F2RMMFU5Gnl9tAHtDO GYpWBgyFvdK0k/Yor7A6QVguoMEzmC737ORKGShwOoBaTo2Q9ZIySmwiO2hYAmAKhd+f u+ca3oM3i9HJEAVTxukn64qusfJd4ZmgcY83cuOgNAhh+ty9COwF+utK8MkO4dAjITcG Y4kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678194108; 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=fjTJZiNd6R83QWqXCKgFPnIkCB7wIuy8qVdIkOb07TA=; b=0tFwZ2TIwHvdBIwOM2kLENPg7zVEfY2Q99fo75D6dlV2wsTcdvH1dQewcjUnGj29xc bRGOo18UkJwLgPsOEre9IkYqlA7b1cdzMJDNapovdcAzniZLW851u+X5qiZkEk7RoWCQ aMwsfyh1cXoZCuHR2rANtWYhR+PzucZmirjd5FhAWsAYBVzJrI0E3feArXgDjFiOBzIv 2QhayT1RTl80GtPTY9gR1cXFw7N6hiQqL2Gqm10EJgkqPGoeaEcOiJtWT9WsychNLYTj X7Fn/h22OhXGzxDMnq3i2RGrzZRLtpZFxtO7Os6LTasRzkULX/67b1yzFSEE1JYB0OU/ UHRQ== X-Gm-Message-State: AO0yUKWPzXmfu7nNUI8ukYRQpWDSdDoazVcqhNoZabKNV5CDgKPibWTC xuK+VDcbtehyaM2mY2YZxiJV0A== X-Google-Smtp-Source: AK7set+kayW1sZVFsTQr5RJ5KKxF+jK3HOLp1DlOBTi9s24WW5X7rv6EvopWoHue1ql2b0ghxnumKw== X-Received: by 2002:ac2:51c4:0:b0:4cc:53e3:771d with SMTP id u4-20020ac251c4000000b004cc53e3771dmr3975638lfm.64.1678194107831; Tue, 07 Mar 2023 05:01:47 -0800 (PST) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id u2-20020ac248a2000000b004cc5e97d356sm2048265lfg.148.2023.03.07.05.01.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 05:01:47 -0800 (PST) From: Konrad Dybcio Date: Tue, 07 Mar 2023 14:01:42 +0100 Subject: [PATCH v3 04/10] drm/msm/dsi: dsi_cfg: Deduplicate identical structs MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230307-topic-dsi_qcm-v3-4-8bd7e1add38a@linaro.org> References: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@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, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678194100; l=6178; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=FOznmitAnsxsxj/BCqVtxW8B1SKled4a7NwV407MWtY=; b=f50KP8xbmhZ1EHJCTyYfLubVlBW91cQUMunNAqQmHzGh11J7Agpwyyq0/osuTb3ZQdJKJ1Gbo6yO fqhhu507Dcd6Fo6Fo7cfObXUR9ivMkYpImKBOFeUGS3jbTarxfzt X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some structs were defined multiple times for no apparent reason. Deduplicate them. Reviewed-by: Dmitry Baryshkov Signed-off-by: Konrad Dybcio 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/ds= i_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 =3D { }, }; =20 -static const char * const dsi_8916_bus_clk_names[] =3D { +static const char * const dsi_v1_3_1_clk_names[] =3D { "mdp_core", "iface", "bus", }; =20 -static const struct regulator_bulk_data msm8916_dsi_regulators[] =3D { +static const struct regulator_bulk_data dsi_v1_3_1_regulators[] =3D { { .supply =3D "vdda", .init_load_uA =3D 100000 }, /* 1.2 V */ { .supply =3D "vddio", .init_load_uA =3D 100000 }, /* 1.8 V */ }; =20 static const struct msm_dsi_config msm8916_dsi_cfg =3D { .io_offset =3D DSI_6G_REG_SHIFT, - .regulator_data =3D msm8916_dsi_regulators, - .num_regulators =3D ARRAY_SIZE(msm8916_dsi_regulators), - .bus_clk_names =3D dsi_8916_bus_clk_names, - .num_bus_clks =3D ARRAY_SIZE(dsi_8916_bus_clk_names), + .regulator_data =3D dsi_v1_3_1_regulators, + .num_regulators =3D ARRAY_SIZE(dsi_v1_3_1_regulators), + .bus_clk_names =3D dsi_v1_3_1_clk_names, + .num_bus_clks =3D ARRAY_SIZE(dsi_v1_3_1_clk_names), .io_start =3D { { 0x1a98000 }, }, }; =20 -static const char * const dsi_8976_bus_clk_names[] =3D { - "mdp_core", "iface", "bus", -}; - -static const struct regulator_bulk_data msm8976_dsi_regulators[] =3D { - { .supply =3D "vdda", .init_load_uA =3D 100000 }, /* 1.2 V */ - { .supply =3D "vddio", .init_load_uA =3D 100000 }, /* 1.8 V */ -}; - static const struct msm_dsi_config msm8976_dsi_cfg =3D { .io_offset =3D DSI_6G_REG_SHIFT, - .regulator_data =3D msm8976_dsi_regulators, - .num_regulators =3D ARRAY_SIZE(msm8976_dsi_regulators), - .bus_clk_names =3D dsi_8976_bus_clk_names, - .num_bus_clks =3D ARRAY_SIZE(dsi_8976_bus_clk_names), + .regulator_data =3D dsi_v1_3_1_regulators, + .num_regulators =3D ARRAY_SIZE(dsi_v1_3_1_regulators), + .bus_clk_names =3D dsi_v1_3_1_clk_names, + .num_bus_clks =3D ARRAY_SIZE(dsi_v1_3_1_clk_names), .io_start =3D { { 0x1a94000, 0x1a96000 }, }, @@ -107,10 +98,6 @@ static const struct msm_dsi_config msm8994_dsi_cfg =3D { }, }; =20 -static const char * const dsi_8996_bus_clk_names[] =3D { - "mdp_core", "iface", "bus", "core_mmss", -}; - static const struct regulator_bulk_data msm8996_dsi_regulators[] =3D { { .supply =3D "vdda", .init_load_uA =3D 18160 }, /* 1.25 V */ { .supply =3D "vcca", .init_load_uA =3D 17000 }, /* 0.925 V */ @@ -121,8 +108,8 @@ static const struct msm_dsi_config msm8996_dsi_cfg =3D { .io_offset =3D DSI_6G_REG_SHIFT, .regulator_data =3D msm8996_dsi_regulators, .num_regulators =3D ARRAY_SIZE(msm8996_dsi_regulators), - .bus_clk_names =3D dsi_8996_bus_clk_names, - .num_bus_clks =3D ARRAY_SIZE(dsi_8996_bus_clk_names), + .bus_clk_names =3D dsi_6g_bus_clk_names, + .num_bus_clks =3D ARRAY_SIZE(dsi_6g_bus_clk_names), .io_start =3D { { 0x994000, 0x996000 }, }, @@ -167,24 +154,20 @@ static const struct msm_dsi_config sdm660_dsi_cfg =3D= { }, }; =20 -static const char * const dsi_sdm845_bus_clk_names[] =3D { +static const char * const dsi_v2_4_clk_names[] =3D { "iface", "bus", }; =20 -static const char * const dsi_sc7180_bus_clk_names[] =3D { - "iface", "bus", -}; - -static const struct regulator_bulk_data sdm845_dsi_regulators[] =3D { +static const struct regulator_bulk_data dsi_v2_4_regulators[] =3D { { .supply =3D "vdda", .init_load_uA =3D 21800 }, /* 1.2 V */ }; =20 static const struct msm_dsi_config sdm845_dsi_cfg =3D { .io_offset =3D DSI_6G_REG_SHIFT, - .regulator_data =3D sdm845_dsi_regulators, - .num_regulators =3D ARRAY_SIZE(sdm845_dsi_regulators), - .bus_clk_names =3D dsi_sdm845_bus_clk_names, - .num_bus_clks =3D ARRAY_SIZE(dsi_sdm845_bus_clk_names), + .regulator_data =3D dsi_v2_4_regulators, + .num_regulators =3D ARRAY_SIZE(dsi_v2_4_regulators), + .bus_clk_names =3D dsi_v2_4_clk_names, + .num_bus_clks =3D ARRAY_SIZE(dsi_v2_4_clk_names), .io_start =3D { { 0xae94000, 0xae96000 }, }, @@ -198,32 +181,24 @@ static const struct msm_dsi_config sm8550_dsi_cfg =3D= { .io_offset =3D DSI_6G_REG_SHIFT, .regulator_data =3D sm8550_dsi_regulators, .num_regulators =3D ARRAY_SIZE(sm8550_dsi_regulators), - .bus_clk_names =3D dsi_sdm845_bus_clk_names, - .num_bus_clks =3D ARRAY_SIZE(dsi_sdm845_bus_clk_names), + .bus_clk_names =3D dsi_v2_4_clk_names, + .num_bus_clks =3D ARRAY_SIZE(dsi_v2_4_clk_names), .io_start =3D { { 0xae94000, 0xae96000 }, }, }; =20 -static const struct regulator_bulk_data sc7180_dsi_regulators[] =3D { - { .supply =3D "vdda", .init_load_uA =3D 21800 }, /* 1.2 V */ -}; - static const struct msm_dsi_config sc7180_dsi_cfg =3D { .io_offset =3D DSI_6G_REG_SHIFT, - .regulator_data =3D sc7180_dsi_regulators, - .num_regulators =3D ARRAY_SIZE(sc7180_dsi_regulators), - .bus_clk_names =3D dsi_sc7180_bus_clk_names, - .num_bus_clks =3D ARRAY_SIZE(dsi_sc7180_bus_clk_names), + .regulator_data =3D dsi_v2_4_regulators, + .num_regulators =3D ARRAY_SIZE(dsi_v2_4_regulators), + .bus_clk_names =3D dsi_v2_4_clk_names, + .num_bus_clks =3D ARRAY_SIZE(dsi_v2_4_clk_names), .io_start =3D { { 0xae94000 }, }, }; =20 -static const char * const dsi_sc7280_bus_clk_names[] =3D { - "iface", "bus", -}; - static const struct regulator_bulk_data sc7280_dsi_regulators[] =3D { { .supply =3D "vdda", .init_load_uA =3D 8350 }, /* 1.2 V */ }; @@ -232,8 +207,8 @@ static const struct msm_dsi_config sc7280_dsi_cfg =3D { .io_offset =3D DSI_6G_REG_SHIFT, .regulator_data =3D sc7280_dsi_regulators, .num_regulators =3D ARRAY_SIZE(sc7280_dsi_regulators), - .bus_clk_names =3D dsi_sc7280_bus_clk_names, - .num_bus_clks =3D ARRAY_SIZE(dsi_sc7280_bus_clk_names), + .bus_clk_names =3D dsi_v2_4_clk_names, + .num_bus_clks =3D ARRAY_SIZE(dsi_v2_4_clk_names), .io_start =3D { { 0xae94000, 0xae96000 }, }, --=20 2.39.2 From nobody Sat Apr 11 14:30:46 2026 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 14601C6FD1B for ; Tue, 7 Mar 2023 13:02:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229960AbjCGNCO (ORCPT ); Tue, 7 Mar 2023 08:02:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229913AbjCGNBw (ORCPT ); Tue, 7 Mar 2023 08:01:52 -0500 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD86720D2E for ; Tue, 7 Mar 2023 05:01:49 -0800 (PST) Received: by mail-lf1-x12d.google.com with SMTP id f18so16972901lfa.3 for ; Tue, 07 Mar 2023 05:01:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678194109; 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=55lMFXFd7GmMBP4PF1xB1lq9Cw+L1BmijVr1G6D/aP0=; b=fRfy53cEsWZ9faDm5Cd0zlm9rKYQXRpJVLFZt2OVknK3ljQGsqfc1ZQHGRstMJeatU OPNPlp0mlLvJU24T7Nyi8DLtqzcFambcmfWwoxANwdKOiJ65QD+CQO9PA2/l83lX8D11 S5anBLqxPqO+SvQKASzZmsVM83CV4tb83LwMfSs+zLGWggOAgOAMu6EFsexpad7x81Pc GSrwhcqCcXOxQO2j+/LxxXQzHyRjggC+mjiIZ+fXZIijnNGYN3u9OaKMiZ0Ii1+2Q8kB gCki9l2R1n6B1KK/Cid/IQf8Opf09tq/aIn3JN/BAPB3PtCUE7cB2LMgVBnNY6pM4W19 34AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678194109; 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=55lMFXFd7GmMBP4PF1xB1lq9Cw+L1BmijVr1G6D/aP0=; b=PRDWYDZIOHcfKr+Rz+RVV95IVyMfgDG2MbYYQniT2r+iaeaJfHPrkQK1nbqNB+UkYe UcI0WWSxE+HEHRbGTuvLT6//odIqjzGCo7E9SBwdeJi8n36dAJt8l8rT87n6JMxLk3aa YgibMjv51c2NcvYsI/pI0FcHWyMwAKEIvNuNAbApkGrp3vCIK1dSery8rHkERP4dJnRg PDq9of/SXfwU/rycbvGp6OqnTjMPOZLykOlM2TOEv9PUJIpTaESUIQ75rqf+r5l10tg8 Rj0r/dStNZhBWe/EfzPLmshJho00MxS1sN4Mufx5jNcHNgUtdbQqhjnZ7mUwSzHCG3mA OsQQ== X-Gm-Message-State: AO0yUKVycHRB1VVaZXl894r0fkmxoAvMHosqJUEEbmGO2XXsYyd9ltXj GigXudUzi4byWWfAg4Ugr+VD/w== X-Google-Smtp-Source: AK7set87sMy1FszPQ3DFVXd9IWgFz6raEtqYLt7QEcdv4tEsY/E1WspeaJtD9IFkiPEzi5szujvaZg== X-Received: by 2002:ac2:5df6:0:b0:4b5:964d:499e with SMTP id z22-20020ac25df6000000b004b5964d499emr3789572lfq.8.1678194109317; Tue, 07 Mar 2023 05:01:49 -0800 (PST) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id u2-20020ac248a2000000b004cc5e97d356sm2048265lfg.148.2023.03.07.05.01.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 05:01:49 -0800 (PST) From: Konrad Dybcio Date: Tue, 07 Mar 2023 14:01:43 +0100 Subject: [PATCH v3 05/10] drm/msm/dsi: dsi_cfg: Merge SC7180 config into SDM845 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230307-topic-dsi_qcm-v3-5-8bd7e1add38a@linaro.org> References: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@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, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678194100; l=2145; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=FABCSvB5sJjrFfkmtzbHoBqH7FB7e/a49B1A9lWjwfw=; b=TJaWnNwL/YZbaSACXrVBkph5QhvBKJ7DBK7miT7PVfOpKqHUafq2Dask7moFQVTIwwTzqjuhfKpq l3JDU3AHBjIqQEBaUWt+8I/wXLi5YvT06nylSKUYBAdJoiNNtp9y X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= 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 Reviewed-by: Marijn Suijten --- 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/ds= i_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 =3D { .bus_clk_names =3D dsi_v2_4_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_v2_4_clk_names), .io_start =3D { - { 0xae94000, 0xae96000 }, + { 0xae94000, 0xae96000 }, /* SDM845 / SDM670 / SC7180 */ }, }; =20 @@ -188,17 +188,6 @@ static const struct msm_dsi_config sm8550_dsi_cfg =3D { }, }; =20 -static const struct msm_dsi_config sc7180_dsi_cfg =3D { - .io_offset =3D DSI_6G_REG_SHIFT, - .regulator_data =3D dsi_v2_4_regulators, - .num_regulators =3D ARRAY_SIZE(dsi_v2_4_regulators), - .bus_clk_names =3D dsi_v2_4_clk_names, - .num_bus_clks =3D ARRAY_SIZE(dsi_v2_4_clk_names), - .io_start =3D { - { 0xae94000 }, - }, -}; - static const struct regulator_bulk_data sc7280_dsi_regulators[] =3D { { .supply =3D "vdda", .init_load_uA =3D 8350 }, /* 1.2 V */ }; @@ -299,7 +288,7 @@ static const struct msm_dsi_cfg_handler dsi_cfg_handler= s[] =3D { {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, --=20 2.39.2 From nobody Sat Apr 11 14:30:46 2026 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 D9C35C678D4 for ; Tue, 7 Mar 2023 13:02:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229685AbjCGNCT (ORCPT ); Tue, 7 Mar 2023 08:02:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229966AbjCGNBx (ORCPT ); Tue, 7 Mar 2023 08:01:53 -0500 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2E499ECA for ; Tue, 7 Mar 2023 05:01:52 -0800 (PST) Received: by mail-lf1-x131.google.com with SMTP id k14so16951119lfj.7 for ; Tue, 07 Mar 2023 05:01:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678194111; 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=Z5pR4WgQc9HEY23Sq27MPiR8dNOQq4AhkDDUyfnXpBY=; b=XYOHftSIp51QGOWt8pZnbNohm/ua6EviqPB6m4t9y82KxkeLLpu6FXhg0BMoMtOfP+ wGeaRgJX67bGunMG7D8KDOCzu9lc0CH6yS3vnzOK6qZ8cQbG/TZAfOZonn/kaEdQqgK2 9MKmb68hxXIYNG33hZy4OT/Jc+Y6szJ/YxDNCKxLmV9DmlFuRv2cwhwuQ7oMRfwMhhut TD54ZdsdgOfSP7YNk3EI8YDyYNXwYsgcgABSfh2nBjoOgMHw1J7/cVeTufSuW5dAKbP6 RHb14Cvun18zBgcN8l3bazXC9VPVmQ7qBJhb9M+EeBTiv7CkwjGVWsnkfibZpPzvUukI J05Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678194111; 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=Z5pR4WgQc9HEY23Sq27MPiR8dNOQq4AhkDDUyfnXpBY=; b=XHdet4+il66R4biAS10OEux7rOwDweKhpXbVQUwpPY8banO1N/+Tk9ACGylAedIC7z rVpndQzWbSIsiY+WxAPHJinHMMjrBnoIsNoNgJemjlrCJgcN/lGFnWtA20NozEp2VDhO FJRdCg7i1AhTVYuZ7emIspT6jK4jGT7hPb3DSK3akU7Fvx/wKUvvh3SPU9OvN7nUwMZY 36o/8xI9ydkz12shuEcoQQ/hWKw3lLKDS9yJ6mwggFLHMP2pYjCR3ubDam21agedOUJi gHk/AdCi8EqXpQan4pN1HWQoh4wMVlzkxZ3Yo7I85yHs7OA2DTP29UsJc/aYQpuPNo/9 Ewtw== X-Gm-Message-State: AO0yUKV9ROGr8PX/p8y1PLjYQ/OATy4ilmS5cVEQLhvJZSCtsGZ5Qgil z5XhEar0ubJa7AvOUphJZ9ZVYw== X-Google-Smtp-Source: AK7set8Tfe55LLhyLRQRBQYWkb+wwuPfq7m3hjK7jkiG2ZCjWLSQParDWJpsDC2F6uq0c6EgnqLAxQ== X-Received: by 2002:ac2:508b:0:b0:4dc:4afe:1622 with SMTP id f11-20020ac2508b000000b004dc4afe1622mr4328016lfm.42.1678194110798; Tue, 07 Mar 2023 05:01:50 -0800 (PST) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id u2-20020ac248a2000000b004cc5e97d356sm2048265lfg.148.2023.03.07.05.01.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 05:01:50 -0800 (PST) From: Konrad Dybcio Date: Tue, 07 Mar 2023 14:01:44 +0100 Subject: [PATCH v3 06/10] drm/msm/dsi: Switch the QCM2290-specific compatible to index autodetection MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230307-topic-dsi_qcm-v3-6-8bd7e1add38a@linaro.org> References: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@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, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678194100; l=2792; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=tOEY+naDG6ZngTYbV5QlUfaQyGkhOYqaG0FLMZ1065Y=; b=7jAUGQvPullBMwXQ4AJI84UFe2g79Mwjf6UICr6eBwcWViJdA3EVgmN0zMVGHhzYo//BQAq/Zfhm bJxtNnOhBXFWLwYm0jrEYOJY1Y2yTQz06FI1GGIAhqU27ujHOUd4 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the logic can handle multiple sets of registers, move the QCM2290 to the common logic and mark it deprecated. This allows us to remove a couple of structs, saving some memory. Reviewed-by: Dmitry Baryshkov Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/dsi/dsi.c | 4 +++- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 28 ++-------------------------- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 31fdee2052be..90d43628b22b 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -174,7 +174,9 @@ static int dsi_dev_remove(struct platform_device *pdev) =20 static const struct of_device_id dt_match[] =3D { { .compatible =3D "qcom,mdss-dsi-ctrl", .data =3D NULL /* autodetect cfg = */ }, - { .compatible =3D "qcom,dsi-ctrl-6g-qcm2290", .data =3D &qcm2290_dsi_cfg_= handler }, + + /* Deprecated, don't use */ + { .compatible =3D "qcom,dsi-ctrl-6g-qcm2290", .data =3D NULL }, {} }; =20 diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/ds= i_cfg.c index 6d4b2ce4b918..29ccd755cc2e 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -169,7 +169,8 @@ static const struct msm_dsi_config sdm845_dsi_cfg =3D { .bus_clk_names =3D dsi_v2_4_clk_names, .num_bus_clks =3D ARRAY_SIZE(dsi_v2_4_clk_names), .io_start =3D { - { 0xae94000, 0xae96000 }, /* SDM845 / SDM670 / SC7180 */ + { 0xae94000, 0xae96000 }, /* SDM845 / SDM670 */ + { 0x5e94000 }, /* QCM2290 / SM6115 / SM6125 / SM6375 */ }, }; =20 @@ -203,25 +204,6 @@ static const struct msm_dsi_config sc7280_dsi_cfg =3D { }, }; =20 -static const char * const dsi_qcm2290_bus_clk_names[] =3D { - "iface", "bus", -}; - -static const struct regulator_bulk_data qcm2290_dsi_cfg_regulators[] =3D { - { .supply =3D "vdda", .init_load_uA =3D 21800 }, /* 1.2 V */ -}; - -static const struct msm_dsi_config qcm2290_dsi_cfg =3D { - .io_offset =3D DSI_6G_REG_SHIFT, - .regulator_data =3D qcm2290_dsi_cfg_regulators, - .num_regulators =3D ARRAY_SIZE(qcm2290_dsi_cfg_regulators), - .bus_clk_names =3D dsi_qcm2290_bus_clk_names, - .num_bus_clks =3D ARRAY_SIZE(dsi_qcm2290_bus_clk_names), - .io_start =3D { - { 0x5e94000 }, - }, -}; - static const struct msm_dsi_host_cfg_ops msm_dsi_v2_host_ops =3D { .link_clk_set_rate =3D dsi_link_clk_set_rate_v2, .link_clk_enable =3D dsi_link_clk_enable_v2, @@ -312,9 +294,3 @@ const struct msm_dsi_cfg_handler *msm_dsi_cfg_get(u32 m= ajor, u32 minor) =20 return cfg_hnd; } - -/* Non autodetect configs */ -const struct msm_dsi_cfg_handler qcm2290_dsi_cfg_handler =3D { - .cfg =3D &qcm2290_dsi_cfg, - .ops =3D &msm_dsi_6g_v2_host_ops, -}; --=20 2.39.2 From nobody Sat Apr 11 14:30:46 2026 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 6AECAC678D5 for ; Tue, 7 Mar 2023 13:02:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230181AbjCGNC2 (ORCPT ); Tue, 7 Mar 2023 08:02:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230005AbjCGNB4 (ORCPT ); Tue, 7 Mar 2023 08:01:56 -0500 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25ED73756E for ; Tue, 7 Mar 2023 05:01:54 -0800 (PST) Received: by mail-lf1-x129.google.com with SMTP id j11so16890179lfg.13 for ; Tue, 07 Mar 2023 05:01:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678194112; 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=7PaidmNsI4X4+HjLVSO/Mw/Vgb1gA+84W9VJP5fzGmw=; b=ybDeVf3o3AYMMPETLq2Rdp9UGraYIOlwXEM3om7QZZEOw1tG4ydNiM9rck7drBz1h0 jWEFVmcl/EKs/NL/y1jVMDZ49zWO7OBk4um0M0rK9XpMSU7r8RZG17JZIxmgQ6hmXKA1 /jDMG8WfHpNXWlGxHtJrAP/YQeCgxwGS/Tw5baoUbjUo8glTUO0xB5AUpDZ92/0kwt7+ Sh99yfvUMkuPgHA+uCbGtpApsCwT9j1U0kUGYA6nyFASz+kT6rT0TzFm3NfXubj+9+7H P1kJMStI5ESo46W0i1Za41E43Fqd2IOOTtWplXoKOocoX7tGl1tnkvilQleSmdrFDGIy 495A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678194112; 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=7PaidmNsI4X4+HjLVSO/Mw/Vgb1gA+84W9VJP5fzGmw=; b=Eu1UQRcJv2UuLRfrKNSR0AU8OZ+f8FH45SO1nQcE+Aqc8Bnwo7ajgcwLjS2n1SIOId U2RT8//GraEo6OplpSTbCYlHNqKLlCNVOBCP8K+cSKl0eh/H7DyNibxr5uG9MPVxt6ke bKm2mGOUtlovrh6r5DtlXjwMaCvnQbzyFhMXxfPdDCgS0qtbKyX0hByMpnPnYv1STVh1 K4vBKsbFGqPAKvhlrj82zoj2zjMtbrRCWrjZJpvPMzU3toJt+9g0I8MnaGsE9FTAJGoY sFqYwmTtDNzFI2Z/DqO6p+V3jpy+BGBUgNqQLOKTGm5/JMkZsY62mHDMNqEkLcdtyiqN R1nA== X-Gm-Message-State: AO0yUKVr85DdT+KlkScfRwkbqjvHni4sHZCX7x8VptnIxRutZFj37s3w bpE9MvWCd0B2EmYLk5gbbU5pJw== X-Google-Smtp-Source: AK7set86logaWA856+uKhpszQ0hgdJdLY0fLjfYHHI2H8Bw8JAPRe3fTlXWXmcU0Ng9gw9NRXSTViw== X-Received: by 2002:ac2:5dfb:0:b0:4d5:8f3e:7852 with SMTP id z27-20020ac25dfb000000b004d58f3e7852mr4051427lfq.49.1678194112386; Tue, 07 Mar 2023 05:01:52 -0800 (PST) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id u2-20020ac248a2000000b004cc5e97d356sm2048265lfg.148.2023.03.07.05.01.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 05:01:51 -0800 (PST) From: Konrad Dybcio Date: Tue, 07 Mar 2023 14:01:45 +0100 Subject: [PATCH v3 07/10] drm/msm/dsi: Remove custom DSI config handling MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230307-topic-dsi_qcm-v3-7-8bd7e1add38a@linaro.org> References: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@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, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678194100; l=1669; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=x9eSVOGZMp5LDI1BiTB/gmaSF0y+os8hsi63E66yEQw=; b=SE4rbaWLt+hWaIAtC7Qt02TIAq4KXSrCYpl8fpJ4Mi/B1KvuDGHtJetP3PvPm2tCvYDkNx2j6kcR POEjl9jlCTiSdZQTrezBPqu+t3WWg1iGpvdUwufC2NSGmldNRviD X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the only user is handled by common code, remove the option to specify custom handlers through match data. This is effectively a revert of commit: 5ae15e76271 ("drm/msm/dsi: Allow to specify dsi config as pdata") Reviewed-by: Dmitry Baryshkov Signed-off-by: Konrad Dybcio Reviewed-by: Marijn Suijten --- drivers/gpu/drm/msm/dsi/dsi.c | 4 ++-- drivers/gpu/drm/msm/dsi/dsi_host.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 90d43628b22b..e0b911af618d 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -173,10 +173,10 @@ static int dsi_dev_remove(struct platform_device *pde= v) } =20 static const struct of_device_id dt_match[] =3D { - { .compatible =3D "qcom,mdss-dsi-ctrl", .data =3D NULL /* autodetect cfg = */ }, + { .compatible =3D "qcom,mdss-dsi-ctrl" }, =20 /* Deprecated, don't use */ - { .compatible =3D "qcom,dsi-ctrl-6g-qcm2290", .data =3D NULL }, + { .compatible =3D "qcom,dsi-ctrl-6g-qcm2290" }, {} }; =20 diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/d= si_host.c index 9cfb9e91bfea..961689a255c4 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -214,10 +214,6 @@ static const struct msm_dsi_cfg_handler *dsi_get_confi= g( int ret; u32 major =3D 0, minor =3D 0; =20 - cfg_hnd =3D device_get_match_data(dev); - if (cfg_hnd) - return cfg_hnd; - ahb_clk =3D msm_clk_get(msm_host->pdev, "iface"); if (IS_ERR(ahb_clk)) { pr_err("%s: cannot get interface clock\n", __func__); --=20 2.39.2 From nobody Sat Apr 11 14:30:46 2026 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 2C792C6FA99 for ; Tue, 7 Mar 2023 13:02:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230076AbjCGNCY (ORCPT ); Tue, 7 Mar 2023 08:02:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230007AbjCGNB4 (ORCPT ); Tue, 7 Mar 2023 08:01:56 -0500 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9512E3B0E8 for ; Tue, 7 Mar 2023 05:01:54 -0800 (PST) Received: by mail-lf1-x12a.google.com with SMTP id s22so16930124lfi.9 for ; Tue, 07 Mar 2023 05:01:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678194114; 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=CzTyTjVeEOwx0n8Fcur27AsP/7zLfRdjtQMUW7H4GE8=; b=Y1f+YlSj6leQtVLh4lCNFkqAnnKyFkvUu4KNMasglEwHsnWS1CWIDaXG7NV3c9WUpX NRiQgWMEX6piVxBRmiPzOJLCj9wq7Mndy58OUirCUh71Ng+EWAJp2N88aliHOiJBAM8E 7b+5iVUIMPTBh5XMzrbrJsAwhdEJ+pXbt4J/gOLoQl58q0//eingsEpM5Atz0mHjkfIL MVds9sbVXLf6OJi3DteMUbxILXRjYwf9FtQPM9Fh9Wbrp/DCvlxsZx8ZUbFrPa7tcRYE VAD1V182jVcf+x6kIIfb/LVWMkOiQ9MgZcBCAdKXMyruYXQzmOHE0jasp4f3/h/ddBQe mstA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678194114; 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=CzTyTjVeEOwx0n8Fcur27AsP/7zLfRdjtQMUW7H4GE8=; b=qsi+5ONP9YA8eeM4LkTX0ck6d0nhY9SOKkDzvZoQm3zj13/IU9B440ky9HOOSpMqaT MwuS5uKxxsWXDYHIDdSATuPk550WSmTwjfM7PkvRJtcnskqOqjHtm6jGNV+qGoXzJoe2 1K4SGm59WrcgAKSK/77EV67sOSS+XrYrXl3YOZxAkFDBG2W6dxqopaYfGgI1ttkuUdqi 3XmFacllVzCPG5h4viqCaHORG4l810i49NUAXuWiI05am/PrpTbPLu41KOzTLQgKa5ia Yjgrjjiq1jDFd8+ugYa1OpoYP3HekedS8KjQS5Qc4+4Bwg6U6Z45Zw6pDOubAffhd1jw DFkQ== X-Gm-Message-State: AO0yUKVPaDg/wy/v8f1YnqvCUdp5n8GYluqNFs85Q/Ep2VFkMlavNH70 PF4KZqpqRVDb9mlCRx1QFE9uLw== X-Google-Smtp-Source: AK7set8LRRjQl6lQLEVNGwZ+0gcThjUGm/9xpH5kwnxGoIMBR35JIMlsB+tSxqVDk6aJ4RD2FJiseA== X-Received: by 2002:ac2:5922:0:b0:4d6:ef7f:fc53 with SMTP id v2-20020ac25922000000b004d6ef7ffc53mr3535050lfi.34.1678194113951; Tue, 07 Mar 2023 05:01:53 -0800 (PST) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id u2-20020ac248a2000000b004cc5e97d356sm2048265lfg.148.2023.03.07.05.01.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 05:01:53 -0800 (PST) From: Konrad Dybcio Date: Tue, 07 Mar 2023 14:01:46 +0100 Subject: [PATCH v3 08/10] dt-bindings: display/msm: dsi-controller-main: Fix deprecated compatible MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230307-topic-dsi_qcm-v3-8-8bd7e1add38a@linaro.org> References: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@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, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678194100; l=1144; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=dS1N11h2C4bKZ0sJcpp7JilD8JmZ3GC3KRjbGbtwF6E=; b=j/CpsyJ5hcGj4Xtxf52pKDseNdb0oMAW4eomJS4lqedzemS1xNJgvbpmqQMJyYoFFERldyqiFvqY oNpwyFyeCer8XmHhcOK5oX/9ZOJQHICK1L5Zr8bg/kwTGDpgKXU2 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The point of the previous cleanup was to disallow "qcom,mdss-dsi-ctrl" alone. This however didn't quite work out and the property became undocumented instead of deprecated. Fix that. Fixes: 0c0f65c6dd44 ("dt-bindings: msm: dsi-controller-main: Add compatible= strings for every current SoC") Signed-off-by: Konrad Dybcio Reviewed-by: Marijn Suijten --- Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml | 2= +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-m= ain.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-mai= n.yaml index 2494817c1bd6..94f4cdf88c95 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml @@ -34,7 +34,7 @@ properties: - items: - enum: - qcom,dsi-ctrl-6g-qcm2290 - - const: qcom,mdss-dsi-ctrl + - qcom,mdss-dsi-ctrl # This should always come with an SoC-s= pecific compatible deprecated: true =20 reg: --=20 2.39.2 From nobody Sat Apr 11 14:30:46 2026 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 B54A7C678D5 for ; Tue, 7 Mar 2023 13:02:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230217AbjCGNCd (ORCPT ); Tue, 7 Mar 2023 08:02:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230058AbjCGNCM (ORCPT ); Tue, 7 Mar 2023 08:02:12 -0500 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 755847A8E for ; Tue, 7 Mar 2023 05:01:56 -0800 (PST) Received: by mail-lf1-x12e.google.com with SMTP id s22so16930263lfi.9 for ; Tue, 07 Mar 2023 05:01:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678194116; 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=ZF+P+KuHxf5dBJTVkEyyKo/3JePMMypQFYOBYKOGgac=; b=gH11q8jaF2QSf5Mxc8Ar3BA3u6PQu60JC7bmQnGCqpawbd/wBQpe6X56ikR28DQqvY fZjF3Kl/eMBQ6j3aNYSMVuxpYVK+HmHDOOHPYnCiO/lPzyar7SJhqms0+AahzOARALLm /cccSx/plO2b1ZtNU4OGxKjvuRyUfgoTu5ZzevyCLBCgfy3hRXtGiG7xBPzazn/VvWLL Ux89C9F3uySfkMlacczhdxawRtzOA9yiTzSypGR0p+LU8jXiIuzvU9XLUbkleshIgDiE mWb+Mj7QmUsnFgpcZeJHnhGSHaXkICre1QPPlx32EGHUkJUp75oEHzexeEkTs2gGC0PP hqgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678194116; 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=ZF+P+KuHxf5dBJTVkEyyKo/3JePMMypQFYOBYKOGgac=; b=2jz5JHRSD6R9/Cr8hPClFWPcIKaSgyg9n/Ix2ASM0WCTsarHe0/osj0TDnH8Jn5Wtp Pbo2KfxU3GmoEIYfCXTDh+ley/0kUBOO1qRX2yqtQ/XfikFqnE+QYFGVV0NXpyB6Ss0j lFSOL+LpoYD8SYYWRFU2A0Kg78UbQa5Hyr7sCwa0v4TJPMgW0pl2/8xo+fC9plslju7H adFgrU4Q8oFl914QQUw6H3DxHwpB6/io/UOrmgsGGWVHCGl7hG1suvY0Be1a/BLWblLX Fr1W27FYG9cbPCI9hzmKyltxn9T79Qu/ovbS8jNRVaCj5L+AklWyW8pXIUESwfaOt8MQ YTKw== X-Gm-Message-State: AO0yUKWbwCI2d14ujCE6CVRIq0gW7PLviXsQUFtLb07/Rcq5yS0lMCiN r6W7S5YQ27/mf5AzCpccWtsUZA== X-Google-Smtp-Source: AK7set9xw8Dw5H4iw9qKZOv6rmUxjR22BePQJRIxzWdIatHaLcBQewJoS0t1ZGrUSx58OCfrYzITkg== X-Received: by 2002:ac2:46f8:0:b0:4e0:a7cb:33fd with SMTP id q24-20020ac246f8000000b004e0a7cb33fdmr3402725lfo.27.1678194115481; Tue, 07 Mar 2023 05:01:55 -0800 (PST) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id u2-20020ac248a2000000b004cc5e97d356sm2048265lfg.148.2023.03.07.05.01.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 05:01:55 -0800 (PST) From: Konrad Dybcio Date: Tue, 07 Mar 2023 14:01:47 +0100 Subject: [PATCH v3 09/10] dt-bindings: display/msm: dsi-controller-main: Add SM6115 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230307-topic-dsi_qcm-v3-9-8bd7e1add38a@linaro.org> References: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@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, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678194100; l=1973; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=zfDVyzhXwH/WgE9j+QCB1vVza9+Omo+GX8sYcEeMzLs=; b=/RRmg0u5dKuyfv+1AQdnxpgBD4qmZ80GyzHiRnbNGFbB1XB8KCKMCe+pvq6H+onFvB4GUudLNBA4 dtnsYpKEBrXGhsLdy4zycKMVWSnnt7ctlAPE2Dw8ZsHOpD+zd1Mr X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a compatible for the DSI on SM6115. Signed-off-by: Konrad Dybcio Acked-by: Rob Herring --- .../devicetree/bindings/display/msm/dsi-controller-main.yaml | 2 ++ .../devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml | 8 ++++= +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-m= ain.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-mai= n.yaml index 94f4cdf88c95..d534451c8f7f 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml @@ -25,6 +25,7 @@ properties: - qcom,sc7280-dsi-ctrl - qcom,sdm660-dsi-ctrl - qcom,sdm845-dsi-ctrl + - qcom,sm6115-dsi-ctrl - qcom,sm8150-dsi-ctrl - qcom,sm8250-dsi-ctrl - qcom,sm8350-dsi-ctrl @@ -351,6 +352,7 @@ allOf: contains: enum: - qcom,sdm845-dsi-ctrl + - qcom,sm6115-dsi-ctrl then: properties: clocks: diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss= .yaml b/Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml index 2491cb100b33..605b1f654d78 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml @@ -40,7 +40,13 @@ patternProperties: type: object properties: compatible: - const: qcom,dsi-ctrl-6g-qcm2290 + oneOf: + - items: + - const: qcom,sm6115-dsi-ctrl + - const: qcom,mdss-dsi-ctrl + - description: Old binding, please don't use + deprecated: true + const: qcom,dsi-ctrl-6g-qcm2290 =20 "^phy@[0-9a-f]+$": type: object --=20 2.39.2 From nobody Sat Apr 11 14:30:46 2026 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 6C54CC6FA99 for ; Tue, 7 Mar 2023 13:02:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230115AbjCGNCg (ORCPT ); Tue, 7 Mar 2023 08:02:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230085AbjCGNCO (ORCPT ); Tue, 7 Mar 2023 08:02:14 -0500 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B94D743924 for ; Tue, 7 Mar 2023 05:01:57 -0800 (PST) Received: by mail-lf1-x12e.google.com with SMTP id d36so13799905lfv.8 for ; Tue, 07 Mar 2023 05:01:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678194117; 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=ut4TSC+Pm5nzJkEcVTKrAQ4k73YguRqK0sCMCjuGo+M=; b=RctBDUqYGaVBaAXQf5/lse6b4+tNd03LMZwng8E/TBLAQUmEE5N66KheYcYYmKp2ht kOSzCu0nMnFVhY1vTG6YJHSgwI8/8K+R9sXn9mmQ51LqCK0aqDWzpRKWdA1NJpW6VzJ+ yZhicAGZ1Why6iRCQ00SZNqhyw8fAGhSdztQ1UEKaEYxrR7Rc1J/yE9S0Sm+k+1wUrEv pyPzfDonMbse1nMFTLryoyxJIej73IdfydVzvfOc3njvNk9lu4sVtHYe6M59tERvzo1t F31fGmrPRWsDvFqWqw6mDAx1GPMa63V3bCynZH4Y1R0oFHVWKZAKyCrQSQ+03P8g1ySJ UAvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678194117; 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=ut4TSC+Pm5nzJkEcVTKrAQ4k73YguRqK0sCMCjuGo+M=; b=vtmNoS0kJm73r6Apd6aOcWZ8ejA0I273gJGvAlazYQh4+adCpAsPNIt6RcLlYoduHb XCJbwtsKLKVAdecEO3y0KlorPdDPUfkgQRoGGewpgsTxJu0MoyspkUYO91eEsEERXZW7 wB+jrfsqFwz3vnbrzYASohZcgkP3iLc/+DPE2+mZ9h7PdKwoOCS6kI12LIbamAPaf9ZC 2deQYb9afgu0LcgwIUcscRb36bu1k/OD/jgA+L6n/Zqob7Dbh5Agc233RRhxEeT8Sh+Y 4zTWdFL0JKlhtuPHxoc5k37gG96Vy/ZpDbC2EYKqIACiN1WK4U6Jz6umFFiXctWhSSFj zT9A== X-Gm-Message-State: AO0yUKWC+wOQoRel9QQqVDDt2eJsO75WNKcygG8d8gIujicVi3mla/Pb GNR1mdRN2+Sb591N1hJfzv8TAQ== X-Google-Smtp-Source: AK7set9QFz3KRQJXUKWAKcSHi9uuaSO2igyVSU9CwQNTpt9S6qAlxCJmvrWEsgumpGjaPbhvrd//tg== X-Received: by 2002:ac2:44ca:0:b0:4df:7586:cc3a with SMTP id d10-20020ac244ca000000b004df7586cc3amr4114540lfm.5.1678194116959; Tue, 07 Mar 2023 05:01:56 -0800 (PST) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id u2-20020ac248a2000000b004cc5e97d356sm2048265lfg.148.2023.03.07.05.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 05:01:56 -0800 (PST) From: Konrad Dybcio Date: Tue, 07 Mar 2023 14:01:48 +0100 Subject: [PATCH v3 10/10] arm64: dts: qcom: sm6115: Use the correct DSI compatible MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230307-topic-dsi_qcm-v3-10-8bd7e1add38a@linaro.org> References: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@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, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678194100; l=774; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=+M7SeQ5R6naG5dqrsHPHLQ1roECLpDh+fCC/guUalJs=; b=uUDF9bfXttb4MlshbWaj4RoQrPAaqam2ks171eqq2ViQ+Fp+8e7De9vuIHXKvzypvVuVpo9pCPGz sHGReTBbADnojBvX1oHJF1d1QFDVvxIXHB8n8l5NDzbRrAL7cJej X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the non-deprecated, SoC-specific DSI compatible. Reviewed-by: Dmitry Baryshkov Signed-off-by: Konrad Dybcio Reviewed-by: Marijn Suijten --- arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qco= m/sm6115.dtsi index 4d6ec815b78b..26e2c7919961 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -1218,7 +1218,7 @@ opp-384000000 { }; =20 mdss_dsi0: dsi@5e94000 { - compatible =3D "qcom,dsi-ctrl-6g-qcm2290"; + compatible =3D "qcom,sm6115-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg =3D <0x0 0x05e94000 0x0 0x400>; reg-names =3D "dsi_ctrl"; =20 --=20 2.39.2