From nobody Wed Feb 11 13:07:43 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 99C86C76196 for ; Tue, 14 Mar 2023 12:18:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231679AbjCNMRw (ORCPT ); Tue, 14 Mar 2023 08:17:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230261AbjCNMPl (ORCPT ); Tue, 14 Mar 2023 08:15:41 -0400 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 0885CA2196 for ; Tue, 14 Mar 2023 05:14:40 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id j11so19694716lfg.13 for ; Tue, 14 Mar 2023 05:14:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678796047; 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=lGx1EMDayEFQk6t13uD2RfqUM6dmmVIVZCz4JA+bL8w=; b=IN4D0dhP51J73AC928u7PSOGfbeunpdQGStVAt9h5TmeX5jLgf3jc1Qa/gy/fZK6Rf U3mpgQfwm38HPzsY9Kf4DkAURMJxWEP/ntbQh2a1JcyLFhj6Vm3wJvkuEoM2pVWQCaIn +zva7ik68sjGdrQknoMnLiCOfAsKWxN4VCup2pvRffF15G715iSxAn9py66tK0GdPipw 2fo3Z0mzmvz7i1IBbTIg3MqJBGWhEYNlXspOnfr2nWwMOmidvMMkIeD8mlhIxvmBrSfL FAkd11d79Xw5O2GhunZCHWU3W82Xd127MAi/dVNmABpO/BWeTNQKleva78Sce9RdcCiw xT2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678796048; 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=lGx1EMDayEFQk6t13uD2RfqUM6dmmVIVZCz4JA+bL8w=; b=INIvsNjXqRdrtEnUZwuqhJqW30v7XoAR6+rDCSSwD8ivNLXFsPj08f/pQirrqYCfyy GtBbpDlmgI7IkZJB6DoivMnlqXLU29vgxsN680PHZUusUaCmTTPauYRbTZ2wNxmHeF8Q lzEQNhui/3vzGrjLMLoknizNjNAgM24oncs2pnbSm6YErYW08bOCGdfzfd/Hmc8kh50o 7B1zUWGRM1rZXLIG59jE9p1CTJv0AptaRsaXpZB//ItbM+7Sfn5bDWyKqp8SFEA7RI7H 9GGemliS8rjf3yxFp7So4i8VHJcNBzyrZ1du8ReKPGEVQaJ/XApwoygZQXK81uwIYasK XZ7A== X-Gm-Message-State: AO0yUKU2K0a3kGSsHtMW7Zp8BlZ26yEhwgq/FEORvKjtcfGrQkv2KdNv +IdHf9c/A6lVMlo26uMfsv9Bdw== X-Google-Smtp-Source: AK7set/x21eFLtkIzcXtSctCs+9iV+u8JWi6kLextIoc2FBRYXSouawHkM4p5diiyGBhkZyYNGsHoQ== X-Received: by 2002:ac2:52b2:0:b0:4de:290:1c08 with SMTP id r18-20020ac252b2000000b004de02901c08mr648482lfm.33.1678796047832; Tue, 14 Mar 2023 05:14:07 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id s4-20020a19ad44000000b004dda87ecae3sm379058lfd.246.2023.03.14.05.14.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 05:14:07 -0700 (PDT) From: Konrad Dybcio Date: Tue, 14 Mar 2023 13:13:39 +0100 Subject: [PATCH v4 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-v4-1-54b4898189cb@linaro.org> References: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@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=1678796043; l=1083; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=Eh63V3hQJ0V0iEgOzc+LSRnQ4e7sliZ5heAo7YfywsQ=; b=XMDG9U0mfUCsKS5AsCiZDdtg2eJBZV+LlYeluv9OhuVeZDwOILnyipcH8rhQ5vpe7w7s5pJr6Okm 8HksazrxAkfaybhRRFNJiYHqx9O4IjbB8/c2u2Uvs5KlBv01G+6r 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 Reviewed-by: Marijn Suijten Signed-off-by: Konrad Dybcio --- 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 Wed Feb 11 13:07:43 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 55290C7618B for ; Tue, 14 Mar 2023 12:18:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231217AbjCNMRq (ORCPT ); Tue, 14 Mar 2023 08:17:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231518AbjCNMPm (ORCPT ); Tue, 14 Mar 2023 08:15:42 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 494AEBB9F for ; Tue, 14 Mar 2023 05:14:42 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id x17so3599338lfu.5 for ; Tue, 14 Mar 2023 05:14:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678796050; 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=Ja37xKiglxJ/lPrUpuyUvSbThkrJV11m94PBRXq1WhI=; b=tAFGIb2nZ9WwZKAl0rcXm3E/b5KCbUoojtV+PDmfJxX7PyRePs/gdTA3JR6DqI43Jk AYejSzPLenTcpxdICHIx7kpGeYdHRGPkPgilCCpAIYCbyy+A8YpaDgH/fqnh0BpydopI flasDj8X2xIaP80r+z4rwLAUd+B4HOJp7sGGklJZd9d62fauVUhtiA8GQ/iqYHRiQI3+ Qf2e2phrbqq9sHrM/hTijY934fBnjehER7VfTutJKCNZuO7Fq+d/2obUGxilU5P5tyeM ygbHqKeZPE0rV25AaVzPpykFUiZ3D32WjPW9V8a5/YMjuTfXJ+q2s9ArJlM62woV9uS8 dA5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678796050; 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=Ja37xKiglxJ/lPrUpuyUvSbThkrJV11m94PBRXq1WhI=; b=uIuwTPKgkOnAJ9EFVyQjCkuNHQ2rYxjfbbXxRUlulPao5Uk2HXeE34fqwomGyEJEei l3n+ceFd/ieBqzRjdvUoW491sKRzfNp97HF784gfObXFMOkUwRfcq0ey9/tnTAZdvHwk +PXMw2vR3K91E/bXZVZgbLvxRljsPQJ7aVreW+SJpW+I7aZ2prO8aBZ6a6MN6N/WjZ/1 8i0u6WKTVtUmAl4PMmdExql1TJFk9zSpdgOjygOqIRlCRtESj181wheL7ozfTjRsmoch 65FI5jWIlKFlYFuoA76USU072tiyAaQ3Duyg7Wm6fKMnOmXwyPMZdIll+n0092cckuRD d8jg== X-Gm-Message-State: AO0yUKXW0f/zY++8UmbZoUDIU/Rr+bITZFPan74RaMwnbvgi/D7PsxGm b35IWQ4UDCl32BqS7JghPGO7AA== X-Google-Smtp-Source: AK7set8/DWUg2biOeLCpnQTNUDSGmQIIir579wZ1y8gEiKQizApwNot58/Tk837uJQlfUMb2qQ+gsA== X-Received: by 2002:a05:6512:961:b0:4df:830d:4a3a with SMTP id v1-20020a056512096100b004df830d4a3amr608954lft.23.1678796050307; Tue, 14 Mar 2023 05:14:10 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id s4-20020a19ad44000000b004dda87ecae3sm379058lfd.246.2023.03.14.05.14.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 05:14:09 -0700 (PDT) From: Konrad Dybcio Date: Tue, 14 Mar 2023 13:13:40 +0100 Subject: [PATCH v4 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-v4-2-54b4898189cb@linaro.org> References: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@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=1678796043; l=5720; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=nAK7VhpEOKQPVDoVxGmSH//l3jkm1AocrDNJW7zWKno=; b=VpM31BLq1jEywlgGpV5SjZd1zxKT75yYscC+ni0PHOpwRxoc66QKU/L3V3sdGveq78udj1bafY0N OBgb+BzJAEFnvB2b+NKyrRkTOyvBobUCPwBFZiNxMLuHRILUZEaq 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 Reviewed-by: Marijn Suijten Signed-off-by: Konrad Dybcio --- 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 Wed Feb 11 13:07:43 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 A77B5C7618E for ; Tue, 14 Mar 2023 12:18:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231993AbjCNMSS (ORCPT ); Tue, 14 Mar 2023 08:18:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231843AbjCNMPn (ORCPT ); Tue, 14 Mar 2023 08:15:43 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BEB9FF21 for ; Tue, 14 Mar 2023 05:14:46 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id br6so1558720lfb.11 for ; Tue, 14 Mar 2023 05:14:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678796052; 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=6mz7dhLEVkKzAk8Lkvywe3WYisGA69PWt7jvCUOITN8=; b=HGJihVuXqmaNpkKE6OASK6S8pCs+R6AVH7H+a3jtu7RHrbQzEgRdqH0BlJkqULB32g GB6xV5EBySMLF905ASruuUgYKcixd3WiPC59Iue5fcYzUUllW5oVQeDa7iIi9mfKzBz1 FG6CllYhNasXgN31QZSvOJXoBfcmAuv9JdJ/O91jGAhGUxX9Sa8dLLmAqnG0hQAVCwgk l3wYWgPz4vbSsB8s09Mf1eO9W7Vjf/8QcsBTKN2u2Qwkhy9q97ZBbQJGzBXePAMemdt9 i8xdYXGHTzY3VEIUsoCNAsBtvGNxi0A6SF+B3oKfmc1lc4LbxiRbL+MalUsvRd5IEOtR F+ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678796052; 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=6mz7dhLEVkKzAk8Lkvywe3WYisGA69PWt7jvCUOITN8=; b=KRVay8S+9F/G9u6xP98C90ynx069/yhBM/OZCThzyGTK1JDOj2xKF9cjYUWYDRbMp0 09AzsGw06Vp0J2ztI2R/Kpak9JNkPykdo0o+bdMkYTxVtwrc+YB1NJlVsP9aeEBAXwB+ FSqGZx2NTZLHB4FEUfbkvbqSQkZkWtdBdawNDRgiDUYE6KApeItN+kCSSQmu5e8EcwOU HbJ5cmO2f+hlDWpq4kEgdVozH+B1IaJXjWcxCClUIqyTqKraYj/w2QOSSzH1SlqyiNqN oH4OWDFad0zWbW7zrDVSf8QEhaEsUTFCtxqn565aCBLvKIyiSUnoX6S7VHaYICyO1nWQ ZXcA== X-Gm-Message-State: AO0yUKWghxlrrdmo8HYjwN5XEvKlc0vM6I7dVbZ++1/jAypa84X+6O6a bEVRWwxR+biFdUyH+sExMdehzQ== X-Google-Smtp-Source: AK7set9/eR+vXYLR2jRRXysbZqw/STovymXX2a5d9shKPi1P9OWEiH1K5UG1FFakSPtyBexRFkmTlQ== X-Received: by 2002:a19:ae0f:0:b0:4e1:8309:1db5 with SMTP id f15-20020a19ae0f000000b004e183091db5mr592261lfc.2.1678796052346; Tue, 14 Mar 2023 05:14:12 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id s4-20020a19ad44000000b004dda87ecae3sm379058lfd.246.2023.03.14.05.14.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 05:14:11 -0700 (PDT) From: Konrad Dybcio Date: Tue, 14 Mar 2023 13:13:41 +0100 Subject: [PATCH v4 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-v4-3-54b4898189cb@linaro.org> References: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@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=1678796043; l=8216; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=b+otjvnFVNWNHQbPO9HD+5KH7xMK3hiBo7WDBK4sSP4=; b=+W4gI1DVS2qhKB44WrWkHtiTTlIxlj6zFFaoObscMtR0m//6JucI1y5sm2XT4KBb55XhUODcxTz/ 5wqy092dA3bAHIx+a7fWm2nNnVCgXWds5cqHeLm0OKY5JhQBNCSS 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 Reviewed-by: Marijn Suijten Signed-off-by: Konrad Dybcio --- 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 Wed Feb 11 13:07:43 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 B8CB4C76196 for ; Tue, 14 Mar 2023 12:18:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232119AbjCNMSV (ORCPT ); Tue, 14 Mar 2023 08:18:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231877AbjCNMQU (ORCPT ); Tue, 14 Mar 2023 08:16:20 -0400 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 D0EF97B9AA for ; Tue, 14 Mar 2023 05:14:48 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id s22so19720597lfi.9 for ; Tue, 14 Mar 2023 05:14:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678796054; 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=64Eim4J+wnLNg16H207185gsYiLvTQ9YXeAiDAajBeo=; b=seJq/5MzQfU2HWFKBcSa9SkfFYf4qQ99zbyVEQbeUenCW5+3y8xSXLhPQqIh8wEqlS JHCLcZmERlRfm9b7ygurVGp2Q1MK7BEYcEQ1ehxAcO9UpQaVPfqn1F+Ei+vzTbA2zjhI mKGHOAMbaJSDhSMow4P2ET6HOTLBRqEqnnoqZfCvvqREkk0Zt3BHZgIhBXGjwYKqjm70 KtnlkJeOjFbMHVG0H9B6c7xo0vv7xtu+XkRuil83yvSJ7ISROMUzUNzPyNohrqcSEh0y KnXEayu6oebb3s4zwW6R3EaiYI2Y8VyDdIu0Gv9sLOJ1xzj5Wl2CQ4u/KaOwt2NHjTRg zXUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678796054; 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=64Eim4J+wnLNg16H207185gsYiLvTQ9YXeAiDAajBeo=; b=Gca9i655hzLaMDuZfdrvq0Tu56ZFSuBcr7iBBi3+oCHq3/toG2V+1pbmbaoCrv3gE3 UEB+sm7vaRgzxQjVHKV2Ny5rMJfmtZkftmmeDeN7N34cb3UJgDfggEycs41Mmsqybihp 3jakohlAB/iJyhi4FY6NFKBUkRcrB0d/AC1WKuv6DcWRnixLG0Uy4KnoVThsN9q/LnlW FHGhK3J+1ugCSWGcrZSJ2u0GWzp6U6SlEjr/OzSKcj6evrH+yIcDOCoCeVsmCailHrXD Wj8I5+0bUgjNdthVB4AhooQ7AmmOADrZuNGFzv9U2NAS9+NQ6F675ZcEjl8ab4GDgZgS ibzw== X-Gm-Message-State: AO0yUKXfG/SZmLq5c9KtBkY+uZ/N8ESKhpYOKV/JWWQrSflEXB+nQ99G 8QedzkZC+2VkIxuO6Q/y8bTVMQ== X-Google-Smtp-Source: AK7set9d2Cu4WRP1ETzDLSJ9yCpWSg3oMSMNjmkz0kQrMRvR0X00a3M+MLWyCQH/x1+UgOAqQmT7QA== X-Received: by 2002:ac2:5685:0:b0:4d4:fcdb:6454 with SMTP id 5-20020ac25685000000b004d4fcdb6454mr858114lfr.17.1678796054312; Tue, 14 Mar 2023 05:14:14 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id s4-20020a19ad44000000b004dda87ecae3sm379058lfd.246.2023.03.14.05.14.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 05:14:14 -0700 (PDT) From: Konrad Dybcio Date: Tue, 14 Mar 2023 13:13:42 +0100 Subject: [PATCH v4 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-v4-4-54b4898189cb@linaro.org> References: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@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=1678796043; l=7014; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=eQGewel5eMIUbnjRWU8o9jYKXbfa44urQPoDhCO0rnI=; b=FyVhROOoq9ftspfHBWr0zw7UexP/6KqtucfkH6saVhjSA38c9qfcOnAt1HMA5GjZobCgGDugJLfH R9fWKMI8Dxt8FxU+9maWv+oD03ps8bV30cmRAT+9ArexPUGguzwH 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 Reviewed-by: Marijn Suijten Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 93 +++++++++++++----------------------= ---- 1 file changed, 30 insertions(+), 63 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/ds= i_cfg.c index 6c192963c100..039f503233d7 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,27 +207,19 @@ 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 -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), + .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 { { 0x5e94000 }, }, --=20 2.39.2 From nobody Wed Feb 11 13:07:43 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 5BBDBC7618A for ; Tue, 14 Mar 2023 12:19:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232094AbjCNMSw (ORCPT ); Tue, 14 Mar 2023 08:18:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232025AbjCNMQf (ORCPT ); Tue, 14 Mar 2023 08:16:35 -0400 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 940D69545C for ; Tue, 14 Mar 2023 05:14:52 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id d36so19719143lfv.8 for ; Tue, 14 Mar 2023 05:14:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678796056; 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=pdn4SeDIFby6ImJU/zRU79g8OAJJqEZxUN3MkvHIVGImPYJ9wsKs3u9VMOaAr9qV77 +3P8JP2YgAUlgtKjCXpDOm6T9MNdJx1YGj8cCwvt0m9asErPxg6UtELTb5vkpj6+qpd7 OVUxDCKwtJf9MECXA+H1fkwo0y57I4m1/MCqe0kcaubQmmRydS0lkEDHh+YMtoTSq0HZ K7RtVe9maQc6YVfZ7MmrryNyQGIzhVO09QtpBq8OZb4HJfi4ZaLdX3E+jgZQnkV/6Q3e LMig87LVRaU7LLAPeyNFFPEUJDRKXLv6mPuJjgNb8xyMLYkaLCsb2eb0OH9Yk42X7frJ fnFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678796056; 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=KjOr2oFksMRrHXqFQZKeFREfGXAAmNubschxCiSEkZpmH5KdG9g08Fa+23K/3z3aYY vs8EXFVf6EPJh80wxYbKRgdbZLmZ5YpAaU2FY/RZERXVjEp7UPUQlafl/IJWKF/r5h5D asgVB1JBEP2xxPhunnPWoPekT/jz/4mNZNyt/52Nih2g12arrkgsqiLlcptoGFAcylV1 Pv3tdo/Ep6b72NGS4a0MM4qo09GAv9gBT3yDKLvpKU3R29N784k/yOWmhT61PJY9oT8I d2/iLG7Rh6JdSBdOeAZLrOflcvKc9yUkONyOu+pQ0iT0x3yxNCKj2JQZPbr/X2L/beu5 Ibeg== X-Gm-Message-State: AO0yUKUCFg/g5g6yl9FJnydxoCTnKgivPYTKwyiQw5ZMzF6d1nKIj4uz ag4pQEfwEA8xWAs3cCUI4u4rvQ== X-Google-Smtp-Source: AK7set97BIKyOmgPMyTYdA0l4yjeWWk+bmz8OCuglWbZShnRbGJgihDqtpNQvu8wI4oPqiBiEfT/zQ== X-Received: by 2002:a05:6512:11e1:b0:4db:2cdf:4c12 with SMTP id p1-20020a05651211e100b004db2cdf4c12mr574193lfs.43.1678796056346; Tue, 14 Mar 2023 05:14:16 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id s4-20020a19ad44000000b004dda87ecae3sm379058lfd.246.2023.03.14.05.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 05:14:15 -0700 (PDT) From: Konrad Dybcio Date: Tue, 14 Mar 2023 13:13:43 +0100 Subject: [PATCH v4 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-v4-5-54b4898189cb@linaro.org> References: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@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=1678796043; l=2206; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=+ePdH/Gl1hrkxIW7hm63Vg7SPtBJUhhLLi5EVaR0ltI=; b=6qaalpt6trqBL9lpfNbfElg+UaFZCgOIrVJIg4XC74C8ALx5+2CrAwZmGw17FlnbZ0bAMRADXbBA 9frNKRM/BXGnZlhK5OrA/+mUVrGsmf8FXYy0AFBZ1RPeaHMrREgz 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 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/ds= i_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 =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 */ }; @@ -291,7 +280,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 Wed Feb 11 13:07:43 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 E40F2C6FD1C for ; Tue, 14 Mar 2023 12:19:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232047AbjCNMTV (ORCPT ); Tue, 14 Mar 2023 08:19:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229811AbjCNMRO (ORCPT ); Tue, 14 Mar 2023 08:17:14 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C9B45D244 for ; Tue, 14 Mar 2023 05:15:04 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id r27so19705585lfe.10 for ; Tue, 14 Mar 2023 05:15:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678796058; 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=gUbEpe2io7l6AXuODwhJVPxizEFzWfqe6F+dWQoo9fY=; b=JIbj3RheMwYk8qThubwperBe1IZ9o88lpjIQ49SE+Qu8HAXj9u+/2dBCnLavnnsWXy o3WhoGWax9bQbKltYQ+ZpIs/MjPUdpOrHv7c9uRzEf2ADJh/stNcUQbzDXRsEMoj52Vx DsiUxcgFiGWxY312W9+GIsOu2sBKU+EYprb8mAzUAdp7TRShyxrmlkbNeIgi9AxnWu43 jbZgpd0hEwQ8uSguvcER3DANTr4c9F0lCF4KOLZMcf8C/AhVUhU6GT6GBwn2TwmPMQqm 4Z3SolMaynxDCuvxKvLXM7EDLzBRH2U+tVU3aEYreFi8MsZR+RKG6fThBMjZXxb8W/mO v3iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678796058; 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=gUbEpe2io7l6AXuODwhJVPxizEFzWfqe6F+dWQoo9fY=; b=tcd0nHsQ1Yna90654jkMs7BpgD0dQB6anD7ue36t4HqRm3kSUeW1ExE+tM3M7djL3+ 8xajQZ27jvfrnLmlw9l1jKQT0wE8SSYfkkbGSLsCx5s9op33X14jelcT84k2G/qYXqk2 glBj9AP/hSXh+NTNP6BybxkEPAx2bUkmmZDyIxWEVw89QMCwz6OlpvEVwuPQ0jacflD7 B+vfF3YIJgG1OcJEjlnrekPM3BwxycAqxa1ZSOsojvN/Su3jvDoerXMWXyVSfhi7ZaFY Loxorr5UjK2RfGHpd5iAFPQU011ATR9V/DxdGHnNL5HWrTR1Smcpsb7a/6v8XL6bQCok MrRg== X-Gm-Message-State: AO0yUKXlSfJQnRzZgTUd+fjfD3tktROmf1f06b9EM/COb/xGYtMukRbh pJQ1BEEEojRqm4TaA4HNTKZCaA== X-Google-Smtp-Source: AK7set+5P6vjq1SBHqBansG06J22IDugsin6QQRWTffVFfaMyWlTvRi4VZYLpjpbWkvJvUePc09LSg== X-Received: by 2002:a05:6512:4cc:b0:4a4:68b8:c2e4 with SMTP id w12-20020a05651204cc00b004a468b8c2e4mr634836lfq.59.1678796058338; Tue, 14 Mar 2023 05:14:18 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id s4-20020a19ad44000000b004dda87ecae3sm379058lfd.246.2023.03.14.05.14.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 05:14:18 -0700 (PDT) From: Konrad Dybcio Date: Tue, 14 Mar 2023 13:13:44 +0100 Subject: [PATCH v4 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-v4-6-54b4898189cb@linaro.org> References: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@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=1678796043; l=2654; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=XlklCU0Bm1/3LNZplT2epg3iipbpHP7NoPAo99TDW0s=; b=PlK3eC/4gdexHFVgKpaJ2/qDm8skkomACDMObeK8OIEVlLOKWUPraJQqVcIoVVAtUCZu8HjYErLv gazZMQTDDr46kBH/S9oniqWqeJhpuhHOOnkMiRw6jMo6dhIwsMrR 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 Reviewed-by: Marijn Suijten --- drivers/gpu/drm/msm/dsi/dsi.c | 5 +++-- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 20 ++------------------ 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 31fdee2052be..f761973e4cba 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -4,7 +4,6 @@ */ =20 #include "dsi.h" -#include "dsi_cfg.h" =20 bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi) { @@ -174,7 +173,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 03d98cbcc978..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,17 +204,6 @@ static const struct msm_dsi_config sc7280_dsi_cfg =3D { }, }; =20 -static const struct msm_dsi_config qcm2290_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 { - { 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, @@ -304,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 Wed Feb 11 13:07:43 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 D2276C6FD1D for ; Tue, 14 Mar 2023 12:19:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231998AbjCNMTd (ORCPT ); Tue, 14 Mar 2023 08:19:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232023AbjCNMRa (ORCPT ); Tue, 14 Mar 2023 08:17:30 -0400 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 7B14C87A01 for ; Tue, 14 Mar 2023 05:15:12 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id s22so19721008lfi.9 for ; Tue, 14 Mar 2023 05:15:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678796060; 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=M0noliucXU9Jdvv0Hd20Z7afom/lMp4f8K7cr1zSsgo=; b=XoBFtXbQtSXG5WclW1los/dZpO5yHIqTv53yG2lZWaTzr3dY8/MjmGb20SpOrIH4nW TtkrTvuouYcQao6T0qYjiJK57B60oPgOdOXBvCdj3ftibMdf97Iw0IBnCwkh4st11YeV DuyMTdSASAAHbcW1silQ8yPEMSejsOBUtAF/m1jgfhOc3lG/vPozJYpc5diKICMENyzf yjRUKM5ciQ2dCUdBUSZlr6c/Kqa5VJYgl3q4jcZp+qXcvAielLI63LeiueIiKVzan6ar rmsq/OaCL1rntSFPApp0+oW8yk8Z5tEUJunOdLhiXN2kNZT/l33rUfoOUqM1fk2XGBS7 afMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678796060; 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=M0noliucXU9Jdvv0Hd20Z7afom/lMp4f8K7cr1zSsgo=; b=BlDhIa3SBxe3cN9sIzESC9j1Jiyqf0rrtBObmNv3iXaWpw6FuFinIDm7IP8DZTnGp4 nTS/qrk/N4OBFDcBI2b19UXkgDceS/DkjotrdDGUbLlFvlSChsmyoADW2QXSCnuEV5cz /sctU9pVEzdoExrMK6D73shWquXM4G91K4A/D8c6HvH8L+Q7eCQJCxGWeeCuaC72s70C S3BXS4rJVCFmESrb7vFVGaX5JVDTKzVbKm+9o8+t6+nad0hDfYjjdmKMKSocimk+WO0O jzy1QEfupPYD3KGhuCeXm0U/BNmPBnpp3lh611NFCsm0Lusk0b8Q+9rCB3DqMk8ZyKyx eNNw== X-Gm-Message-State: AO0yUKWZ2x86ngMtA2OInftRJ7W7QcgwwRhfJNksQUSqkJB6HlaPuNtx AFs0uDJzmTbK6p6bRgtNmRvIZg== X-Google-Smtp-Source: AK7set/VKwfxDeNKVkhVwQmiIpG92zx0bpa+hICEMxp1oB0u8pUIuUXXLyI1ZHxeFtZCzLflZ6YrPw== X-Received: by 2002:a19:f508:0:b0:4de:e802:b7e3 with SMTP id j8-20020a19f508000000b004dee802b7e3mr581098lfb.19.1678796060264; Tue, 14 Mar 2023 05:14:20 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id s4-20020a19ad44000000b004dda87ecae3sm379058lfd.246.2023.03.14.05.14.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 05:14:19 -0700 (PDT) From: Konrad Dybcio Date: Tue, 14 Mar 2023 13:13:45 +0100 Subject: [PATCH v4 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-v4-7-54b4898189cb@linaro.org> References: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@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=1678796043; l=2248; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=XyYOOI1oosMrjhHufAshg6wFIoQ3jCyg3dymQPN3J1A=; b=h8pc1bjL2lI6iQ31RL4kpzTbX0PpqKAoYACSpyK+h0eLIKLO7FFFQ1qC3y+mRzAFZMW+u9eoWcZd juim+86NDrq6hafxwJkCfMB+ugGrgMXpOdNydQ/y53PIKQSjXWER 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 Reviewed-by: Marijn Suijten Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/dsi/dsi.c | 4 ++-- drivers/gpu/drm/msm/dsi/dsi_cfg.h | 3 --- drivers/gpu/drm/msm/dsi/dsi_host.c | 4 ---- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index f761973e4cba..baab79ab6e74 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -172,10 +172,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_cfg.h b/drivers/gpu/drm/msm/dsi/ds= i_cfg.h index 8772a3631ac1..91bdaf50bb1a 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.h +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.h @@ -65,8 +65,5 @@ struct msm_dsi_cfg_handler { =20 const struct msm_dsi_cfg_handler *msm_dsi_cfg_get(u32 major, u32 minor); =20 -/* Non autodetect configs */ -extern const struct msm_dsi_cfg_handler qcm2290_dsi_cfg_handler; - #endif /* __MSM_DSI_CFG_H__ */ =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 Wed Feb 11 13:07:43 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 36369C6FD1C for ; Tue, 14 Mar 2023 12:20:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232459AbjCNMUt (ORCPT ); Tue, 14 Mar 2023 08:20:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229801AbjCNMRn (ORCPT ); Tue, 14 Mar 2023 08:17:43 -0400 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 3A4E295BD3 for ; Tue, 14 Mar 2023 05:15:19 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id d36so19719492lfv.8 for ; Tue, 14 Mar 2023 05:15:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678796062; 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=RWw370fgLD0HuRvp3mvzxHwlUz7uiZNuT1LLG7WatHE=; b=BR8ArhoapVcMZY0cxumbwhT+4XFfjagIBWxWW7+ZT77+kP39rOZ4tZVylbD1D10w+Q bGEfqWNKHW1IPM9CpeRIVNdBZVv6HpuUAXTvPlrFm4rexBJZSFfBr78zsdDJjkESwLCq X7jTQphjo/TZ6ktmsE9Dfqgo5nLTUW8eMdaACXn1rYqw3tu+6a06udcObap9xDEvetil Yt2xJNhb7/12kt6pAHYqi32iAGAwrRlX5bAmZffMKrcJI5rFhf/x82q7jotQRocFtiL/ 8eXKBXD1TcKXxhcqoVPBJJF04CrPxNua6rL9HfXNbyYRRvs/GppEu6Fq+mfPG9jsrQVJ ilpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678796062; 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=RWw370fgLD0HuRvp3mvzxHwlUz7uiZNuT1LLG7WatHE=; b=zjCDJ4xASNDPxnuxX4D8Tu2PU2IyLMIiZ8ObyHPgEkfjimi5c12TF5KMq/2dWNxkYi sfR1jqAqloOjI0n7rffCTYjteq7tlTAxDEFrwqjk1pOFPJv4urDMVnlH/RyFYUFz5xPH OXTzKdgStb8GTXOXfft++2Fm6kpMS7ECUqP1EXKoX9WodOGrcN51h64NYzGm3ErQjDb/ L8zngld487JDNrpHWKyadxeDKkGkBeSrEar1kmIu//PlQS+VobOGxMOCqscAyPyNcSaH 5JmvKBdh/JOOQHrFQs28XQWcPcTKUsq1jlO2PLUgNhqpU6KZ8rH6WbCZahniGH0khTr1 GzZw== X-Gm-Message-State: AO0yUKXULCy9myAU8X12HfZkNBhfGrt9aYQ8B74xoUFePwZ/H6dx+c89 0Ax+RnZ5fms+cT1FvM0aGWJm/w== X-Google-Smtp-Source: AK7set+172hSpy52PLzeDpjRg5xVEmg74JjZc1Tx+uPWqEXPab7FQ1Uhtw85j7Tiwx/TkZDOfqo4jg== X-Received: by 2002:a05:6512:21c2:b0:4dd:a785:83aa with SMTP id d2-20020a05651221c200b004dda78583aamr622076lft.31.1678796062249; Tue, 14 Mar 2023 05:14:22 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id s4-20020a19ad44000000b004dda87ecae3sm379058lfd.246.2023.03.14.05.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 05:14:21 -0700 (PDT) From: Konrad Dybcio Date: Tue, 14 Mar 2023 13:13:46 +0100 Subject: [PATCH v4 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-v4-8-54b4898189cb@linaro.org> References: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@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=1678796043; l=1205; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=1EfelHpNhZt1wPf/IjMVjhdrSdK64CK4dz3kGi3pPQM=; b=okBWwdgQUh8QE+PTDW404ps/EZPQpW+e2juB8VF46sCJW23XqUwNzrji/vbQ6+8M3/zhirNWv8uQ 9XvQ1DHWD7rj0uCKWdYDtlOQZwfr07hGb/0Ec5qoo8PWjvJ/0f6A 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") Reviewed-by: Marijn Suijten Signed-off-by: Konrad Dybcio --- 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 Wed Feb 11 13:07:43 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 59C86C6FD1C for ; Tue, 14 Mar 2023 12:21:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232068AbjCNMU7 (ORCPT ); Tue, 14 Mar 2023 08:20:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232292AbjCNMUR (ORCPT ); Tue, 14 Mar 2023 08:20:17 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5CA4A219B for ; Tue, 14 Mar 2023 05:16:06 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id j11so19695749lfg.13 for ; Tue, 14 Mar 2023 05:16:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678796064; 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=1P1pYiyEYMVUL7yAvgwa0bBv+0t1+WV+M8Z/f6qqjH0=; b=Wj48vVXbGkSyiDgbqj/+GLMCeSmwtEdP9xLi1GDEjC0foSiirrqPTM8MmurLYFDOa1 8V9y12UczeF8AqE4scC7rXbILCZ5Ag5/dA7USPab4qedLSSF4eq28dm0Ug0Cv3xxtULe heYmPh4yyncyXr5h4fAv9RZQlzbyN1XxBxKQyKVLju0NytI5lZw6ITEUP2Xr71RctWPM hJ2iC9BhILPgpOfdgBuywNPkpSY1MmfbhioRZ4wdnlOXN65nC1adDrwvi+Stj7l0ETFL 1pBh0Ys+H5w2eM6x9TW4L4vBGRkzUyJQXtfhUR+iItTz+GLWhcrQwOlZtXxYg9y3Si1H eWkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678796064; 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=1P1pYiyEYMVUL7yAvgwa0bBv+0t1+WV+M8Z/f6qqjH0=; b=eqC1u3BP1kzLfur+iBxMwjupJSdWCZM2WwCGZk1rZs+1nPmsplqFiQVzKDOSkHfGFa bYsD8Lo7dKDyJeY8/q5pYKnox8IK5Du8T0inpKZOGHZFlOZNaiMc0lP4JRIMPnNBDszX IebC/ExVmAgZgazaxKKP6IMkl1KW2f/bx7OdsB438MKY9gIQsjl8EECbuM5nyGy/aWw4 HYwBikNSL8K4PbflkXSYHHFvqCyJQfB02ui4IZyg3qPoE+jnv/b0S/OueWqjN+uNqfl9 oIODus8M0yZ6N5X1TJObOvnAjs4brxCxcN/il15PDONnaWVCJpy6YNsOwX0JloT1rlFI kE7Q== X-Gm-Message-State: AO0yUKUmz6ol9Iropwa0ULv7RbSD4l69Wt9wobXBdiQJHMznnwCCQJlC NdmVN3PcDEX71xonnbXwNTDyTQ== X-Google-Smtp-Source: AK7set+I8lQgNzPkz4L9M7HgnX9W/1AiS8lb8kOzmpsng+dz3rICh2GeR0Q7ovbC8CBNyaTNzhVZ5g== X-Received: by 2002:ac2:5596:0:b0:4e8:49fa:ec1d with SMTP id v22-20020ac25596000000b004e849faec1dmr755500lfg.66.1678796064168; Tue, 14 Mar 2023 05:14:24 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id s4-20020a19ad44000000b004dda87ecae3sm379058lfd.246.2023.03.14.05.14.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 05:14:23 -0700 (PDT) From: Konrad Dybcio Date: Tue, 14 Mar 2023 13:13:47 +0100 Subject: [PATCH v4 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-v4-9-54b4898189cb@linaro.org> References: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@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=1678796043; l=2294; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=SrFjrl3hjjd6jTZmTfeOIcB1iG8ZWHw//K7P30Y1IYE=; b=ilkdJdfqSf8IuJJOZxOWUoZY9G+1PFVahC6fWUEls2j/8BN3zw1uAzrxxAWELiTwTmpCpmmv3vqv FMBevoo8DD5DaJ+8WB/H2V5y+tC3QOcMI0Y1Qbqetx0EcahBejA4 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. Acked-by: Rob Herring Signed-off-by: Konrad Dybcio Reviewed-by: Marijn Suijten --- .../devicetree/bindings/display/msm/dsi-controller-main.yaml | 2 ++ .../devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml | 10 ++++++= ++-- 2 files changed, 10 insertions(+), 2 deletions(-) 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..b9f83088f370 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 @@ -114,7 +120,7 @@ examples: }; =20 dsi@5e94000 { - compatible =3D "qcom,dsi-ctrl-6g-qcm2290"; + compatible =3D "qcom,sm6115-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg =3D <0x05e94000 0x400>; reg-names =3D "dsi_ctrl"; =20 --=20 2.39.2 From nobody Wed Feb 11 13:07:43 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 759CCC7618D for ; Tue, 14 Mar 2023 12:20:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231942AbjCNMUz (ORCPT ); Tue, 14 Mar 2023 08:20:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232180AbjCNMTy (ORCPT ); Tue, 14 Mar 2023 08:19:54 -0400 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 077DBA101D for ; Tue, 14 Mar 2023 05:15:48 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id j11so19695892lfg.13 for ; Tue, 14 Mar 2023 05:15:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678796066; 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=yeylFVo7UbFotxXKN5Jk9AW63WMsXe+ARjqLamdFW7w=; b=nlnvdtT0jYFDekSBiKe7kjUgKmeWkEU7n0KtJb+UJLMZg1jzoGWP3xgtTelAmnACbh AA/ExRjWQucoaj8aSZF2s0Csf1EoU2R1WE/e958Uj2/o+Mz4eEucxi8rxcCUljmRLhoZ F1HDrxg7hUqEUYLPhNivl5i1idRb+Qlxeh3HIahd8uQKoKq/Toz+sWV6UuEJxZg3E1nc N9aaFO48cremURTz8R2Fm7ffMf//BthoMS2ObeHCSOy3O8dakc4RXC5mBOP/bkBldHrB crA1RnK7faaSzYwIjcOOcEco4q8JmHmX6ajsWPtbuvh5ku9HjIr3+bkM0nE4MeuLFBEJ DT/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678796066; 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=yeylFVo7UbFotxXKN5Jk9AW63WMsXe+ARjqLamdFW7w=; b=mq8XfcHS26wHD0F87vfi5pcsoRs2kiorqYhOv9e7AZZW300/S9WPaPT83ts6JyHfHg rzWMzn3hYsr2O5KrNzGTZsk24peXlD12ZSPDzFBFzjTuXPU/oG1I4+OIk3ui6hjtcMHI p+u7RPMiIR4wuSDMxWdx2Jv20upE/7zzVgMQ2OKpmgh1h93QbbnFpYLD63PlrPso/zBQ htS5gGJGQ5xvxzmiokIzTYC0pyQ1lI28qy7+jveM5hGADzHZ2p4zIwkQugM7MqTvbE7a ggdxvgp2xn7R5uVS8A3g61ogaBAQg/ziek+w7B2kBbJ4QNl8aZFuZrLCOb4EEzSnAfte 0efw== X-Gm-Message-State: AO0yUKVHho3LD+u/fHFoGT4kzyRRlsSLPflE6ydS++lQ2D3u7tnfqjsI gSJG0yEK8zOovZrSHVXwmh871Q== X-Google-Smtp-Source: AK7set83jGmoRhPfkqMbcEJHHm7krfEcVsYNn3fRI8hjQUMi1nyZZcK+S70SwgroH8ClftZB5Jk5Hg== X-Received: by 2002:ac2:446d:0:b0:4e4:b9b4:bf25 with SMTP id y13-20020ac2446d000000b004e4b9b4bf25mr748332lfl.68.1678796066123; Tue, 14 Mar 2023 05:14:26 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id s4-20020a19ad44000000b004dda87ecae3sm379058lfd.246.2023.03.14.05.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 05:14:25 -0700 (PDT) From: Konrad Dybcio Date: Tue, 14 Mar 2023 13:13:48 +0100 Subject: [PATCH v4 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-v4-10-54b4898189cb@linaro.org> References: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v4-0-54b4898189cb@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=1678796043; l=835; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=fTDJ/Pk/K83TEsz8nt+gatYoQ7InKrC5bjtKXy4Z9Sw=; b=HhZ4vHeSq1k1zTiLWtKr3SD+hh+THRKo/3SDYCP8seyGUW6Irn5LUOqcX+223SewxioRXEQR3Uzk jQn7R0qWCdG+pjWnvGDWgOMp24G1gVyrZyKTgLB39uI8m2Ev/nR7 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 Reviewed-by: Marijn Suijten Signed-off-by: Konrad Dybcio --- 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 fbd67d2c8d78..18c7eedff300 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -1219,7 +1219,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