From patchwork Sat Feb 11 11:51:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 55788 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1455116wrn; Sat, 11 Feb 2023 03:53:26 -0800 (PST) X-Google-Smtp-Source: AK7set9fu9B/3Kj9xouZjQXImMTb1aRk87QQSH1W0QHMyZ2w+cbba2LfrGscUhRijsCEtXSvTMlR X-Received: by 2002:a17:906:1f0f:b0:878:625c:c8ff with SMTP id w15-20020a1709061f0f00b00878625cc8ffmr16008968ejj.54.1676116405968; Sat, 11 Feb 2023 03:53:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676116405; cv=none; d=google.com; s=arc-20160816; b=vY6Nz9ybSeKUvid6DDHCnMx1bQBvRgxNNbHOvrs/AsuyVwT8ghrOr61mUyNeJGWHAA GKhd6jHkx85YvRvKXOsddmaZy2zXDVxDu1DRuOsuCUQ0dy0Zpueh+kdVzhiBmJTe2VGu n8Y06+28pTfJmSew3dxa9lCWVfTywcGLF1PfSjd1dUOT949fAIM2Y2mWs1qYGg3XgjTe XVs/+svLTH58t5jJGv4ILFvJi/QXmmstsVpPdjNOpn3HWDbVFWv2/YNd/uNHxWLq3/a2 RKQp6CZfEW8DQdaAVoU4ZseQVkgpa55bE/zvagqpdm/QXib2XwSz5NQ74k/6FRndOvok 60ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sLkh67ooWyVObn1J2I1Qu7dXdNbX+Cd0UoL9axKT34o=; b=1GiKZVpwspvGIwPv6LHZ6huQraQ2jI8RIPr2Q8tJQt3GKa2Xb9iX0bRcDftxgGN1CO EdlpMLKEvjGxOlRNPvbF2y18AkIgYnsI+3MH0E+weSo8QwneYuHo6T1jImHsLTgjeCOH YFmJ7pHHPSM1JJ6uXY480NDkKejPeRUl2nXOV55CxEbPcxWLsaENFol6thOUNfcEdIMD OkRB79C7gbzK5yihvXu0hXoD2ZE9gdNjFoqMJ1pLLoExcaqpOxVafKyRDH2gnZUMu28U kimYI42+a343j67Z9vZ03FXHjjQOnmobuCcArb4ySmEBEyAmKAqoCWJiTdrJnyWlejZg QQTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oltznk2r; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 22-20020a17090600d600b0088aa09de653si8595360eji.788.2023.02.11.03.53.03; Sat, 11 Feb 2023 03:53:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oltznk2r; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229987AbjBKLvw (ORCPT + 99 others); Sat, 11 Feb 2023 06:51:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229629AbjBKLvq (ORCPT ); Sat, 11 Feb 2023 06:51:46 -0500 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56FBE20572 for ; Sat, 11 Feb 2023 03:51:45 -0800 (PST) Received: by mail-ed1-x535.google.com with SMTP id fi26so7300418edb.7 for ; Sat, 11 Feb 2023 03:51:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sLkh67ooWyVObn1J2I1Qu7dXdNbX+Cd0UoL9axKT34o=; b=oltznk2rV7cDqVbUdNVtJ8xpjZjQpPXAe0K1+3HPWxtatzOXOJU0Ubuyg6e7SUfbpl m1eM9ON4PETCcwFpxrE17SDiVqcgQ4qMA6ASwiLe07mpN+9d9bzDs9zATe7+Xg+3zsKY t/Ph1p7W2YsWJorjsNF2YGZyOGu2FKvOehd79IGioJBG2mcvMtjKBYwuAU9pZ6BzxPMO tSZ8wVx8O0oVWhRUREjHGe3AacbYvbdiDrqZa+MwBgKjlngPjh42cVTHezvHBh/qgw+p KwllStugYL60DK9XlS3dhhhxsAbOIfRRLL27sxg5Xv0eiewLUPW74JInzpF6m4/mOEdW +LwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sLkh67ooWyVObn1J2I1Qu7dXdNbX+Cd0UoL9axKT34o=; b=e6+9G01TPvUfVP2zWwrzuA8waYHPMsDEdY50183Fa7vGwJsqo/l6Xyhq5gdp8c/IPp x5nPaOXuWyztYXPZn4MXIBia/magWX4oL842FM7hr1R4T0DOFuIypnXMJXZjeeWTMtfz mvQUHWwd7FVySuUsFluUyF3WYzHzv9UtzOUIWvar0Tn34ewHv5JZnLIdGPqYlR7FcqBg pzTS5d0uBw7zL+tzHgqc2ZXgBwmu5ztOwRT/xuWCKJHzmgb15UmcE4LfOMWpLxxvRngr dqVhB6gmMMlEk7KBWxkqGNiJjKGBJsy6uw/ddQnGVxzxdCHQtEN6LOXNTmwIQ4py+mBw Kaiw== X-Gm-Message-State: AO0yUKVwjOp2BkmofWk2p1j8kM2EvCqm5NMKhQFcrppXcjGpxWkYU1en TYPPL67sT3Fmy8wfJm2Q7t+tWw== X-Received: by 2002:a50:8e41:0:b0:4aa:c354:a0e7 with SMTP id 1-20020a508e41000000b004aac354a0e7mr18903423edx.25.1676116303952; Sat, 11 Feb 2023 03:51:43 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id r10-20020a50d68a000000b004aabb714230sm3636070edi.35.2023.02.11.03.51.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 03:51:43 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Krishna Manikandan , "Bryan O'Donoghue" , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 01/10] dt-bindings: display/msm: dsi-controller-main: Fix deprecated QCM2290 compatible Date: Sat, 11 Feb 2023 12:51:01 +0100 Message-Id: <20230211115110.1462920-2-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211115110.1462920-1-konrad.dybcio@linaro.org> References: <20230211115110.1462920-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757535436756202723?= X-GMAIL-MSGID: =?utf-8?q?1757535436756202723?= The qcom, prefix was missed previously. Fix it. Fixes: 0c0f65c6dd44 ("dt-bindings: msm: dsi-controller-main: Add compatible strings for every current SoC") Signed-off-by: Konrad Dybcio --- .../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-main.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.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 From patchwork Sat Feb 11 11:51:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 55789 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1455144wrn; Sat, 11 Feb 2023 03:53:33 -0800 (PST) X-Google-Smtp-Source: AK7set9KoEo7h0V6CRvGv3x0QsQzl7oPLTN7V6OahdQpBV9jlm5vyXYKhxVWLoCHx2JALyvVqghn X-Received: by 2002:a17:906:4e96:b0:88d:3c85:4ccf with SMTP id v22-20020a1709064e9600b0088d3c854ccfmr19441176eju.25.1676116413577; Sat, 11 Feb 2023 03:53:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676116413; cv=none; d=google.com; s=arc-20160816; b=NP6m09nwFQMvxaxna71te9K+W+uAu4v29o4JIPHHr7XvMpnWQ+Lt/6+kYTpJUm0ZYi 4jjPWIWJ6vXgq04TLOYTHIEeViqi4dKHjlnefizvZod5VznYaPStx0yrzDNHJ6mm13Hd Ub92/ZfNDCoQOFNWBRlUb6WHbdDfqNG6J99ZwaQ//jvaUBZudPsyiaBhTYznWiUiydB5 fncDp3RF+CaT1Ug5lPeCjHJut7VthpV20Pe7U4HOm9aZl5VIs757gulBDRZyEsalYJyx eMYHKY01cCu98fRsuqNqu7f7+9L32mAmlpYC6R//ow2KcWccaD3PKzkJ/QHcdJm6OS5x gUXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/W1yN038JHBkZa936DvMVOCfu8R7n0uZaSVb3zgCCfI=; b=CdiMja+emM6E/AHTzKxLkvLKdas57D0pGqGb0vkBZxSy2ZI/kI1IQYhaE5cLoBYjK0 LfW8Q2r6Gh0nWZ786gGDP8VrQSmlAOMea7pEIDO/kpU2m+psdpA5ZmFlW9uzj3Y8/DQI p44MoFYt23teEX6TAyi5Msix+v4EubB6t7ggwZrVkl29gayz/sonM4N0epZjyZgrdg7P oxQqyN9Bq4tPk8WZj549OIZbrcte8UO3pxTqcydQT6MLVfVNg/DmhZVbFaU2luRt+L2W 5hyTlIex9WrIBQ4q3ke5x6bZjY9BBAXb0QCYUPbmFW6O+V1J3gVoWJ5WJZpY0s9KKbjH Vrpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d4y2N5O4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 30-20020a170906015e00b008aabee9b262si12843134ejh.474.2023.02.11.03.53.10; Sat, 11 Feb 2023 03:53:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d4y2N5O4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230166AbjBKLv7 (ORCPT + 99 others); Sat, 11 Feb 2023 06:51:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229629AbjBKLvz (ORCPT ); Sat, 11 Feb 2023 06:51:55 -0500 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A744CAD19 for ; Sat, 11 Feb 2023 03:51:49 -0800 (PST) Received: by mail-ed1-x52a.google.com with SMTP id u21so7341074edv.3 for ; Sat, 11 Feb 2023 03:51:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/W1yN038JHBkZa936DvMVOCfu8R7n0uZaSVb3zgCCfI=; b=d4y2N5O4WC0XbfkuF+PWiYsvvT9dZHVpZUH2azWkndreplnqUor0ZJRp9cx20tGMi2 IrK2iwoeDlP/OXKb8fK1NJxAL/+eHidzH8zo37Obi3nQBSCs68aG/F1REjY/Nv7064kg rICCOttEFo6lCktwcXLckWBbyXnjlakWN0S5K+zXovIQ2cUUsVO8t3Z1s4ZDwxcLjC50 lw4AROrHcShlrQjwtYC6fg1MCjtZho5R9yNzv3g264c70xs5FmE4K65dsaG0wE5YDMrA 4OY8vsLJvyr/+hiDw06weFXLwXFu7wdmIx5/TtbhxyCsimLtoGrfqzi8UjiKg+JxE6wk Tx3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/W1yN038JHBkZa936DvMVOCfu8R7n0uZaSVb3zgCCfI=; b=Bd61JOBnWhzdeIwyZ9NOPn25WeEFTJlWGRP/5muGoA353w11HaBGKwOsU+j1DcibpK H1S6vR7GMuHV8z03RgdQWNmmeyWouFdisc9yKYA5Zv7ul4dO1pLAI+cEVtgKzQdb4Tfb GYsQKWnlj8iH3kWecmgJCg3/OpkoBogRLxO/BD5pmeLwBshGDuWR0LK3YhB0TCJzZcLc NdGLKFIzL067y+SIhac/HNLcV7frjcKNz884Y17WePvQe495fQ6TC4cnazpJcdUaWStM IBvCNrdGAQm42XQuwPMSi0l0BV/8riUemfUCVUIQWp7ovzstKIVAJRTxr55T2NLE0tSI 0mvQ== X-Gm-Message-State: AO0yUKUMEskpAdhi1ThfzW5dP4dy3dr+kigzSThAwcelVEnhkTgUqpoJ sjLsAd7Bg034OLgYkCMc4lpWTg== X-Received: by 2002:a50:ccd8:0:b0:4ac:b838:a902 with SMTP id b24-20020a50ccd8000000b004acb838a902mr1160166edj.13.1676116308162; Sat, 11 Feb 2023 03:51:48 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id r10-20020a50d68a000000b004aabb714230sm3636070edi.35.2023.02.11.03.51.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 03:51:47 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Douglas Anderson , Neil Armstrong , Loic Poulain , Vinod Koul , Vladimir Lypak , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 02/10] drm/msm/dsi: Turn msm_dsi_config::io_start into a 2d array Date: Sat, 11 Feb 2023 12:51:02 +0100 Message-Id: <20230211115110.1462920-3-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211115110.1462920-1-konrad.dybcio@linaro.org> References: <20230211115110.1462920-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757535444519285150?= X-GMAIL-MSGID: =?utf-8?q?1757535444519285150?= 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 registers. The regulator setup is the same, because the DSI hardware is the same, regardless of the SoC it was implemented in. 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 | 2 +- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c index 6d21f0b33411..068d45b3a8f0 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 = { .num_regulators = ARRAY_SIZE(apq8064_dsi_regulators), .bus_clk_names = dsi_v2_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_v2_bus_clk_names), - .io_start = { 0x4700000, 0x5800000 }, + .io_start = { + { 0x4700000, 0x5800000 }, + }, .num_dsi = 2, }; @@ -41,7 +43,9 @@ static const struct msm_dsi_config msm8974_apq8084_dsi_cfg = { .num_regulators = ARRAY_SIZE(msm8974_apq8084_regulators), .bus_clk_names = dsi_6g_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names), - .io_start = { 0xfd922800, 0xfd922b00 }, + .io_start = { + { 0xfd922800, 0xfd922b00 }, + }, .num_dsi = 2, }; @@ -60,7 +64,9 @@ static const struct msm_dsi_config msm8916_dsi_cfg = { .num_regulators = ARRAY_SIZE(msm8916_dsi_regulators), .bus_clk_names = dsi_8916_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_8916_bus_clk_names), - .io_start = { 0x1a98000 }, + .io_start = { + { 0x1a98000 }, + }, .num_dsi = 1, }; @@ -79,7 +85,9 @@ static const struct msm_dsi_config msm8976_dsi_cfg = { .num_regulators = ARRAY_SIZE(msm8976_dsi_regulators), .bus_clk_names = dsi_8976_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_8976_bus_clk_names), - .io_start = { 0x1a94000, 0x1a96000 }, + .io_start = { + { 0x1a94000, 0x1a96000 }, + }, .num_dsi = 2, }; @@ -98,7 +106,9 @@ static const struct msm_dsi_config msm8994_dsi_cfg = { .num_regulators = ARRAY_SIZE(msm8994_dsi_regulators), .bus_clk_names = dsi_6g_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names), - .io_start = { 0xfd998000, 0xfd9a0000 }, + .io_start = { + { 0xfd998000, 0xfd9a0000 }, + }, .num_dsi = 2, }; @@ -118,7 +128,9 @@ static const struct msm_dsi_config msm8996_dsi_cfg = { .num_regulators = ARRAY_SIZE(msm8996_dsi_regulators), .bus_clk_names = dsi_8996_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_8996_bus_clk_names), - .io_start = { 0x994000, 0x996000 }, + .io_start = { + { 0x994000, 0x996000 }, + }, .num_dsi = 2, }; @@ -137,7 +149,9 @@ static const struct msm_dsi_config msm8998_dsi_cfg = { .num_regulators = ARRAY_SIZE(msm8998_dsi_regulators), .bus_clk_names = dsi_msm8998_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_msm8998_bus_clk_names), - .io_start = { 0xc994000, 0xc996000 }, + .io_start = { + { 0xc994000, 0xc996000 }, + }, .num_dsi = 2, }; @@ -155,7 +169,9 @@ static const struct msm_dsi_config sdm660_dsi_cfg = { .num_regulators = ARRAY_SIZE(sdm660_dsi_regulators), .bus_clk_names = dsi_sdm660_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sdm660_bus_clk_names), - .io_start = { 0xc994000, 0xc996000 }, + .io_start = { + { 0xc994000, 0xc996000 }, + }, .num_dsi = 2, }; @@ -177,7 +193,9 @@ static const struct msm_dsi_config sdm845_dsi_cfg = { .num_regulators = ARRAY_SIZE(sdm845_dsi_regulators), .bus_clk_names = dsi_sdm845_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), - .io_start = { 0xae94000, 0xae96000 }, + .io_start = { + { 0xae94000, 0xae96000 }, + }, .num_dsi = 2, }; @@ -191,7 +209,9 @@ static const struct msm_dsi_config sm8550_dsi_cfg = { .num_regulators = ARRAY_SIZE(sm8550_dsi_regulators), .bus_clk_names = dsi_sdm845_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), - .io_start = { 0xae94000, 0xae96000 }, + .io_start = { + { 0xae94000, 0xae96000 }, + }, .num_dsi = 2, }; @@ -205,7 +225,9 @@ static const struct msm_dsi_config sc7180_dsi_cfg = { .num_regulators = ARRAY_SIZE(sc7180_dsi_regulators), .bus_clk_names = dsi_sc7180_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sc7180_bus_clk_names), - .io_start = { 0xae94000 }, + .io_start = { + { 0xae94000 }, + }, .num_dsi = 1, }; @@ -223,7 +245,9 @@ static const struct msm_dsi_config sc7280_dsi_cfg = { .num_regulators = ARRAY_SIZE(sc7280_dsi_regulators), .bus_clk_names = dsi_sc7280_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sc7280_bus_clk_names), - .io_start = { 0xae94000, 0xae96000 }, + .io_start = { + { 0xae94000, 0xae96000 }, + }, .num_dsi = 2, }; @@ -241,7 +265,9 @@ static const struct msm_dsi_config qcm2290_dsi_cfg = { .num_regulators = ARRAY_SIZE(qcm2290_dsi_cfg_regulators), .bus_clk_names = dsi_qcm2290_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_qcm2290_bus_clk_names), - .io_start = { 0x5e94000 }, + .io_start = { + { 0x5e94000 }, + }, .num_dsi = 1, }; diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.h b/drivers/gpu/drm/msm/dsi/dsi_cfg.h index 44be4a88aa83..df9f09876ccb 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.h +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.h @@ -32,13 +32,16 @@ #define DSI_6G_REG_SHIFT 4 +/* 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]; const int num_dsi; }; diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index 18fa30e1e858..22ba8726b0ea 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -1869,7 +1869,7 @@ static int dsi_host_get_id(struct msm_dsi_host *msm_host) return -EINVAL; for (i = 0; i < cfg->num_dsi; i++) { - if (cfg->io_start[i] == res->start) + if (cfg->io_start[0][i] == res->start) return i; } From patchwork Sat Feb 11 11:51:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 55791 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1455189wrn; Sat, 11 Feb 2023 03:53:49 -0800 (PST) X-Google-Smtp-Source: AK7set8nYu/9d0ihApRJSEPjuWVwTDVeFJ5HRPfzycxnH6zY+vZOIw4wd4P46L3fZ+yxN2CDircA X-Received: by 2002:a05:6a20:3d03:b0:bc:d677:6a7b with SMTP id y3-20020a056a203d0300b000bcd6776a7bmr23978546pzi.47.1676116429658; Sat, 11 Feb 2023 03:53:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676116429; cv=none; d=google.com; s=arc-20160816; b=hVHvsF6TG7SZyV95h+QlV7kpxICPBQyLP0x3AEPVJFTZ8fYQVvM+WYSMcKSHqCjfBf bAGCR9Vq/0hm63fqwU3B5SYSjhBggGDetVLGeDtsJAJAGWujNMAxeQMggMHgwmlMiDUj QuclYV0/APHS7rOWIk8ra+1Wf7ExGB4tSgq2wJdF9OMPHt/KfoxrHNAXl0lRcoYAqFQQ NiMZKeYBj0cCO2Yf3AIg6V6dv9Ic6/QZQuPOX9IgwcNlJbgl2bmU66ZXj9v4MQStLgoG KAxfNC9J4V7HDlw4e5Blj10PhVNiZwdR9WgkwgraHqQ0JzDI4qR7334WMd67CGbTi4TJ CPlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6d/ZVSA0QFC6MXtjamKYBGsXvhDKvXab75YapPa5sNQ=; b=XqUkWG0AeeRMomGOe+1o05rfyKCQlZjGwgpBlDIhKv0hzwctwQuO8GEy0V4HaUdsCK I/h5lrb5Cb59JTGwoty9UPW77wyMHgpEQgQdu/2uxLKK27NOfQC32izTEKD14sx+mQKS z9KWa/ZIxE4WGToVi1xbNhFsU8sAZ9pNv7RGxRt+d81GtZKcjjuxcWOInT9lIrAJadmG oRY76D0j1ceUipDTX0cZgjEOtk0zd9ujhBNrX9UzxwYBMHCF9cGywyaNuXn2YxX70Dwg crb+Gts0D6RESkI2MLZcl/KNNWtk8YOuay9unfL7LSJs8eAJIcDVzXxQFGK5tweZpARs 0mSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rkpcdafC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t28-20020a63955c000000b004fb220ca56bsi6753074pgn.137.2023.02.11.03.53.36; Sat, 11 Feb 2023 03:53:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rkpcdafC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230191AbjBKLwM (ORCPT + 99 others); Sat, 11 Feb 2023 06:52:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229629AbjBKLwG (ORCPT ); Sat, 11 Feb 2023 06:52:06 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AC83196AC for ; Sat, 11 Feb 2023 03:51:54 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id u21so7341178edv.3 for ; Sat, 11 Feb 2023 03:51:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6d/ZVSA0QFC6MXtjamKYBGsXvhDKvXab75YapPa5sNQ=; b=rkpcdafCk9gxjEwIKlPV311jheyalW+L/U1VJddyjYZYeZzPJkfScGT3MrI68COmNo u9c/OzbbOCh59N0qCxva15f/1VY5aYUo14KMrwsWuPJ/F+BHkZTNDb7S12sHWWpIZ2EN cDh8F4ovZS6wSo8Pmr0Oa8jC6zMLZjFlLD2XzRjsZZmUBQsRoCi2ilB19nxqd7XUY8bj cjriyF+L1z7+Sqj3nbkTWtSyOQiY4FOPYJFHmPrVL4Kt8cfS2QXbd4PXjnsn6jHwCAlj FEN0CdN3NotV6Tx1qz7qPL/ULJ4VMCs03jem1hN5aM5d+q+uUM+bPAzqY7wY6aGG6g+V o91A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6d/ZVSA0QFC6MXtjamKYBGsXvhDKvXab75YapPa5sNQ=; b=7/YSkDfk0tihBiwzC3kEoVM3XeH6FtJLPWOId87w6aHoCvTlY8BAHdkSHRnYN9pP6V glcdxUUSCeWJrKXWg8U2FS1bQ8P2jVLoQRPHMa2iMqLyZR1eEI8UP6JLh0t+GlVPpx7G UFBGCdY4FmjjHI8GLPEm4RtzD1eVjMbtwlFM7G8GzMuVCw+h+lE6dqsfOqc5XPMIKl48 3amn1RHIEDWejnpZs/geLxuA8HRVOXB2V/lAdRk2XrcYU2gAB9w+w1uj2XcurWetqBUl FOkOvTrkMRo7j7w95xe+Y8u4s9M261gDjQKIG+fqqmH+NISepyXMJHOlt9xERdl7SCIV I2Ww== X-Gm-Message-State: AO0yUKX+FaGNfT9okbOFWXsM1KO+9K8hZeAC91Y0FGBLhn/U9oKLJmIm 7oFbPzSg31pVBWnD82kcrVsLkw== X-Received: by 2002:a50:a6dc:0:b0:4ac:bd84:43d8 with SMTP id f28-20020a50a6dc000000b004acbd8443d8mr311825edc.8.1676116312398; Sat, 11 Feb 2023 03:51:52 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id r10-20020a50d68a000000b004aabb714230sm3636070edi.35.2023.02.11.03.51.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 03:51:52 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Douglas Anderson , Loic Poulain , Neil Armstrong , Vinod Koul , Vladimir Lypak , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 03/10] drm/msm/dsi: Zero-terminate msm_dsi_config::io_start Date: Sat, 11 Feb 2023 12:51:03 +0100 Message-Id: <20230211115110.1462920-4-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211115110.1462920-1-konrad.dybcio@linaro.org> References: <20230211115110.1462920-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757535461349845444?= X-GMAIL-MSGID: =?utf-8?q?1757535461349845444?= In preparation for supporting multiple sets of possible base registers, Zero-terminate the array that contains them to remove the need of specifying num_dsi for each set. Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 39 ++++++++++-------------------- drivers/gpu/drm/msm/dsi/dsi_cfg.h | 4 +-- drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- 3 files changed, 16 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c index 068d45b3a8f0..5f62c563bd1c 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -22,9 +22,8 @@ static const struct msm_dsi_config apq8064_dsi_cfg = { .bus_clk_names = dsi_v2_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_v2_bus_clk_names), .io_start = { - { 0x4700000, 0x5800000 }, + { 0x4700000, 0x5800000, 0 }, }, - .num_dsi = 2, }; static const char * const dsi_6g_bus_clk_names[] = { @@ -44,9 +43,8 @@ static const struct msm_dsi_config msm8974_apq8084_dsi_cfg = { .bus_clk_names = dsi_6g_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names), .io_start = { - { 0xfd922800, 0xfd922b00 }, + { 0xfd922800, 0xfd922b00, 0 }, }, - .num_dsi = 2, }; static const char * const dsi_8916_bus_clk_names[] = { @@ -65,9 +63,8 @@ static const struct msm_dsi_config msm8916_dsi_cfg = { .bus_clk_names = dsi_8916_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_8916_bus_clk_names), .io_start = { - { 0x1a98000 }, + { 0x1a98000, 0 }, }, - .num_dsi = 1, }; static const char * const dsi_8976_bus_clk_names[] = { @@ -86,9 +83,8 @@ static const struct msm_dsi_config msm8976_dsi_cfg = { .bus_clk_names = dsi_8976_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_8976_bus_clk_names), .io_start = { - { 0x1a94000, 0x1a96000 }, + { 0x1a94000, 0x1a96000, 0 }, }, - .num_dsi = 2, }; static const struct regulator_bulk_data msm8994_dsi_regulators[] = { @@ -107,9 +103,8 @@ static const struct msm_dsi_config msm8994_dsi_cfg = { .bus_clk_names = dsi_6g_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names), .io_start = { - { 0xfd998000, 0xfd9a0000 }, + { 0xfd998000, 0xfd9a0000, 0 }, }, - .num_dsi = 2, }; static const char * const dsi_8996_bus_clk_names[] = { @@ -129,9 +124,8 @@ static const struct msm_dsi_config msm8996_dsi_cfg = { .bus_clk_names = dsi_8996_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_8996_bus_clk_names), .io_start = { - { 0x994000, 0x996000 }, + { 0x994000, 0x996000, 0 }, }, - .num_dsi = 2, }; static const char * const dsi_msm8998_bus_clk_names[] = { @@ -150,9 +144,8 @@ static const struct msm_dsi_config msm8998_dsi_cfg = { .bus_clk_names = dsi_msm8998_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_msm8998_bus_clk_names), .io_start = { - { 0xc994000, 0xc996000 }, + { 0xc994000, 0xc996000, 0 }, }, - .num_dsi = 2, }; static const char * const dsi_sdm660_bus_clk_names[] = { @@ -170,9 +163,8 @@ static const struct msm_dsi_config sdm660_dsi_cfg = { .bus_clk_names = dsi_sdm660_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sdm660_bus_clk_names), .io_start = { - { 0xc994000, 0xc996000 }, + { 0xc994000, 0xc996000, 0 }, }, - .num_dsi = 2, }; static const char * const dsi_sdm845_bus_clk_names[] = { @@ -194,9 +186,8 @@ static const struct msm_dsi_config sdm845_dsi_cfg = { .bus_clk_names = dsi_sdm845_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), .io_start = { - { 0xae94000, 0xae96000 }, + { 0xae94000, 0xae96000, 0 }, }, - .num_dsi = 2, }; static const struct regulator_bulk_data sm8550_dsi_regulators[] = { @@ -210,9 +201,8 @@ static const struct msm_dsi_config sm8550_dsi_cfg = { .bus_clk_names = dsi_sdm845_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), .io_start = { - { 0xae94000, 0xae96000 }, + { 0xae94000, 0xae96000, 0 }, }, - .num_dsi = 2, }; static const struct regulator_bulk_data sc7180_dsi_regulators[] = { @@ -226,9 +216,8 @@ static const struct msm_dsi_config sc7180_dsi_cfg = { .bus_clk_names = dsi_sc7180_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sc7180_bus_clk_names), .io_start = { - { 0xae94000 }, + { 0xae94000, 0 }, }, - .num_dsi = 1, }; static const char * const dsi_sc7280_bus_clk_names[] = { @@ -246,9 +235,8 @@ static const struct msm_dsi_config sc7280_dsi_cfg = { .bus_clk_names = dsi_sc7280_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sc7280_bus_clk_names), .io_start = { - { 0xae94000, 0xae96000 }, + { 0xae94000, 0xae96000, 0 }, }, - .num_dsi = 2, }; static const char * const dsi_qcm2290_bus_clk_names[] = { @@ -266,9 +254,8 @@ static const struct msm_dsi_config qcm2290_dsi_cfg = { .bus_clk_names = dsi_qcm2290_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_qcm2290_bus_clk_names), .io_start = { - { 0x5e94000 }, + { 0x5e94000, 0 }, }, - .num_dsi = 1, }; static const struct msm_dsi_host_cfg_ops msm_dsi_v2_host_ops = { diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.h b/drivers/gpu/drm/msm/dsi/dsi_cfg.h index df9f09876ccb..03493cc6b772 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.h +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.h @@ -41,8 +41,8 @@ struct msm_dsi_config { int num_regulators; const char * const *bus_clk_names; const int num_bus_clks; - const resource_size_t io_start[VARIANTS_MAX][DSI_MAX]; - const int num_dsi; + /* Allow + 1 entry for the zero-terminator */ + const resource_size_t io_start[VARIANTS_MAX][DSI_MAX + 1]; }; struct msm_dsi_host_cfg_ops { diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index 22ba8726b0ea..f5092b4d0757 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_host) if (!res) return -EINVAL; - for (i = 0; i < cfg->num_dsi; i++) { + for (i = 0; cfg->io_start[0][i]; i++) { if (cfg->io_start[0][i] == res->start) return i; } From patchwork Sat Feb 11 11:51:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 55790 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1455170wrn; Sat, 11 Feb 2023 03:53:42 -0800 (PST) X-Google-Smtp-Source: AK7set/93B+wBLzUkVH7Lg2bC+GxRKA1VYI6xp508ffqDFXigtkgzgbq6/b1bQgwoZlzKzlBxfn1 X-Received: by 2002:a50:d58f:0:b0:49e:45a8:1ac9 with SMTP id v15-20020a50d58f000000b0049e45a81ac9mr19564910edi.24.1676116422353; Sat, 11 Feb 2023 03:53:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676116422; cv=none; d=google.com; s=arc-20160816; b=Rk3F3SGSR8la3qqp2Uv0Q7M0p1LUJJY6/N1uy7yc92tDSFDBM5rW8Umw7WKtjy1ZnA y07YEFhBGB9MzURNrO+g2uEH1tGPUZW4NMikPf7kHOlFVzkNBUHaIb81yOpxjIk6PkLf p4E8Vdkk5RsEpPEfmGstEFWCM+3ebKq+L8JmQSQ4UrWS0M16BLU5xy68mSUsEhlTRF2T ArpoiNWDvyMrR3DSLXAQsp3dLczuCXjvKVvH3IHO5IkJ6opJfBWvqAtwbOQUWTvcDh9V 8D+Fyaspdj3dTuI86oUO+ih2grXi7rYGU0Gg9lweugr/b/+nouf0jmSX4QDAVcmJcIIm 2sYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zW+Y9s4c1yRvon1yWv9+3TgQXnziiU3kCR/96B6KXds=; b=jCL0shE68nXratgMr9am7ldLgyjI2v/rHiOpnW1JFgim23et35/ttmIc/MjhRE9AOm Y0qV4SSSo5p1BDYloyIE4hXQxFQYqUBO0E2sKl/y297cgN+3VoPaRl6jvRkdrZCAIGhG zcfTW2dsAke6p3Pme0cqo+M3LubVBbY5z9FaFF6WFO3hRFr+QcZTK/xBeybsLtN2l5LC S/llYTF2jJ/iE4h5rM59KOE3kP8exlc2V9uLy/tNnbLa+QjYfDRGxmTrvybzyDXsl/w/ Y12PoSVUv3UImwK3W6MxddTTYBul+dQNN66QpBJtuUVms1Nl8Q3pptKR/0j7yOOYXXkK SvtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TQtaWs28; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z11-20020a50eb4b000000b004a2593fcbedsi8380669edp.94.2023.02.11.03.53.19; Sat, 11 Feb 2023 03:53:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TQtaWs28; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230163AbjBKLwO (ORCPT + 99 others); Sat, 11 Feb 2023 06:52:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230161AbjBKLwH (ORCPT ); Sat, 11 Feb 2023 06:52:07 -0500 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC09F1F5CB for ; Sat, 11 Feb 2023 03:51:57 -0800 (PST) Received: by mail-ed1-x52d.google.com with SMTP id a10so7288180edu.9 for ; Sat, 11 Feb 2023 03:51:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zW+Y9s4c1yRvon1yWv9+3TgQXnziiU3kCR/96B6KXds=; b=TQtaWs28pO9XDAkHX2tefGKjjdl83OBLBeG56rO5GUjRm9XsfeAimbleEl0ZRh2mC2 eRDM+Ma9OWB6TYiNkL8AT0JjkSGNebW6zZIdSVashk9ppxa3ANoUSv8f1XZ9n9+rVQ6w naWH5YN+NqDFuyUBvuRDviqWa1chRnaQD6VCvk+pAI53txqtv7Xb4Z1+oS4G93dgdj7J A5dfiYoFW0Yrl1zdc/htvnzttiRtS5Ia9Di6auyv950ldDvHkcW6DSn6VzuJoYOpxzmz rz5IjzIlsGYRTjEVgtsbMsBjSj6f86R+y8q5Jk/Vh4CmojKWbkU7udIqt1IKOWK4dwhL VONQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zW+Y9s4c1yRvon1yWv9+3TgQXnziiU3kCR/96B6KXds=; b=ipMKHecC62HaEfDvcSvTMjR+wMqKeC/tYlRmjBP5N2+SEuPZQL4X2GvQz7HSO0Iju9 EjH269XtOHCAXx4Apxd7L7qLzHsfEtvl/VuJf7PY5hz6RAI87qGawzUnRBnyLb9sypvV toSO2klBP7v6nQchEnZKZ5pFA7WctULxGCWqotJD7FmC4V7h6e9+fcJvsLyyKa+Arbl4 j5OUw3zM9bEY8W0Swg7QQqygw087KG6paY43asBptagJ6fa+I0B+Oae1ST0hrK95d+vw AtV9g8lW/0mKAo5ARvfwHn6KLkLREQuxWQfS0O4WY/aAL5nKeE5XAzHVU9zaJEotLfNz NrNg== X-Gm-Message-State: AO0yUKXECQZy1lvNKAz7msfLcBrTeGNjB8sI9Qqy2Ax1DPOZk59hOt/Y Dvb2+GHWFCV0BktFfOcC8SRtkw== X-Received: by 2002:a50:9feb:0:b0:4ac:b3af:1e1 with SMTP id c98-20020a509feb000000b004acb3af01e1mr3102029edf.13.1676116315918; Sat, 11 Feb 2023 03:51:55 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id r10-20020a50d68a000000b004aabb714230sm3636070edi.35.2023.02.11.03.51.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 03:51:55 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Neil Armstrong , Vinod Koul , Douglas Anderson , Loic Poulain , Vladimir Lypak , Archit Taneja , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/10] drm/msm/dsi: dsi_host: Fix DSI index detection when version clash occurs Date: Sat, 11 Feb 2023 12:51:04 +0100 Message-Id: <20230211115110.1462920-5-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211115110.1462920-1-konrad.dybcio@linaro.org> References: <20230211115110.1462920-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757535453699743344?= X-GMAIL-MSGID: =?utf-8?q?1757535453699743344?= Now that msm_dsi_config is ready to accept multiple sets of registers (where array[n][idx] holds the base registers of DSI(idx) for the nth entry), loop through all available configs to resolve hw version clashes. Fixes: 32280d66fd44 ("drm/msm/dsi: Don't get DSI index from DT") Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + drivers/gpu/drm/msm/dsi/dsi_host.c | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.h b/drivers/gpu/drm/msm/dsi/dsi_cfg.h index 03493cc6b772..4a47705234bd 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.h +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.h @@ -43,6 +43,7 @@ struct msm_dsi_config { const int num_bus_clks; /* Allow + 1 entry for the zero-terminator */ const resource_size_t io_start[VARIANTS_MAX][DSI_MAX + 1]; + const int num_variants; }; struct msm_dsi_host_cfg_ops { diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index f5092b4d0757..8dfa69bcff77 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -1862,16 +1862,18 @@ static int dsi_host_get_id(struct msm_dsi_host *msm_host) struct platform_device *pdev = msm_host->pdev; const struct msm_dsi_config *cfg = msm_host->cfg_hnd->cfg; struct resource *res; - int i; + int i, j, num_variants; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dsi_ctrl"); if (!res) return -EINVAL; - for (i = 0; cfg->io_start[0][i]; i++) { - if (cfg->io_start[0][i] == res->start) - return i; - } + num_variants = cfg->num_variants ? cfg->num_variants : 1; + + for (i = 0; i < num_variants; i++) + for (j = 0; cfg->io_start[i][j]; j++) + if (cfg->io_start[i][j] == res->start) + return j; return -EINVAL; } From patchwork Sat Feb 11 11:51:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 55792 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1455202wrn; Sat, 11 Feb 2023 03:53:53 -0800 (PST) X-Google-Smtp-Source: AK7set96WxD9tr20Lx6Bqscoent1MB184i9tVwo9EO2M4bz4sGpuupB9Dp1SEQEfkklbOIfT93a8 X-Received: by 2002:a17:902:e313:b0:19a:906a:e04e with SMTP id q19-20020a170902e31300b0019a906ae04emr131543plc.56.1676116433513; Sat, 11 Feb 2023 03:53:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676116433; cv=none; d=google.com; s=arc-20160816; b=fJoeKEeTETXuT1vdkQAzPGiqZggcbUlJylwuEEBPyvWPUEzkITxtwa29CNeUSsx2sD dxLc3K9PhIi5sTLybdY0Sz39eZGJF0qRgl01x8Tq+nia2sKrnvirSdOg2rJ2nhvHc623 XUQg1oRxqYz+sLJ+iHWc65wDGtpbsy8qX2p7yvL2DI+8+RQJ8bwhaaq2XhG9NdBM2bGA 6mhLLRXeloeGuVBsgoo7UgUiV9D0RNtjsvOJmt7WjKquDfMPBSsMX/i+jv5zj+a6Dch9 WPaGTjiCYAJLH9xhX7cGOOHv5D9YLaH/Akqr+z94K6MuITM42lPDRV5E3pjQLd5K6udv ekgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vjuw/WKHUzl4CS0skPJYkF1VfQoY8YcicD8uoD7GMqo=; b=M+iBEe1sgKdcaa12/aBFNRdh4pJvRMdWZZs7BbLXxfiRvERJVtdGOe4soHZbaL6TaN ciVRTl8N25fOmdNAKRQ96e6YRh/taFj+cS1KO4w0pXBZsQ/CmS/bP3msUzStPsHwb+3j c29ZMyNW6bO6/VjgyupVOeHTtVVj3Jd20kgaYYJw7exbtoNf1/Yjk29REgNa3JzKwlwg PTt7OT405FX8pyi6MI0a1lui+ff8yCLWyWKbGQth3JkwRScSBlTwDTg3IeZW4fS6Zid7 nazam7+UEIAAihLdl3mCJW8dJ9JuMSdI+itDdTUT/4Y6iD9ipW1orrosugRu9DVbyZGj CcMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MMlGoG1Q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z7-20020a170903018700b001899477302csi7249778plg.590.2023.02.11.03.53.41; Sat, 11 Feb 2023 03:53:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MMlGoG1Q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230179AbjBKLwX (ORCPT + 99 others); Sat, 11 Feb 2023 06:52:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230210AbjBKLwK (ORCPT ); Sat, 11 Feb 2023 06:52:10 -0500 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE1C311E8F for ; Sat, 11 Feb 2023 03:52:00 -0800 (PST) Received: by mail-ed1-x52a.google.com with SMTP id u21so7341440edv.3 for ; Sat, 11 Feb 2023 03:52:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vjuw/WKHUzl4CS0skPJYkF1VfQoY8YcicD8uoD7GMqo=; b=MMlGoG1QFkDFz6fzoQUmVxZRb5Qrt5eSRBTekI+BGXfrpFp8ss7RqovWc9M/65m4e2 lBxVsa52ZYn+vLJG4F9UncIF4P1HSbtEsyfHhBN189oHiHimX4c8q9JyKn8Iv6KdVKA8 dvGZNd22XRq7Dp/QuFIM7l2givieqLuIAqZFjly0sRBisMHsampGLW5m8uhhHsOpt6pi ozvXoS1JCgzRmOGkSs+AfYDbmzeAn3zUzo90Lymndvred2gLK7p580lnoUojah/YozWu RETxhQslzqxxU4xK/Ich0474I2UNT65viWeEQ2Hw36GoCk4dAfkkxbBKv+VUDdZIszlP bvaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vjuw/WKHUzl4CS0skPJYkF1VfQoY8YcicD8uoD7GMqo=; b=Nn6dIEj0+JUZdDTBvzxjBd+4kmprNMNO4UhBSfz4jLxrJOGGgZR6M4Gu63Osqbeikc nJcBlQl/pFWREjA8BtamxCIz5QbOfMCS6dYoIWYsvloZydk+PX+1jWkwRM+PPW/rQHXq 60zMYJzfwzFdg/bg5rWfgODIQrqfOy0eGt1D94T8CwbEHrLOf2Oewejj6Gv4B5VeXYgW m/mmRS26EXKNg84p91eZ0fgcQ1HGXfRyNTVC3djveE2ZNLGay9Ij+fQoPbjomcaAFCvH QGm7AhUpQu8asbs4fohCIRJnCi7tWAyZglagtvLPZ7/c0GLT/0UgONIJaYvoUfgC4RR5 2utw== X-Gm-Message-State: AO0yUKWJVhOfLTrvMJfTejLLpPJCu0pj53Pi/FFcv1sHV1steCFeFuOj evPwejg0mPlt6EG67hHB3BjvQw== X-Received: by 2002:a50:cd5a:0:b0:4ac:b9c0:77a6 with SMTP id d26-20020a50cd5a000000b004acb9c077a6mr912991edj.15.1676116320218; Sat, 11 Feb 2023 03:52:00 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id r10-20020a50d68a000000b004aabb714230sm3636070edi.35.2023.02.11.03.51.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 03:51:59 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Douglas Anderson , Neil Armstrong , Loic Poulain , AngeloGioacchino Del Regno , Archit Taneja , Harigovindan P , Rajeev Nandan , Stephen Boyd , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/10] drm/msm/dsi: dsi_cfg: Deduplicate identical structs Date: Sat, 11 Feb 2023 12:51:05 +0100 Message-Id: <20230211115110.1462920-6-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211115110.1462920-1-konrad.dybcio@linaro.org> References: <20230211115110.1462920-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757535465790380215?= X-GMAIL-MSGID: =?utf-8?q?1757535465790380215?= Some structs were defined multiple times for no apparent reason. Deduplicate them. Fixes: 3f3c8aff1f8f ("drm/msm/dsi: Add configuration for 8x76") Fixes: 3a3ff88a0fc1 ("drm/msm/dsi: Add 8x96 info in dsi_cfg") Fixes: 6125bd327e16 ("drm/msm: add DSI support for sc7180") Fixes: 65c391b31994 ("drm/msm/dsi: Add DSI support for SC7280") Signed-off-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- 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/dsi_cfg.c index 5f62c563bd1c..860681bfc084 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 = { }, }; -static const char * const dsi_8916_bus_clk_names[] = { +static const char * const dsi_v1_3_1_clk_names[] = { "mdp_core", "iface", "bus", }; -static const struct regulator_bulk_data msm8916_dsi_regulators[] = { +static const struct regulator_bulk_data dsi_v1_3_1_regulators[] = { { .supply = "vdda", .init_load_uA = 100000 }, /* 1.2 V */ { .supply = "vddio", .init_load_uA = 100000 }, /* 1.8 V */ }; static const struct msm_dsi_config msm8916_dsi_cfg = { .io_offset = DSI_6G_REG_SHIFT, - .regulator_data = msm8916_dsi_regulators, - .num_regulators = ARRAY_SIZE(msm8916_dsi_regulators), - .bus_clk_names = dsi_8916_bus_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_8916_bus_clk_names), + .regulator_data = dsi_v1_3_1_regulators, + .num_regulators = ARRAY_SIZE(dsi_v1_3_1_regulators), + .bus_clk_names = dsi_v1_3_1_clk_names, + .num_bus_clks = ARRAY_SIZE(dsi_v1_3_1_clk_names), .io_start = { { 0x1a98000, 0 }, }, }; -static const char * const dsi_8976_bus_clk_names[] = { - "mdp_core", "iface", "bus", -}; - -static const struct regulator_bulk_data msm8976_dsi_regulators[] = { - { .supply = "vdda", .init_load_uA = 100000 }, /* 1.2 V */ - { .supply = "vddio", .init_load_uA = 100000 }, /* 1.8 V */ -}; - static const struct msm_dsi_config msm8976_dsi_cfg = { .io_offset = DSI_6G_REG_SHIFT, - .regulator_data = msm8976_dsi_regulators, - .num_regulators = ARRAY_SIZE(msm8976_dsi_regulators), - .bus_clk_names = dsi_8976_bus_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_8976_bus_clk_names), + .regulator_data = dsi_v1_3_1_regulators, + .num_regulators = ARRAY_SIZE(dsi_v1_3_1_regulators), + .bus_clk_names = dsi_v1_3_1_clk_names, + .num_bus_clks = ARRAY_SIZE(dsi_v1_3_1_clk_names), .io_start = { { 0x1a94000, 0x1a96000, 0 }, }, @@ -107,10 +98,6 @@ static const struct msm_dsi_config msm8994_dsi_cfg = { }, }; -static const char * const dsi_8996_bus_clk_names[] = { - "mdp_core", "iface", "bus", "core_mmss", -}; - static const struct regulator_bulk_data msm8996_dsi_regulators[] = { { .supply = "vdda", .init_load_uA = 18160 }, /* 1.25 V */ { .supply = "vcca", .init_load_uA = 17000 }, /* 0.925 V */ @@ -121,8 +108,8 @@ static const struct msm_dsi_config msm8996_dsi_cfg = { .io_offset = DSI_6G_REG_SHIFT, .regulator_data = msm8996_dsi_regulators, .num_regulators = ARRAY_SIZE(msm8996_dsi_regulators), - .bus_clk_names = dsi_8996_bus_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_8996_bus_clk_names), + .bus_clk_names = dsi_6g_bus_clk_names, + .num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names), .io_start = { { 0x994000, 0x996000, 0 }, }, @@ -167,24 +154,20 @@ static const struct msm_dsi_config sdm660_dsi_cfg = { }, }; -static const char * const dsi_sdm845_bus_clk_names[] = { +static const char * const dsi_v2_4_clk_names[] = { "iface", "bus", }; -static const char * const dsi_sc7180_bus_clk_names[] = { - "iface", "bus", -}; - -static const struct regulator_bulk_data sdm845_dsi_regulators[] = { +static const struct regulator_bulk_data dsi_v2_4_regulators[] = { { .supply = "vdda", .init_load_uA = 21800 }, /* 1.2 V */ }; static const struct msm_dsi_config sdm845_dsi_cfg = { .io_offset = DSI_6G_REG_SHIFT, - .regulator_data = sdm845_dsi_regulators, - .num_regulators = ARRAY_SIZE(sdm845_dsi_regulators), - .bus_clk_names = dsi_sdm845_bus_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), + .regulator_data = dsi_v2_4_regulators, + .num_regulators = ARRAY_SIZE(dsi_v2_4_regulators), + .bus_clk_names = dsi_v2_4_clk_names, + .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), .io_start = { { 0xae94000, 0xae96000, 0 }, }, @@ -198,32 +181,24 @@ static const struct msm_dsi_config sm8550_dsi_cfg = { .io_offset = DSI_6G_REG_SHIFT, .regulator_data = sm8550_dsi_regulators, .num_regulators = ARRAY_SIZE(sm8550_dsi_regulators), - .bus_clk_names = dsi_sdm845_bus_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), + .bus_clk_names = dsi_v2_4_clk_names, + .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), .io_start = { { 0xae94000, 0xae96000, 0 }, }, }; -static const struct regulator_bulk_data sc7180_dsi_regulators[] = { - { .supply = "vdda", .init_load_uA = 21800 }, /* 1.2 V */ -}; - static const struct msm_dsi_config sc7180_dsi_cfg = { .io_offset = DSI_6G_REG_SHIFT, - .regulator_data = sc7180_dsi_regulators, - .num_regulators = ARRAY_SIZE(sc7180_dsi_regulators), - .bus_clk_names = dsi_sc7180_bus_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_sc7180_bus_clk_names), + .regulator_data = dsi_v2_4_regulators, + .num_regulators = ARRAY_SIZE(dsi_v2_4_regulators), + .bus_clk_names = dsi_v2_4_clk_names, + .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), .io_start = { { 0xae94000, 0 }, }, }; -static const char * const dsi_sc7280_bus_clk_names[] = { - "iface", "bus", -}; - static const struct regulator_bulk_data sc7280_dsi_regulators[] = { { .supply = "vdda", .init_load_uA = 8350 }, /* 1.2 V */ }; @@ -232,8 +207,8 @@ static const struct msm_dsi_config sc7280_dsi_cfg = { .io_offset = DSI_6G_REG_SHIFT, .regulator_data = sc7280_dsi_regulators, .num_regulators = ARRAY_SIZE(sc7280_dsi_regulators), - .bus_clk_names = dsi_sc7280_bus_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_sc7280_bus_clk_names), + .bus_clk_names = dsi_v2_4_clk_names, + .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), .io_start = { { 0xae94000, 0xae96000, 0 }, }, From patchwork Sat Feb 11 11:51:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 55793 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1455222wrn; Sat, 11 Feb 2023 03:54:00 -0800 (PST) X-Google-Smtp-Source: AK7set9+uWcIe+xhy5T83S/aJ9kSktRq2uPiYdfjG4cchzSpuii4H6J2xR/vePhX6INL1ns4LnwW X-Received: by 2002:a17:906:830c:b0:878:5d46:9ed2 with SMTP id j12-20020a170906830c00b008785d469ed2mr18157139ejx.39.1676116440575; Sat, 11 Feb 2023 03:54:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676116440; cv=none; d=google.com; s=arc-20160816; b=h8u07ikWa366RJgG1vnXG17fofb7U5Dyf0FEyjo0zEVRL+VGRQTFZo+IMx9UX8b2+C vH8ypK3QRcdVrpZporO+FCa5mKQ+xCXAb9Jb0GqVSFaReqqh9QI9UQ6JgY6kZ097IaAA FB9xmnP+0U7Ps5u3kqxH78wiL2oW3HV/5+YNoe+3+88bwNVT7urmHq5Ax6GP1y6yTfdO vP9+UJ22K2VuRlBedl7Mm2WeQku4TdatI6apjEVclMoKoISIfbdeFwcwaIKT0J7/M9J6 +/SAJEWCbBMAFOBo6XxZlcDXntoDAxjXRKqaK8oc84/Ju84swTw3QSCUK/KyW05HCzXk H9vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Xu29OnoYbs7XlgjQ7eQ5Uic7usShH1dqxj/7r0Nr9hA=; b=ieExwGY6+yDbLEeBzt8xXkgjq4zt0bO8bDbOcMIVXw2mXC89Ay3TOjMGk9ZYDpvp7a HPdT//Cb0nMZ6DMZ49Tc1bhdKCd2t48y/qwDvwHFg2k4K6aBwFwxAqXxL3c9OHdE5P+M OeSjFXpXawc2tbhHfU3k9unJxgrI976/SGj08hVuLo5cafFeAdR95/NT7x6LLSENUaVd SA9wq8ZykgnpcX7FKg33a2deAVfuyH+yccX3DOijJkWHBlbDO8Rk3bvDTV4a+fUvy9HU tdldsGXWGMSjNgIFcDDT2S1TNK63HJ5E4nGUK8Pj7RfC0cLSZbQoAtoOufDRqIDblyFT jQSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Azhb35xQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id wj13-20020a170907050d00b0088d5dc62a29si6345136ejb.200.2023.02.11.03.53.38; Sat, 11 Feb 2023 03:54:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Azhb35xQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229601AbjBKLwh (ORCPT + 99 others); Sat, 11 Feb 2023 06:52:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230220AbjBKLwP (ORCPT ); Sat, 11 Feb 2023 06:52:15 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5061D28231 for ; Sat, 11 Feb 2023 03:52:04 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id d40so6069571eda.8 for ; Sat, 11 Feb 2023 03:52:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Xu29OnoYbs7XlgjQ7eQ5Uic7usShH1dqxj/7r0Nr9hA=; b=Azhb35xQfIkRkppUDbGElCHDXkOGIHdkj1Wv+qJ9Ee16d9Isac9HTm6yCOEXSMRLCI xtpA8d+cpYU/ZIYscQwv9uDWxWMpLgT1wl/6JirdYNKfZ/Jz9Tx7N22uGIBi/qZLhsed RTNgmdvFI/iWwkiySU9bWbkOtdvmIl/64w3c8qECr+fV/bkKxIoyjqvH6qofhw2pV+/B d/ul1NoifWxFv0E7kVA46uZOfWZLjGr8VHGUPlZFSY/h4XAnI7beO+Yw9V/3U5p/AP+q cF4JXHsznSlH+gNl632wsRfoqbsJu6QflbMJrhF8itMclgsZYKxRQ1sa1ht4EPSJccRM KL+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xu29OnoYbs7XlgjQ7eQ5Uic7usShH1dqxj/7r0Nr9hA=; b=mj3HztG6VUBmp6FhHPjxN11+u0m2GgirI0AUxYlz97hqn3ktSOIPvj0JOpRqBiV6q8 CQl+AgA1lQfM7DxGQMl1Kd3eJxLgTTgTo/CBniF3OcZI+YjtMeevnwJFRhXB873ebkGu jo/DL+CgpWXqb3LX3SMgI59zBN8Kkju7LWmNP+fJm6rL6LTyy3mXEZPBMHj7z6jhwpsr il+I+kN8dncsNNgMbLl4DLXOHNpsMfZ4AdtWcW/ewU+YBmhlkM4CWMTaXMRwMhNr92Tz 99g9tn+1Pr6B1Vigb1Pv67DP/iCoH9JeLWEVoW73ubdWePRs2IMswVFRrWEtOy4jLQ+A AqgA== X-Gm-Message-State: AO0yUKXzl0lHJFUQtiIirxonquUCUqdH3x3I9KoD3tyZsHS6qcIopoZ8 iZ8CmjeDxwTgN9MEhqG/cZ/bQg== X-Received: by 2002:a50:9f28:0:b0:4ab:b0d5:6bb0 with SMTP id b37-20020a509f28000000b004abb0d56bb0mr4200948edf.18.1676116322880; Sat, 11 Feb 2023 03:52:02 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id r10-20020a50d68a000000b004aabb714230sm3636070edi.35.2023.02.11.03.52.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 03:52:02 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Douglas Anderson , Loic Poulain , Neil Armstrong , Harigovindan P , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/10] drm/msm/dsi: dsi_cfg: Merge SC7180 config into SDM845 Date: Sat, 11 Feb 2023 12:51:06 +0100 Message-Id: <20230211115110.1462920-7-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211115110.1462920-1-konrad.dybcio@linaro.org> References: <20230211115110.1462920-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757535472573233246?= X-GMAIL-MSGID: =?utf-8?q?1757535472573233246?= The configs are identical, other than the number of *maximum* DSI hosts allowed. This isn't an issue, unless somebody deliberately tries to access the inexistent host by adding a dt node for it. Remove the SC7180 struct and point the hw revision match to the SDM845's one. On a note, this could have been done back when 7180 support was introduced. Fixes: 6125bd327e16 ("drm/msm: add DSI support for sc7180") Signed-off-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c index 860681bfc084..142a0f1e2576 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -169,7 +169,7 @@ static const struct msm_dsi_config sdm845_dsi_cfg = { .bus_clk_names = dsi_v2_4_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), .io_start = { - { 0xae94000, 0xae96000, 0 }, + { 0xae94000, 0xae96000, 0 }, /* SDM845 / SDM670 / SC7180 */ }, }; @@ -188,17 +188,6 @@ static const struct msm_dsi_config sm8550_dsi_cfg = { }, }; -static const struct msm_dsi_config sc7180_dsi_cfg = { - .io_offset = DSI_6G_REG_SHIFT, - .regulator_data = dsi_v2_4_regulators, - .num_regulators = ARRAY_SIZE(dsi_v2_4_regulators), - .bus_clk_names = dsi_v2_4_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), - .io_start = { - { 0xae94000, 0 }, - }, -}; - static const struct regulator_bulk_data sc7280_dsi_regulators[] = { { .supply = "vdda", .init_load_uA = 8350 }, /* 1.2 V */ }; @@ -299,7 +288,7 @@ static const struct msm_dsi_cfg_handler dsi_cfg_handlers[] = { {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_4_0, &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops}, {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_4_1, - &sc7180_dsi_cfg, &msm_dsi_6g_v2_host_ops}, + &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops}, {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_5_0, &sc7280_dsi_cfg, &msm_dsi_6g_v2_host_ops}, {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_6_0, From patchwork Sat Feb 11 11:51:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 55794 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1455268wrn; Sat, 11 Feb 2023 03:54:10 -0800 (PST) X-Google-Smtp-Source: AK7set9aAIgVbV+EPYboWo0qxKAeT5c722PrNP+pbCMeYbOGcyIzzm6EVocz98sQgV98/jusH9uP X-Received: by 2002:a50:d58b:0:b0:4aa:a390:bf4a with SMTP id v11-20020a50d58b000000b004aaa390bf4amr18305656edi.20.1676116450458; Sat, 11 Feb 2023 03:54:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676116450; cv=none; d=google.com; s=arc-20160816; b=hlMi382rwCe58uU/3IbqHt10xMRz9L1V1KUr89jYlXQxf3TtdNXpL7HTbpYlKhd8al 4aVZS/Sfk83HRqyvD+CnRyM7C/+cyQ8swf1POHM/wZ0jQLTegxBajITPahAQjEsKxMEP kQbr0RAai3LYBvTxw33pCp4ffvVA1G+i6zOIC8D1qv5y58KEPE1FEh/FAr/Tn1ZHBDAJ CkEZ3wlUfs98YWdutuHhJa2QEian5b3q1L48NQ892ngmdr6HGc9kIpONZkz4i1FFJb6U At8QEqIFZPclGdnOoBBFgMSOXUscPYmkdkaC+ZKR3ubRsyRzhkIKsgxgdqq0FYGsW905 vIwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Nzh9retSVIyMmp57bQNIeqL4Qh27h4qyWsMsM/hhbxc=; b=hehhL98ou3soF92kFXrSvnC4GY4Dullin7ICo3AY/gsKuDg5Sm8gz8mRc+tqgHHKyY KwmgqbiIfeBFScqzhKBfgdQfeB7fhJn4ScVVeA7ZSmOnqBoZtgl532cVSSrwk6xjjLgS Tun2HnByXfUDu9F+zYu7UCqVG6hW0mfYqnFQfWSPavfwe0eucEWb5SGMFmyhrEkcXVOv 8WGdkDFyPlbDkr1kWM08/oxBiF1/lkfv7X6/yEdxOsMjdmcXGd05aGXRHkTjG7VYtzuF Gj7Cxcrx79eq+yRZtKSd5kNXHKtLiOYBnKrQ4Mnh3QcdMi1BGXuNnkwTxH/ekks+0Vki v7Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kmXKYVHw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b20-20020aa7dc14000000b004aac4b55319si7644165edu.480.2023.02.11.03.53.47; Sat, 11 Feb 2023 03:54:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kmXKYVHw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229875AbjBKLwr (ORCPT + 99 others); Sat, 11 Feb 2023 06:52:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230237AbjBKLwW (ORCPT ); Sat, 11 Feb 2023 06:52:22 -0500 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C42C241FB for ; Sat, 11 Feb 2023 03:52:07 -0800 (PST) Received: by mail-ed1-x52c.google.com with SMTP id m8so7284519edd.10 for ; Sat, 11 Feb 2023 03:52:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nzh9retSVIyMmp57bQNIeqL4Qh27h4qyWsMsM/hhbxc=; b=kmXKYVHwswRrA4LI2hz1zuC1ZB+aegsUZUKkBR7KDF27Nrt0UScprMI5AI1B4FP4Y8 dZE6kLHaWBnul93HSxeqQXNdaDxj71RW7guiOUs1GcWgsyIfewE5WdlnUFM4UKfCDQEp 4CumJqfe1EIjTiDDqrWobK4hCWaxq1CGXWLJNPu3Jb2m6Ninl8cqqQ4EMN2jijTAhYrY VaS3fNHp4UZekS2JDauri54E+vRD+PCLKCTxKA3ZqoDpWIKHRbVchmsNx9miVqG3O/0U guDJI45qT93E5nTL8+9BsD/1noIirMXDJyqhym5JVwFLrB++A8VXBXextL8WzOVIAFG9 bgJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nzh9retSVIyMmp57bQNIeqL4Qh27h4qyWsMsM/hhbxc=; b=cws7c/B/izdqXkHNG9RoFVLok1w1JHEIF6k5mTI2vm/5blbMVcy2PzvAKnQ1Mz6n7O 8TX7QgWAZGw1Qm16hXrm/fXIuvjsO35ye0tPfP1p+2uq1Ta26lB5MdTpO2MGrYeZ5krb 7CehMeFpUh3e5jAYG4GiCt0MxUtxe+MI7o/2U6zk7nZOqoFK91ZGaYX7geKV6DXqmccF IGADmnUsn7ZJe85jC/lWlzxi3n3tH06dULSxYuWiBmOma9vyDOuwaA77tjSSKZUAjqs/ qj+zmSg62VWJxEwGP98I4n0jVp6qxVa4e0Va8arzhv7MeppUcQRFBuVurAo5LYX2PzZq rIQw== X-Gm-Message-State: AO0yUKVX5iKXSFxbUSnrIC9pvxGbuha5Jl0Z4JDlnTPNQmYcrOoooU5u WtLzW1F/Bg62gjQKCQyFK7EEQA== X-Received: by 2002:a50:d0c4:0:b0:4ab:1f18:7839 with SMTP id g4-20020a50d0c4000000b004ab1f187839mr9908229edf.22.1676116326366; Sat, 11 Feb 2023 03:52:06 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id r10-20020a50d68a000000b004aabb714230sm3636070edi.35.2023.02.11.03.52.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 03:52:06 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Kuogee Hsieh , Loic Poulain , Johan Hovold , Vinod Koul , Douglas Anderson , Neil Armstrong , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/10] drm/msm/dsi: Switch the QCM2290-specific compatible to index autodetection Date: Sat, 11 Feb 2023 12:51:07 +0100 Message-Id: <20230211115110.1462920-8-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211115110.1462920-1-konrad.dybcio@linaro.org> References: <20230211115110.1462920-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757535483022441438?= X-GMAIL-MSGID: =?utf-8?q?1757535483022441438?= 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. Fixes: ee1f09678f14 ("drm/msm/dsi: Add support for qcm2290 dsi controller") Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/dsi/dsi.c | 4 +++- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 29 +++-------------------------- 2 files changed, 6 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) static const struct of_device_id dt_match[] = { { .compatible = "qcom,mdss-dsi-ctrl", .data = NULL /* autodetect cfg */ }, - { .compatible = "qcom,dsi-ctrl-6g-qcm2290", .data = &qcm2290_dsi_cfg_handler }, + + /* Deprecated, don't use */ + { .compatible = "qcom,dsi-ctrl-6g-qcm2290", .data = NULL }, {} }; diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c index 142a0f1e2576..81d41f247040 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -169,8 +169,10 @@ static const struct msm_dsi_config sdm845_dsi_cfg = { .bus_clk_names = dsi_v2_4_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), .io_start = { - { 0xae94000, 0xae96000, 0 }, /* SDM845 / SDM670 / SC7180 */ + { 0xae94000, 0xae96000, 0 }, /* SDM845 / SDM670 */ + { 0x5e94000, 0 }, /* QCM2290 / SM6115 / SM6125 / SM6375 */ }, + .num_variants = 2, }; static const struct regulator_bulk_data sm8550_dsi_regulators[] = { @@ -203,25 +205,6 @@ static const struct msm_dsi_config sc7280_dsi_cfg = { }, }; -static const char * const dsi_qcm2290_bus_clk_names[] = { - "iface", "bus", -}; - -static const struct regulator_bulk_data qcm2290_dsi_cfg_regulators[] = { - { .supply = "vdda", .init_load_uA = 21800 }, /* 1.2 V */ -}; - -static const struct msm_dsi_config qcm2290_dsi_cfg = { - .io_offset = DSI_6G_REG_SHIFT, - .regulator_data = qcm2290_dsi_cfg_regulators, - .num_regulators = ARRAY_SIZE(qcm2290_dsi_cfg_regulators), - .bus_clk_names = dsi_qcm2290_bus_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_qcm2290_bus_clk_names), - .io_start = { - { 0x5e94000, 0 }, - }, -}; - static const struct msm_dsi_host_cfg_ops msm_dsi_v2_host_ops = { .link_clk_set_rate = dsi_link_clk_set_rate_v2, .link_clk_enable = dsi_link_clk_enable_v2, @@ -312,9 +295,3 @@ const struct msm_dsi_cfg_handler *msm_dsi_cfg_get(u32 major, u32 minor) return cfg_hnd; } - -/* Non autodetect configs */ -const struct msm_dsi_cfg_handler qcm2290_dsi_cfg_handler = { - .cfg = &qcm2290_dsi_cfg, - .ops = &msm_dsi_6g_v2_host_ops, -}; From patchwork Sat Feb 11 11:51:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 55798 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1455805wrn; Sat, 11 Feb 2023 03:56:17 -0800 (PST) X-Google-Smtp-Source: AK7set8jg7qv+OKbV4jPPZYxy2VwkOpt/k6KxEoC9jW3YJ7KmZzcHqiunHitd5Jj/M10E2drzsnK X-Received: by 2002:a50:8711:0:b0:4ac:b937:3976 with SMTP id i17-20020a508711000000b004acb9373976mr1325540edb.4.1676116577324; Sat, 11 Feb 2023 03:56:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676116577; cv=none; d=google.com; s=arc-20160816; b=rq8l1hZR0NdHtOqR2TeQPe4wQ+6hmR4Ny4X3P9BaxDD2Qw0k5Q6Uy1V6sQq1onD7LW biELKHGAmSrqh1zewCmTNjU3iBfdzzd3XmpOHQOWVgltlrGkSHED6w7uPclnX2LSEdzZ nCGiK5hMV75I/d2wBg+gucYhXReXaxCkjcr1uhERLSykHHIEmeoMxmJ2z3cNZ5/shvyq e/84zhb+m/M1HFggc4+EZggDMom9VvWynlD8+vLlDexwfeCaWNty5qflgyNRJK4aAA6X csTxpHCaX4sTuIfoQigOQAD7RQey0pCtPnR3bhhITu/p0o3ilemonmK9dV5hMYtFsBMm KvmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rmt6VW0qzHeVmfsiW1rh5EIINQ5Xr+hUNmJsEmBTOOs=; b=ChxcIe27EzI1/sC41xrz4XOWpesO3VMKrW06FZ7NiOp4fVFW3ypihs8H/GW1U864U0 3YFPPajLHg0UzblCxkwqR2KUN8H9be3TvkUG/ydn3yeJ/tmLpitkr+q4Y0wsco/XC7FL GnPJskmcR7+h2S4GgdHi1vzwivEkozqLM309V4PZ0u+wAVAyRhSQoNQ2KgEH1HHz369/ 3urRhqhGq7VhbMR1bqe7Tu9gYbKs6uUnKE0gYuRvWiqElHEGXxcOU1ZECZdiVV0ol0u3 Xf4mAoVqF/iTKcI1QDLh8JFvnPB1oAf7V804OFqoe4iYlvc/LE0RkBT1VVyNTc8L50YK AKjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EzfpwYOs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g3-20020a056402180300b004acb6f9299bsi1737536edy.554.2023.02.11.03.55.54; Sat, 11 Feb 2023 03:56:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EzfpwYOs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230184AbjBKLwt (ORCPT + 99 others); Sat, 11 Feb 2023 06:52:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230050AbjBKLw0 (ORCPT ); Sat, 11 Feb 2023 06:52:26 -0500 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4722BEB6E for ; Sat, 11 Feb 2023 03:52:10 -0800 (PST) Received: by mail-ed1-x531.google.com with SMTP id fj20so7352207edb.1 for ; Sat, 11 Feb 2023 03:52:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rmt6VW0qzHeVmfsiW1rh5EIINQ5Xr+hUNmJsEmBTOOs=; b=EzfpwYOsuX2EE/VJNfqpGd6gfX3N3ZS3aObHcIi4JhKxtgNap2qsxZJ7nI/hBQWeO8 SaB0NLjyYdJw9m3w4lxsp8VagGW1QSx16dWoz60m/gCm08jWxlBvsdo13QydlmhNAKED V8N80WYqq1DHALFRoU4/NahRAShWnQ+ibT3LGKmgiYPjJhV2iRjKkAk/ognNtVPo5KaJ zSlzgTN2nW+Dhwy6jO0N3Q9YYoDKhKWF38o7D24o1aF7w8XMyvu1707u4mtu1VlTuWH9 sIW+5wx6/WfOWHqW0Ia1q73M2+U1kkeF372RfGS5n3NcJXtPelFkc91fSs2Nrb6KXiSQ imDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rmt6VW0qzHeVmfsiW1rh5EIINQ5Xr+hUNmJsEmBTOOs=; b=cm3IBSODfMGgmlbow+Ua+bc2EgKro1q9Lz0P4IIzA17GYf0qwf7pggyh8vHKGHcDZT bxcgAjGqMrhnIVCXIdPiUUx6NV16KmgEAsaPmg2IQPkA10D6Ggn30T1ZdmDKpkvQ4yLn RjPT0gTwmqkBS+I9uQYf87zBYjhmp8emo+akFCiNKEQbEY2D+mtHrOjyEY0+O8bSQH7X Nahketqh7+NtWvdWCeVHX3lBR8t2I4fqNGTJKBxC0Ze+aF188Y1fjyrmOeeFQJrLceuO d7mEluC2TWv9Zm+QP2jRr0oOIWK1mTQGB8yhUYJk3WB0JtuTt+nQqG0Xnc9YwZ7RQE65 ZMlg== X-Gm-Message-State: AO0yUKXZpP2xT3c7v3vlBHFZNnedzgDrIK9x1FCkC4UnB7mKq+5ukQ54 C7YUFiTfLcgYIpYoE5HrszhgRA== X-Received: by 2002:a50:935a:0:b0:4ac:b4b1:53fe with SMTP id n26-20020a50935a000000b004acb4b153femr3345338eda.20.1676116329827; Sat, 11 Feb 2023 03:52:09 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id r10-20020a50d68a000000b004aabb714230sm3636070edi.35.2023.02.11.03.52.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 03:52:09 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Johan Hovold , Loic Poulain , Kuogee Hsieh , Vinod Koul , Douglas Anderson , Vladimir Lypak , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/10] drm/msm/dsi: Remove custom DSI config handling Date: Sat, 11 Feb 2023 12:51:08 +0100 Message-Id: <20230211115110.1462920-9-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211115110.1462920-1-konrad.dybcio@linaro.org> References: <20230211115110.1462920-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757535616362154185?= X-GMAIL-MSGID: =?utf-8?q?1757535616362154185?= 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") Signed-off-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- 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 *pdev) } static const struct of_device_id dt_match[] = { - { .compatible = "qcom,mdss-dsi-ctrl", .data = NULL /* autodetect cfg */ }, + { .compatible = "qcom,mdss-dsi-ctrl" }, /* Deprecated, don't use */ - { .compatible = "qcom,dsi-ctrl-6g-qcm2290", .data = NULL }, + { .compatible = "qcom,dsi-ctrl-6g-qcm2290" }, {} }; diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index 8dfa69bcff77..79c33d066348 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_config( int ret; u32 major = 0, minor = 0; - cfg_hnd = device_get_match_data(dev); - if (cfg_hnd) - return cfg_hnd; - ahb_clk = msm_clk_get(msm_host->pdev, "iface"); if (IS_ERR(ahb_clk)) { pr_err("%s: cannot get interface clock\n", __func__); From patchwork Sat Feb 11 11:51:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 55796 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1455471wrn; Sat, 11 Feb 2023 03:55:02 -0800 (PST) X-Google-Smtp-Source: AK7set8tNPGfMw2/kDDElPZRbTpGJEaBpsUPYIgWpwvQ/tesMeYpX9qRP54cAKUqufVsEcafXXM5 X-Received: by 2002:a50:a692:0:b0:4ab:24e4:4aeb with SMTP id e18-20020a50a692000000b004ab24e44aebmr8993333edc.10.1676116502146; Sat, 11 Feb 2023 03:55:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676116502; cv=none; d=google.com; s=arc-20160816; b=K9gaGSkuxhYJp/++CVcuezpK6rfp21DeOR+BLx8AP/RvazS+9lq18IY1/eSG7iMZPI tXGibayHD4SyG1OswkdDLe6DD5k2HCDwBWv6i7T1/9+MmOD20w16Ycify2aWSBbpG9KF 4WnWWU6y1xhJxDqqdTuRy03hDl7K6Jv6FwkI+muBP+yLjma5g3lcDZdd5YBJadmhwALu vmk9cdGPTN6wnFuF5R6L998vMSLoGZLxEsOFeq+RVEEe9tVlIOvDjJV4B3Z+UQ84+FGE EohZgVSVN3rnigQtxrzfmxkMgCF6J+bRYAI8DsKJ5msHiorD5VdmqSYQR9Tp2OOGSndK khqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ep4dAxNDBfiGXuqBk5NhBpEX23ggwEaT57AExj6qK0E=; b=Wq2HyKGEf5x28Oqx90u6vNiX5fLqsAxwIiDSuEhMPyxjX0rlfLb7F3wYGlw4hpVgJu OfVmTVBBwVroZimqMirUJcs6MUn/AdHd7sYL9lIuTKbGk/dd5jnzTrXDj/BF921wgVP/ KP0gNyi/uLRlQl59QgwaRI5VNdS02w9sAonsJBmJfZLZAMqkxymW/y2xbh0d8ugSqJjf YWVb0CR5y72dLsL4Wq2J0+LiNcIwkiWsRvQmnx8IGti3qNNVWsov6TumUwBITJn+QyiR Xvvudw9WzS0FXkmzIpDR9YowxbQImSaiesoEAma/p3bywHwBXhIj7tYP0aEbma9d2PoC hGXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ws9TMQBB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d18-20020a50fe92000000b004ab09d10379si8189577edt.450.2023.02.11.03.54.39; Sat, 11 Feb 2023 03:55:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ws9TMQBB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230225AbjBKLxC (ORCPT + 99 others); Sat, 11 Feb 2023 06:53:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229695AbjBKLwc (ORCPT ); Sat, 11 Feb 2023 06:52:32 -0500 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 632EB311D5 for ; Sat, 11 Feb 2023 03:52:12 -0800 (PST) Received: by mail-ed1-x52d.google.com with SMTP id v13so7279392eda.11 for ; Sat, 11 Feb 2023 03:52:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ep4dAxNDBfiGXuqBk5NhBpEX23ggwEaT57AExj6qK0E=; b=Ws9TMQBBjwg4Bf+XyEsFTANdDjnR52eVQqWllfm/eL6AswidbXnlQJFDHH4YLmfETD U3OxqDa/TZbXDxlHMmsZi40sD+HCNDSN34F3xv8sTzXEdmPfYuwUdiWzAWnb61rVQ0xf j8B+2w5F3dKIm3fGRFDOHXMjEtM6O+TU1dpWFBhRoB9K2Nv6uCaSb/rotnGu6iYPUOvA FuF2RJQaRu2z1CVEicVn07dV6HUMckQrZ67f3T8p84wIYZWVvYQ0Z+IO3oLs3J1l8Jk9 6ZTftQ2i8DJ9seg2/lTq/0tRRfa1/PJlP2CkPgmbRZ8d5rL8G1g6yB1W82v84ptd3yGh gc/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ep4dAxNDBfiGXuqBk5NhBpEX23ggwEaT57AExj6qK0E=; b=aUeSWdAX/9Bs45FxIaRaNplnnGP/lN2B6T20ClqXfV8GKq/W+iou5rTn7yj2SUP5Lb O+jvEa/B4fPOoit8bLnImYXB1/UQMAWzdGZoKB/x53e0OS64XK0dhHBprgRvoKBlR26J NYK6DZdrhxWnlOauBfY0RdbR1bXSOWb5cuRfztlfMlEf2SMSuIlpENVUOjcD9dCUdGfc 7AQYQvSD3Im6MZWfPq2HFLYcGM0sYHTRD1IXrEie0DqjVCbM2QPf4Eaft9YlbKgEmJK2 StKKmrGjBeC9/Vc2SiF2Md92TFSBkRrveeF+iX5hkpVmKd4lzOOPrWORkpWj8jUmVE3k xXbg== X-Gm-Message-State: AO0yUKXIyTY/TzCtRFNpEwwO+hL86c/ONYD8UvcxmDiVgFPjr2g9onvq /5G5seJOdtWzMDYKu+iThJms/A== X-Received: by 2002:a50:9e6e:0:b0:4aa:a709:8aaa with SMTP id z101-20020a509e6e000000b004aaa7098aaamr19205386ede.26.1676116331919; Sat, 11 Feb 2023 03:52:11 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id r10-20020a50d68a000000b004aabb714230sm3636070edi.35.2023.02.11.03.52.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 03:52:11 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Krishna Manikandan , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/10] dt-bindings: display/msm: dsi-controller-main: Add SM6115 Date: Sat, 11 Feb 2023 12:51:09 +0100 Message-Id: <20230211115110.1462920-10-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211115110.1462920-1-konrad.dybcio@linaro.org> References: <20230211115110.1462920-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757535537370786262?= X-GMAIL-MSGID: =?utf-8?q?1757535537370786262?= Add a compatible for the DSI on SM6115. Signed-off-by: Konrad Dybcio --- .../devicetree/bindings/display/msm/dsi-controller-main.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml index 2494817c1bd6..f195530ae964 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: From patchwork Sat Feb 11 11:51:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 55797 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1455528wrn; Sat, 11 Feb 2023 03:55:13 -0800 (PST) X-Google-Smtp-Source: AK7set+pAUATdssQ5b84nSX54vOmfzHiw33v5iCSS6mTtjgl9ZjBL6l45n+ASXgM8F5F+7xveXef X-Received: by 2002:a50:99c7:0:b0:4aa:6c75:caff with SMTP id n7-20020a5099c7000000b004aa6c75caffmr10234710edb.1.1676116513119; Sat, 11 Feb 2023 03:55:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676116513; cv=none; d=google.com; s=arc-20160816; b=uxa3lSKJ9zw0ITsz8aSBF2mv9lWYCYaj1dal8owLuhELKwq2cHkb0Wkz+XMuy6a9oL INirnA6Jz6Lm8lYllcQsFxeCfkOmmhA42QCDiqNsV59PknrdNibxgzB4odG/zvDZ/pk6 JwshNQxRiYkBQYqI6DPVL+mlkZAQ+lYvN1ymj8sYbgTk6Vxt5VG2TjoxTTjI7oaH4maO RZodIM47+ArzjHnG9OwlPq0IBp5PdbAyBss2Dce6zPId2/OZb8Rm5qUoa6AOEYeg1YIa QoTVlXPR43cUapIzIPWz32B5tPQIRm0KHA3iAqH5PWEnwbdi8ZcOFe/SuKk2FwZfN4X4 QKlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7JwitY1QgTn2wW32f2EWY7DiZlNcao6/ffQYXSOSkgM=; b=GPKXhnOsnqE7+1VFarE/MXRdzNB8noprrXeYAbwc2RRdO9z0VHnwdXUkMYxXqg9bS2 LJXP3Cvt8IbYRiwlVT5Bg0R6X4dRIqVsxCrfnBiXOUw2mqWWPqRk5R8ogt7r1WlkAzJP 8M0X1dnet/TGiB06aVTsZi8YTQPo+azdu2Jta7Anqgy4Irqn0QS85DdLeDrWJ/L1gwMo kb2UjSF4dUnbnzg5Gm2YXJG8iB13/DljUbABOcqgoL4p4D5Xnd25c3s8C0Xy906UI/lO RyyhV4XHiB7cpkAkgOUrCzGA0xmcCghZqA5n4BK6ON9SKEvqydujCbzBjsK9HBPsLefa wOSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O2U8bA+e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a23-20020aa7cf17000000b004aaa4e7d0acsi7675861edy.350.2023.02.11.03.54.50; Sat, 11 Feb 2023 03:55:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O2U8bA+e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230315AbjBKLxG (ORCPT + 99 others); Sat, 11 Feb 2023 06:53:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230245AbjBKLwh (ORCPT ); Sat, 11 Feb 2023 06:52:37 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9E7861B1 for ; Sat, 11 Feb 2023 03:52:13 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id p12so149037edc.0 for ; Sat, 11 Feb 2023 03:52:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7JwitY1QgTn2wW32f2EWY7DiZlNcao6/ffQYXSOSkgM=; b=O2U8bA+e0jscKVKwDF0a8uCnoSzlqs7txUc0HGXN02xC3KZQJlDAqLn1sUEKNd5OVr iSSvt3UnibYkF9OO11S5b8Ralk/c2YrEm/sY4+lmKdkhK+8MHEqeK3OG3vkQzEehqKwD FUn+HrGX6NNWa2I2DVgNIWf5NThDSHcTN0aiqnZVaSVqzON9lgEl9d8wWICYdGkxJ7vA WFc5EKn0ESHhEFYGwkDew5kNv3mNs5NlV5MOjO1R1S5LmO4eULFaajuJQxYOjTheKo7O dpSFQGN8Fgca3qM8tnNY6n+qCYAmPIduPjBwsZdxRTCwK8cKnsqG+iuWZ4iau9d3TnVB S0gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7JwitY1QgTn2wW32f2EWY7DiZlNcao6/ffQYXSOSkgM=; b=oYGGqx23eC8yr5587vTv9dwL0XokeDD3g/+Z8bm2QXmNR5cBLyBXHWI2f/FMsqQxRP ZmdJ7G4Pde/VDhKmmeeWAKe1tP1DoW4+XtdhHpDqq1tmL2TdrT2SdcsmGE2MVevG3joi Vy5FD1+AnM8lwqLddrTq2mDIlOvDEzhtoBfYaepxOieclDG0eU23gKO2FpPZl4Ff0LDE YXLiJVZhRxe6H7I8fgECbLQRbpDhBFTuaXLyHqSErQGyovwIVLsDezzukHkFPdvtllb8 7kfg+tiIpkQ62zHnRGTRfj1ZVF0d6roAVWYHiAjKCXDbAReR0uHgVCvbGoJpus7AcZAL tOFA== X-Gm-Message-State: AO0yUKWavx6KpTk0FkbxOByZJ8O7O2rd9blG8vRXoQB2wgRp+shC6/25 lqDZZW//U1wZBkvvkMqPwcdImA== X-Received: by 2002:a50:a402:0:b0:4ab:554:37e9 with SMTP id u2-20020a50a402000000b004ab055437e9mr14341402edb.41.1676116333351; Sat, 11 Feb 2023 03:52:13 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id r10-20020a50d68a000000b004aabb714230sm3636070edi.35.2023.02.11.03.52.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 03:52:13 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/10] arm64: dts: qcom: sm6115: Use the correct DSI compatible Date: Sat, 11 Feb 2023 12:51:10 +0100 Message-Id: <20230211115110.1462920-11-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211115110.1462920-1-konrad.dybcio@linaro.org> References: <20230211115110.1462920-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757535548948695805?= X-GMAIL-MSGID: =?utf-8?q?1757535548948695805?= Use the non-deprecated, SoC-specific DSI compatible. 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/qcom/sm6115.dtsi index bff067ed2e94..15811be82acc 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -1447,7 +1447,7 @@ opp-384000000 { }; mdss_dsi0: dsi@5e94000 { - compatible = "qcom,dsi-ctrl-6g-qcm2290"; + compatible = "qcom,sm6115-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0 0x05e94000 0x0 0x400>; reg-names = "dsi_ctrl";