From patchwork Mon Jan 16 15:21:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 13103391 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EFC43C46467 for ; Mon, 16 Jan 2023 15:21:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 47D3110E2AE; Mon, 16 Jan 2023 15:21:40 +0000 (UTC) Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0FCDD10E084 for ; Mon, 16 Jan 2023 15:21:34 +0000 (UTC) Received: by mail-wr1-x434.google.com with SMTP id r2so27801946wrv.7 for ; Mon, 16 Jan 2023 07:21:33 -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=ipy7aLx0VwQlNfAPQLDup1F5SBfWJdQz4FY6bwFHuGc=; b=S2uwb2b8BLVVzGbiBGjRSt09lvDYJKv/MTgNZb6TDZSThobAD5VuERDnzC8F9cOSlp 0GiBxIXYNJXIDrm8ryJeSxUN4MyVCEvi6vQYdDLsZNvU4h7nrj1GNBOmE8wqQTZmLx8P 1HulAz0E1H4ERGEdGc977PynVl3uL4N1uJMMPjT/T4kQIX+okN0dTGyKD/gdy/lsrG4V 3cYBA6N+nGdr6Bfa6+28K7WZYYCVXnE9v/K7Dm8I9vccXGCZz61+LwlZwJ9uxRRMvTG6 lIKRLVlHTAg7Azg6EYzg6QSv47lK25qI24/Qq8UxELibZzMNFpMIAB5pP2k1ouVJGVDE wsyQ== 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=ipy7aLx0VwQlNfAPQLDup1F5SBfWJdQz4FY6bwFHuGc=; b=Rw4Fo9zFyoYN8kh1ONHgkJJTILs4w7ajxCaxMMBw03Do3cVHOZa8WBmGZVC2WEangw 4acvaf+corOTLUBEaGFs5cI53kwqLVmbcnQf9KgFgeC//BCmviontmWZuRhjifoORXWd 7bqxJ2caupZ168kxhCqBIYJYBoUsIhc2hWe55MHAsC6CU3d2Hs+WN88gbWu5G7Ffm7t4 OyEMH0YIsWRn96xX6EAZAdH6IzxTCqnvN7RszErKmryeXYFuqKckE8fpm2bKv+RySw9m Y8THImYT/v1+I0vfaGSKoUJMpbu7cOeUXuF2BzFZH+2glRtN/cdvFnAo6LOTDbFJTsq5 ycrA== X-Gm-Message-State: AFqh2kpocUaiTDffyWdWkbO4/7Dyq4hXjpKJuRZYjBDHO1hqpGRTs2Sy bDlDAtTdLBIPpW7jCSIOEl/xEA== X-Google-Smtp-Source: AMrXdXsrBq9Eua99FPGOxxh5Vws09TzxkzR4rxCItnJMKRlM2+1lUIpRsU6LmmoWschXWnjoED2FHA== X-Received: by 2002:adf:e987:0:b0:2bb:e891:1829 with SMTP id h7-20020adfe987000000b002bbe8911829mr22933080wrm.4.1673882492423; Mon, 16 Jan 2023 07:21:32 -0800 (PST) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id u18-20020adff892000000b002bded7da2b8sm6874686wrp.102.2023.01.16.07.21.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 07:21:32 -0800 (PST) From: Bryan O'Donoghue To: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org Subject: [PATCH v7 1/4] dt-bindings: msm: dsi-controller-main: Add compatible strings for every current SoC Date: Mon, 16 Jan 2023 15:21:25 +0000 Message-Id: <20230116152128.909646-2-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116152128.909646-1-bryan.odonoghue@linaro.org> References: <20230116152128.909646-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org, krzysztof.kozlowski+dt@linaro.org, sean@poorly.run, andersson@kernel.org, konrad.dybcio@somainline.org, quic_abhinavk@quicinc.com, david@ixit.cz, dianders@chromium.org, Krzysztof Kozlowski , robh+dt@kernel.org, agross@kernel.org, dmitry.baryshkov@linaro.org, bryan.odonoghue@linaro.org, swboyd@chromium.org, linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Currently we do not differentiate between the various users of the qcom,mdss-dsi-ctrl. The driver is flexible enough to operate from one compatible string but, the hardware does have some significant differences in the number of clocks. To facilitate documenting the clocks add the following compatible strings - qcom,apq8064-dsi-ctrl - qcom,msm8916-dsi-ctrl - qcom,msm8953-dsi-ctrl - qcom,msm8974-dsi-ctrl - qcom,msm8996-dsi-ctrl - qcom,msm8998-dsi-ctrl - qcom,sc7180-dsi-ctrl - qcom,sc7280-dsi-ctrl - qcom,sdm660-dsi-ctrl - qcom,sdm845-dsi-ctrl - qcom,sm8150-dsi-ctrl - qcom,sm8250-dsi-ctrl - qcom,sm8350-dsi-ctrl - qcom,sm8450-dsi-ctrl - qcom,sm8550-dsi-ctrl - qcom,qcm2290-dsi-ctrl Deprecate qcom,dsi-ctrl-6g-qcm2290 in favour of the desired format while we do so. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Bryan O'Donoghue --- .../display/msm/dsi-controller-main.yaml | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml index 6e2fd6e9fa7f0..35668caa190c4 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml @@ -14,9 +14,31 @@ allOf: properties: compatible: - enum: - - qcom,mdss-dsi-ctrl - - qcom,dsi-ctrl-6g-qcm2290 + oneOf: + - items: + - enum: + - qcom,apq8064-dsi-ctrl + - qcom,msm8916-dsi-ctrl + - qcom,msm8953-dsi-ctrl + - qcom,msm8974-dsi-ctrl + - qcom,msm8996-dsi-ctrl + - qcom,msm8998-dsi-ctrl + - qcom,qcm2290-dsi-ctrl + - qcom,sc7180-dsi-ctrl + - qcom,sc7280-dsi-ctrl + - qcom,sdm660-dsi-ctrl + - qcom,sdm845-dsi-ctrl + - qcom,sm8150-dsi-ctrl + - qcom,sm8250-dsi-ctrl + - qcom,sm8350-dsi-ctrl + - qcom,sm8450-dsi-ctrl + - qcom,sm8550-dsi-ctrl + - const: qcom,mdss-dsi-ctrl + - items: + - enum: + - dsi-ctrl-6g-qcm2290 + - const: qcom,mdss-dsi-ctrl + deprecated: true reg: maxItems: 1 @@ -149,7 +171,7 @@ examples: #include dsi@ae94000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sc7180-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0ae94000 0x400>; reg-names = "dsi_ctrl"; From patchwork Mon Jan 16 15:21:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 13103393 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EFE27C46467 for ; Mon, 16 Jan 2023 15:21:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B7A5910E457; Mon, 16 Jan 2023 15:21:42 +0000 (UTC) Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by gabe.freedesktop.org (Postfix) with ESMTPS id 68DC910E182 for ; Mon, 16 Jan 2023 15:21:35 +0000 (UTC) Received: by mail-wr1-x434.google.com with SMTP id h16so27794103wrz.12 for ; Mon, 16 Jan 2023 07:21:35 -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=pmeDpbhWHrjy4et1mvXgnkvbOqusPhVJXfUWrZk3WAA=; b=VfJM03zu0OKEH6zOZ7seepVSIyKq6lVhG2LDIuWX2rEhNiwndpyJDOszSSbhCfkJYd d0funP90udA9EQRzgIN3LtgBkwQ3I//tHPFYXXNu4Utwwzt+i7Odo5PH2KLVLci8/D/f y2K88U7O5wYIdRLlPqR7MfBSTbKbLEXv5a4Zfxi+IyKCH+zqtFT4H+w5fD7krsEX5gFI NicF+f8yRak2kz9Iniyo316pqH0o5dZPbiAyWVEzH4dk/xindDSICF3e0aqd7ZF93Vp0 q+wlqI5dxSZxHIlQZ4ukNY5DPL+BkxWpOBcDxyvkBtMIvgIQT5ebnkf6RHFlrEHwRVs7 886g== 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=pmeDpbhWHrjy4et1mvXgnkvbOqusPhVJXfUWrZk3WAA=; b=L7jt7NucOiV3fIQZzHQRXhTuY45ztAOkL0/hGv/WT38tUvskzMZauaDeNaE3gJ0kve KXhUx1N2CvI0GYk9vqq07/JMCIFW/jzQ4cM+b0JEcBi1gBHdrVmDGe03K0HBb7dlhnDc jJngFA05iAqaFUXJFGmLiSN5inlKARPOeBS7HXGeuczXLXrmnn80+16z84qrRiiLG4o3 ax6ReCkuyu0DUlI31tWjAJGi7FQkBOBe0DpRPfpi/E8MFVuCZueXkF3oJzVC043KP/ad L9jWiASaMj9xNpsOkdtS2cfaCSpp9AjyeQ4JJzMfY01A/z7u3zl3wXcILryDhM8dxdlo pJew== X-Gm-Message-State: AFqh2kqunmObTC6tFGVFcTUQVpQpECDRjBtrPYkZGcvYJ4oW68fksBPp Bdbt2SOjqFCxF6d05G/JTYVUww== X-Google-Smtp-Source: AMrXdXvabACscioWX2Z3nYvaozHmOIxGmyxktR3Lgpto6ETFCKsRwJl3rRaC30brISg1VQlOW1DtKg== X-Received: by 2002:adf:fe12:0:b0:2bd:f5bd:5482 with SMTP id n18-20020adffe12000000b002bdf5bd5482mr6954698wrr.28.1673882493818; Mon, 16 Jan 2023 07:21:33 -0800 (PST) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id u18-20020adff892000000b002bded7da2b8sm6874686wrp.102.2023.01.16.07.21.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 07:21:33 -0800 (PST) From: Bryan O'Donoghue To: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org Subject: [PATCH v7 2/4] dt-bindings: msm: dsi-controller-main: Document clocks on a per compatible basis Date: Mon, 16 Jan 2023 15:21:26 +0000 Message-Id: <20230116152128.909646-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116152128.909646-1-bryan.odonoghue@linaro.org> References: <20230116152128.909646-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org, krzysztof.kozlowski+dt@linaro.org, sean@poorly.run, andersson@kernel.org, konrad.dybcio@somainline.org, quic_abhinavk@quicinc.com, david@ixit.cz, dianders@chromium.org, Krzysztof Kozlowski , robh+dt@kernel.org, agross@kernel.org, dmitry.baryshkov@linaro.org, bryan.odonoghue@linaro.org, swboyd@chromium.org, linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Each compatible has a different set of clocks which are associated with it. Add in the list of clocks for each compatible. Acked-by: Rob Herring Acked-by: Krzysztof Kozlowski Signed-off-by: Bryan O'Donoghue --- .../display/msm/dsi-controller-main.yaml | 219 ++++++++++++++++-- 1 file changed, 202 insertions(+), 17 deletions(-) diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml index 35668caa190c4..47faf08a37443 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml @@ -9,9 +9,6 @@ title: Qualcomm Display DSI controller maintainers: - Krishna Manikandan -allOf: - - $ref: "../dsi-controller.yaml#" - properties: compatible: oneOf: @@ -50,22 +47,23 @@ properties: maxItems: 1 clocks: - items: - - description: Display byte clock - - description: Display byte interface clock - - description: Display pixel clock - - description: Display core clock - - description: Display AHB clock - - description: Display AXI clock + description: | + Several clocks are used, depending on the variant. Typical ones are:: + - bus:: Display AHB clock. + - byte:: Display byte clock. + - byte_intf:: Display byte interface clock. + - core:: Display core clock. + - core_mss:: Core MultiMedia SubSystem clock. + - iface:: Display AXI clock. + - mdp_core:: MDP Core clock. + - mnoc:: MNOC clock + - pixel:: Display pixel clock. + minItems: 3 + maxItems: 9 clock-names: - items: - - const: byte - - const: byte_intf - - const: pixel - - const: core - - const: iface - - const: bus + minItems: 3 + maxItems: 9 phys: maxItems: 1 @@ -161,6 +159,193 @@ required: - assigned-clock-parents - ports +allOf: + - $ref: ../dsi-controller.yaml# + - if: + properties: + compatible: + contains: + enum: + - qcom,apq8064-dsi-ctrl + then: + properties: + clocks: + maxItems: 7 + clock-names: + items: + - const: iface + - const: bus + - const: core_mmss + - const: src + - const: byte + - const: pixel + - const: core + + - if: + properties: + compatible: + contains: + enum: + - qcom,msm8916-dsi-ctrl + then: + properties: + clocks: + maxItems: 6 + clock-names: + items: + - const: mdp_core + - const: iface + - const: bus + - const: byte + - const: pixel + - const: core + + - if: + properties: + compatible: + contains: + enum: + - qcom,msm8953-dsi-ctrl + then: + properties: + clocks: + maxItems: 6 + clock-names: + items: + - const: mdp_core + - const: iface + - const: bus + - const: byte + - const: pixel + - const: core + + - if: + properties: + compatible: + contains: + enum: + - qcom,msm8974-dsi-ctrl + then: + properties: + clocks: + maxItems: 7 + clock-names: + items: + - const: mdp_core + - const: iface + - const: bus + - const: vsync + - const: byte + - const: pixel + - const: core + - const: core_mmss + + - if: + properties: + compatible: + contains: + enum: + - qcom,msm8996-dsi-ctrl + then: + properties: + clocks: + maxItems: 7 + clock-names: + items: + - const: mdp_core + - const: byte + - const: iface + - const: bus + - const: core_mmss + - const: pixel + - const: core + + - if: + properties: + compatible: + contains: + enum: + - qcom,msm8998-dsi-ctrl + then: + properties: + clocks: + maxItems: 6 + clock-names: + items: + - const: byte + - const: byte_intf + - const: pixel + - const: core + - const: iface + - const: bus + + - if: + properties: + compatible: + contains: + enum: + - qcom,sc7180-dsi-ctrl + - qcom,sc7280-dsi-ctrl + - qcom,sm8250-dsi-ctrl + - qcom,sm8150-dsi-ctrl + - qcom,sm8250-dsi-ctrl + - qcom,sm8350-dsi-ctrl + - qcom,sm8450-dsi-ctrl + - qcom,sm8550-dsi-ctrl + then: + properties: + clocks: + maxItems: 6 + clock-names: + items: + - const: byte + - const: byte_intf + - const: pixel + - const: core + - const: iface + - const: bus + + - if: + properties: + compatible: + contains: + enum: + - qcom,sdm660-dsi-ctrl + then: + properties: + clocks: + maxItems: 9 + clock-names: + items: + - const: mdp_core + - const: byte + - const: byte_intf + - const: mnoc + - const: iface + - const: bus + - const: core_mmss + - const: pixel + - const: core + + - if: + properties: + compatible: + contains: + enum: + - qcom,sdm845-dsi-ctrl + then: + properties: + clocks: + maxItems: 6 + clock-names: + items: + - const: byte + - const: byte_intf + - const: pixel + - const: core + - const: iface + - const: bus + additionalProperties: false examples: From patchwork Mon Jan 16 15:21:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 13103392 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5396FC54EBE for ; Mon, 16 Jan 2023 15:21:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ECF8510E456; Mon, 16 Jan 2023 15:21:40 +0000 (UTC) Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by gabe.freedesktop.org (Postfix) with ESMTPS id 750E510E2AE for ; Mon, 16 Jan 2023 15:21:35 +0000 (UTC) Received: by mail-wr1-x432.google.com with SMTP id r2so27802078wrv.7 for ; Mon, 16 Jan 2023 07:21:35 -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=Svkhj0q099C0FoiRDtRciP7InWwLuxVC/46qIXiovr8=; b=XiGm3zMYMyDlv0c1X9o6TrBRuEi/kQNHOp2u5zNrD/sHrcPgWC/YQ/eJBFnht6Mb0G 7JyVb+VWubkM5kfO/7JWgXzV2g2htARtzz231Cmbk4MTMuaJiVD5thwlWO/UIfvu3ndH uuYJrVBv4HFOTASO57osvW7iv9jTr4wMmlUqwG+mHAPAEeWDK/dSC2mMwXfQ/GexI2p0 Kb9K1wtezdR3/8pNSs+1gk8qczjQMUIOUVUn6LGSzrEb1T+G2+ojZLQUUCE7i/g7WRFp rkiq9hVAv22X1l3gQ785eU+a2D/UNP/0WsnYcbDpN9nCB5Pv8RF4Knl00AV3QT1y4v8U GFZw== 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=Svkhj0q099C0FoiRDtRciP7InWwLuxVC/46qIXiovr8=; b=nwr8fMGLxv5gF/2Gfc81hqnVrByoPNb8ytJ/TMqhuV7h6J4CQfIregCGh1HbQ0aemn pVzIUdvAyhtswhuZSxfAXtn4o7w/BBx89hgkpvxPs8aW/Fwu9ofqtqrEpeXtOf1nAm0N yKeBQmQkKVlb19Nc7/iYm9Z//zyVktYif57eU3aQsk0sINNudFQR9nB+Ry+OWNxqZGMD jXPvOvIs/eVrIStctU2ko/SGBqJrh0XIICAjHECln90UDwsOYAEGJbskk43xKzBiQddE GXZr4FP9fWgrKyZRgFqk1BeSkei5B7Oso8PpkZZiCOSq3/KeH2njta/Yh4R6Ak588ylh C5kQ== X-Gm-Message-State: AFqh2ko6IwuW+15iWLHQVlQis5Kui3sBoRxrQDQ5ou39ztUjYcAu14P/ 9lcaIvBecnrWMPGr2W8NWHYD7A== X-Google-Smtp-Source: AMrXdXvYYOSm7wWeXzSebG8PvNN7IVXYycMtduzO2ztLQ2GdkIaw7bdJ3YsodsbHgkLl8/KqxPfYug== X-Received: by 2002:a05:6000:884:b0:2a3:ac90:dda3 with SMTP id ca4-20020a056000088400b002a3ac90dda3mr34494653wrb.35.1673882495009; Mon, 16 Jan 2023 07:21:35 -0800 (PST) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id u18-20020adff892000000b002bded7da2b8sm6874686wrp.102.2023.01.16.07.21.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 07:21:34 -0800 (PST) From: Bryan O'Donoghue To: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org Subject: [PATCH v7 3/4] dt-bindings: msm: dsi-controller-main: Add vdd* descriptions back in Date: Mon, 16 Jan 2023 15:21:27 +0000 Message-Id: <20230116152128.909646-4-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116152128.909646-1-bryan.odonoghue@linaro.org> References: <20230116152128.909646-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org, krzysztof.kozlowski+dt@linaro.org, sean@poorly.run, andersson@kernel.org, konrad.dybcio@somainline.org, quic_abhinavk@quicinc.com, david@ixit.cz, dianders@chromium.org, robh+dt@kernel.org, agross@kernel.org, dmitry.baryshkov@linaro.org, bryan.odonoghue@linaro.org, swboyd@chromium.org, linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" When converting from .txt to .yaml we didn't include descriptions for the existing regulator supplies. - vdd - vdda - vddio Add those descriptions into the yaml now as they were prior to the conversion. In the .txt description we marked these regulators as required, however, that requirement appears to have been in error. Taking the example of sc7180-trogdor-wormdingler.dtsi. The avdd and avee come from GPIO controlled external regulators, not the SoC and in this case there's no need for vddio to power an I/O bus. Similarly the regulators for the LCD are controlled by the panel driver not by the dsi-ctrl driver. It would be possible to connect a different type of panel to the DSI bus here in which case we may or may not want to make use of vdd, vdda or vddio. This is also the case for older chipsets like apq8064, msm8916 etc the vdd* regulators in the dsi-ctrl block are helpers not dependencies. Add the description of vdd, vdda and vddio back in for the existing upstream dts where vdd, vdda or vddio are already declared but, don't declare those regulators required - they are not SoC requirements. Fixes: 4dbe55c97741 ("dt-bindings: msm: dsi: add yaml schemas for DSI bindings") Acked-by: Rob Herring Signed-off-by: Bryan O'Donoghue --- .../bindings/display/msm/dsi-controller-main.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml index 47faf08a37443..7b849c8f119a7 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml @@ -147,6 +147,18 @@ properties: - port@0 - port@1 + vdd-supply: + description: + VDD regulator + + vddio-supply: + description: + VDD-IO regulator + + vdda-supply: + description: + VDDA regulator + required: - compatible - reg From patchwork Mon Jan 16 15:21:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 13103394 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 27E32C46467 for ; Mon, 16 Jan 2023 15:21:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6BC9410E459; Mon, 16 Jan 2023 15:21:43 +0000 (UTC) Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8A37510E084 for ; Mon, 16 Jan 2023 15:21:37 +0000 (UTC) Received: by mail-wr1-x434.google.com with SMTP id b5so6636591wrn.0 for ; Mon, 16 Jan 2023 07:21:37 -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=bqKbnZ47SiC5UJD4UI1hpgRIV8/hQzL8IaTq+l5A3l8=; b=ZpHvKwuRhOAzmH79SmS5fPSo3tJkIDhQiHN6pDBQ2fGY1S3UFKyjld4P3TQ96AlCQD 8kwY6ys/6ZTVyf0gKhB1vqRy10EqGX9jsoS1t1yqNyLg90L/uep1C/n3WnYMUshcf6Hx cykq1xO+8jstJoXcSA7swi/QOSgzvrzJbtlSjfW2uWvWqZZnlITkkp6B1E1987uAZDOM CsMrKXb9v7lQJT4WfygzhdLbVWz+89Rzr/CWIHxFh7OjLKrk+xqeC8AJSkOcxI5S0zsg t18DxTlXbcGLxrwpXoSl7ymaOTypQ2SJC6ZGv+2Ks9MjFScbzciONT0ntkzfSNQovihG Ci8Q== 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=bqKbnZ47SiC5UJD4UI1hpgRIV8/hQzL8IaTq+l5A3l8=; b=O04FBjqLjdws6k5BcYKl4Blfu8A2h/2kLrSs7IUklbD+PtW7rWpLDyOCJt7eC67WDS wwUkNk84j+1caI/VRfM9FMql0+OrYgtiWWUNl6QPZriJy0lmXxR1Eh8kw7LTwCJnMyD1 0DhHtKrm5A/YPoTeiSox/dJ0AhiXV9TgdC/XLJ4NtwUPkJIEAGJ3wxWPkfntHKOrYEq5 kYbXmdEqYxEmXOEig1E2lwuuzVAvVW2OXdvopl42RxUIohQlEJwhgbMjIZxZpAVWAPKi lOoEMeE3egKq7WOXWCtPsdn7MTkZu7Em1YBYeaxWUIil4ZcaAJK957pavPPxT/ItyYTT ma0A== X-Gm-Message-State: AFqh2kofg56cLvp78lQWiqnxcd5LPZM4hOjrSj7zSTVkJU4JzItjeejs TPRqlmeLgdoEnVpPKWTSEX96Ag== X-Google-Smtp-Source: AMrXdXtRCkiY47M4P26u77M+hM6bQtDtpVdGrrJ1gNbcwBNqT+C5KcOdSmtOC0GVzW+APJvkWbwwvg== X-Received: by 2002:adf:dd87:0:b0:2bd:e395:584a with SMTP id x7-20020adfdd87000000b002bde395584amr9823686wrl.52.1673882496057; Mon, 16 Jan 2023 07:21:36 -0800 (PST) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id u18-20020adff892000000b002bded7da2b8sm6874686wrp.102.2023.01.16.07.21.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 07:21:35 -0800 (PST) From: Bryan O'Donoghue To: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org Subject: [PATCH v7 4/4] dt-bindings: display/msm: Add list of mdss-dsi-ctrl compats Date: Mon, 16 Jan 2023 15:21:28 +0000 Message-Id: <20230116152128.909646-5-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116152128.909646-1-bryan.odonoghue@linaro.org> References: <20230116152128.909646-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org, krzysztof.kozlowski+dt@linaro.org, sean@poorly.run, andersson@kernel.org, konrad.dybcio@somainline.org, quic_abhinavk@quicinc.com, david@ixit.cz, dianders@chromium.org, robh+dt@kernel.org, agross@kernel.org, dmitry.baryshkov@linaro.org, bryan.odonoghue@linaro.org, swboyd@chromium.org, linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add the list of current compats absent the deprecated qcm2290 to the list of dsi compats listed here. Several MDSS yaml files exist which document the dsi sub-node. For each existing SoC MDSS yaml, provide the right dsi compat string. Signed-off-by: Bryan O'Donoghue Acked-by: Rob Herring --- .../devicetree/bindings/display/msm/qcom,mdss.yaml | 3 ++- .../bindings/display/msm/qcom,msm8998-mdss.yaml | 8 +++++--- .../devicetree/bindings/display/msm/qcom,sc7180-mdss.yaml | 6 ++++-- .../devicetree/bindings/display/msm/qcom,sc7280-mdss.yaml | 6 ++++-- .../devicetree/bindings/display/msm/qcom,sdm845-mdss.yaml | 8 +++++--- .../devicetree/bindings/display/msm/qcom,sm8150-mdss.yaml | 8 +++++--- .../devicetree/bindings/display/msm/qcom,sm8250-mdss.yaml | 8 +++++--- .../devicetree/bindings/display/msm/qcom,sm8350-mdss.yaml | 6 ++++-- .../devicetree/bindings/display/msm/qcom,sm8450-mdss.yaml | 4 +++- 9 files changed, 37 insertions(+), 20 deletions(-) diff --git a/Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml index ba0460268731b..c194bea46c72f 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml @@ -94,7 +94,8 @@ patternProperties: type: object properties: compatible: - const: qcom,mdss-dsi-ctrl + contains: + const: qcom,mdss-dsi-ctrl "^phy@[1-9a-f][0-9a-f]*$": type: object diff --git a/Documentation/devicetree/bindings/display/msm/qcom,msm8998-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,msm8998-mdss.yaml index 8b82eef28162c..3c2b6ed98a568 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,msm8998-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,msm8998-mdss.yaml @@ -46,7 +46,9 @@ patternProperties: type: object properties: compatible: - const: qcom,mdss-dsi-ctrl + items: + - const: qcom,msm8998-dsi-ctrl + - const: qcom,mdss-dsi-ctrl "^phy@[0-9a-f]+$": type: object @@ -128,7 +130,7 @@ examples: }; dsi@c994000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,msm8998-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0c994000 0x400>; reg-names = "dsi_ctrl"; @@ -198,7 +200,7 @@ examples: }; dsi@c996000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,msm8998-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0c996000 0x400>; reg-names = "dsi_ctrl"; diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sc7180-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sc7180-mdss.yaml index 5db9b3ab03c98..42ef06edddc42 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sc7180-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sc7180-mdss.yaml @@ -58,7 +58,9 @@ patternProperties: type: object properties: compatible: - const: qcom,mdss-dsi-ctrl + items: + - const: qcom,sc7180-dsi-ctrl + - const: qcom,mdss-dsi-ctrl "^phy@[0-9a-f]+$": type: object @@ -144,7 +146,7 @@ examples: }; dsi@ae94000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sc7180-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0ae94000 0x400>; reg-names = "dsi_ctrl"; diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sc7280-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sc7280-mdss.yaml index a4e3ada2affcf..078e1d1a7d2fc 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sc7280-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sc7280-mdss.yaml @@ -58,7 +58,9 @@ patternProperties: type: object properties: compatible: - const: qcom,mdss-dsi-ctrl + items: + - const: qcom,sc7280-dsi-ctrl + - const: qcom,mdss-dsi-ctrl "^edp@[0-9a-f]+$": type: object @@ -165,7 +167,7 @@ examples: }; dsi@ae94000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sc7280-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0ae94000 0x400>; reg-names = "dsi_ctrl"; diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sdm845-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sdm845-mdss.yaml index 8f60be6147d88..6ecb00920d7f6 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sdm845-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sdm845-mdss.yaml @@ -56,7 +56,9 @@ patternProperties: type: object properties: compatible: - const: qcom,mdss-dsi-ctrl + items: + - const: qcom,sdm845-dsi-ctrl + - const: qcom,mdss-dsi-ctrl "^phy@[0-9a-f]+$": type: object @@ -136,7 +138,7 @@ examples: }; dsi@ae94000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sdm845-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0ae94000 0x400>; reg-names = "dsi_ctrl"; @@ -206,7 +208,7 @@ examples: }; dsi@ae96000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sdm845-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0ae96000 0x400>; reg-names = "dsi_ctrl"; diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sm8150-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sm8150-mdss.yaml index 55b41e4573dc8..5182e958e0691 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sm8150-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sm8150-mdss.yaml @@ -55,7 +55,9 @@ patternProperties: type: object properties: compatible: - const: qcom,mdss-dsi-ctrl + items: + - const: qcom,sm8150-dsi-ctrl + - const: qcom,mdss-dsi-ctrl "^phy@[0-9a-f]+$": type: object @@ -167,7 +169,7 @@ examples: }; dsi@ae94000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sm8150-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0ae94000 0x400>; reg-names = "dsi_ctrl"; @@ -257,7 +259,7 @@ examples: }; dsi@ae96000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sm8150-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0ae96000 0x400>; reg-names = "dsi_ctrl"; diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sm8250-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sm8250-mdss.yaml index 571dc6560266c..368d3db0ce967 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sm8250-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sm8250-mdss.yaml @@ -54,7 +54,9 @@ patternProperties: type: object properties: compatible: - const: qcom,mdss-dsi-ctrl + items: + - const: qcom,sm8250-dsi-ctrl + - const: qcom,mdss-dsi-ctrl "^phy@[0-9a-f]+$": type: object @@ -169,7 +171,7 @@ examples: }; dsi@ae94000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sm8250-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0ae94000 0x400>; reg-names = "dsi_ctrl"; @@ -259,7 +261,7 @@ examples: }; dsi@ae96000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sm8250-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0ae96000 0x400>; reg-names = "dsi_ctrl"; diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sm8350-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sm8350-mdss.yaml index 0d452f22f5569..4d94dbff30541 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sm8350-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sm8350-mdss.yaml @@ -56,7 +56,9 @@ patternProperties: type: object properties: compatible: - const: qcom,mdss-dsi-ctrl + items: + - const: qcom,sm8350-dsi-ctrl + - const: qcom,mdss-dsi-ctrl "^phy@[0-9a-f]+$": type: object @@ -169,7 +171,7 @@ examples: }; dsi0: dsi@ae94000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sm8350-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0ae94000 0x400>; reg-names = "dsi_ctrl"; diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sm8450-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sm8450-mdss.yaml index c268e0b662cf9..599a6bad80f43 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sm8450-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sm8450-mdss.yaml @@ -46,7 +46,9 @@ patternProperties: type: object properties: compatible: - const: qcom,mdss-dsi-ctrl + items: + - const: qcom,sm8450-dsi-ctrl + - const: qcom,mdss-dsi-ctrl "^phy@[0-9a-f]+$": type: object