From patchwork Wed May 31 01:16:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 687545 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73E64C7EE2C for ; Wed, 31 May 2023 01:16:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231545AbjEaBQf (ORCPT ); Tue, 30 May 2023 21:16:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233482AbjEaBQd (ORCPT ); Tue, 30 May 2023 21:16:33 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF0EAF9 for ; Tue, 30 May 2023 18:16:30 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-4f3bb61f860so6120482e87.3 for ; Tue, 30 May 2023 18:16:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685495789; x=1688087789; 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=eMZeiPIi7TP7gXho3St6dgJ9AasXrJTL2jtP8YLAFi0=; b=iJES3Hzzswvmk70tOV0eW4Fc+P3sx1muEyTLXZc06JlECYGjtynQoDvtOKbikmotV/ nO+NbhRgkTn3Tpod3kP8JfWxkCFvhpduXtSFVuwq+8HC3IAKuI5Ssj+IQGlDa9gzznqf jefY8EkqDE4rmVBnAPpUAEx984rAd+r7UlQ6hb96Fe3cWBC7bA6UJp1VUNKvkyY+6eMo f4yxGIZTj5f6yxB7jr1RKayQgL1evZv/fZsoh+2gB8y705u98bPa9wbt+SEuHhpXy0UZ uYQn7KvfPnY4rh2UiJ99ugCfU89/NZQTspL6fe/OgKLy902w/EMLPsiMopiPaWVkCfep cv/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685495789; x=1688087789; 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=eMZeiPIi7TP7gXho3St6dgJ9AasXrJTL2jtP8YLAFi0=; b=WHWyMQJllO2KCnn+Lh20FgV6yHsDpqsAfQBJmL/wn/m4S2QqUfdZ0GehOhAvrl8PFM xp5e0D8ebkxmaizdlRzSJ3PVGJ7e3MqP6WKEeuatGIQVyXG1XSAwOC3iempuNXWBTO5u S2z4qTTeiFnzan1IH2dBoVHvU5h5304Rt4fIVWPvfG1D3QuxkexS3cVk8/2yj14Jm8G5 vnyWIkOGneyaBHxc0v9XifywXpWDjNmGRwIJJOBPhVUW42AFBCpjfI7ryxtGPUDT7O47 RjHpJ8HkzBbn6SRW+FCv1maHCBGcVTnisw/azjlDrrJ/xJu8TMf2yMyv1it9tH6wI3pi Am5g== X-Gm-Message-State: AC+VfDzY2re7P5WBmS7NcYtR8XzVyYvgkm/cQeoOyd0By4CSKYIAo1Q1 +Woh7K1P+2QdoeJpTedYqWdw0g== X-Google-Smtp-Source: ACHHUZ44SFqHBtOb4DQtt+L0gX+v2ZLGih7vIXIy0lsFJCCVeHyJoe4PDY/ARDZGUg4dr9Oipl+AxQ== X-Received: by 2002:a05:6512:64:b0:4f4:cb4c:36e5 with SMTP id i4-20020a056512006400b004f4cb4c36e5mr1635744lfo.29.1685495787676; Tue, 30 May 2023 18:16:27 -0700 (PDT) Received: from lothlorien.lan (dzdqv0yyyyyyyyyyybm5y-3.rev.dnainternet.fi. [2001:14ba:a0db:1f00::ab2]) by smtp.gmail.com with ESMTPSA id v24-20020ac25618000000b004f3787d8006sm505640lfd.128.2023.05.30.18.16.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 18:16:26 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 02/14] arm64: dts: qcom: sm8350-hdk: remove useless enablement of mdss_mdp Date: Wed, 31 May 2023 04:16:11 +0300 Message-Id: <20230531011623.3808538-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531011623.3808538-1-dmitry.baryshkov@linaro.org> References: <20230531011623.3808538-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The MDP/DPU device is not disabled by default, so there is not point in enabling it in the board DTS file. Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts index d3788bd72ac3..61dd9663fabe 100644 --- a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts @@ -424,10 +424,6 @@ mdss_dp0_out: endpoint { }; }; -&mdss_mdp { - status = "okay"; -}; - &mpss { status = "okay"; firmware-name = "qcom/sm8350/modem.mbn"; From patchwork Wed May 31 01:16:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 687544 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76AB4C7EE32 for ; Wed, 31 May 2023 01:16:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233979AbjEaBQh (ORCPT ); Tue, 30 May 2023 21:16:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233987AbjEaBQe (ORCPT ); Tue, 30 May 2023 21:16:34 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BD32115 for ; Tue, 30 May 2023 18:16:33 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-4f4b80bf93aso5857138e87.0 for ; Tue, 30 May 2023 18:16:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685495791; x=1688087791; 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=8GxamGy/fBYkSHOxDQxOC8wRfhuHzbBuJJ5Qq1Q77W8=; b=mCqbiyPqZrI/H/5HaZbEHB5FRHvSqqAXdcKC9yX/pAHho1wIpeVQDoxMEgcZQzFmP/ SK7oeqILwllZY1uWiJrC26WdXgugF4NcXlmsR5IgZ+n2U8/bwjQF7ARhmXAR2nS6U2yE a4+/bgj2zMg8pKcJ+ZRfQnYPwvSgxjrj4C34Qs+FFKZErSGkmcFXtIWXkOyaeHU5L7xx eX01rOcwk+FNFxXQWGSt1Wu6nqEcCKawUCEE7euykpMHzJzaadlOdMM7iEI5qIG+8Nd4 61oI/PK1qpjMWo4Y+rYWCxfUUepwcnr2q6MKgZAuK9PMU1j3cCcgKkRsGaRLYai0udKW 8fyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685495791; x=1688087791; 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=8GxamGy/fBYkSHOxDQxOC8wRfhuHzbBuJJ5Qq1Q77W8=; b=bEKBFuoY+AObhu7uW1zjpk6eZQh/NynvETNI+pdIDKfQ0KHNveZG+fLoIFqgg9gAc6 1HS1xoCIA3uZIyrPdoym9/6EaCYeRunIKCKk+Ks+CXZHeBSzf8y2KLxhk7gNnaG7iOvG GA0UXOyM0sgFgfQNE6dEPm6MfiAtkS1S8U+ns04fDMV3Oo+X8A/f5LUYXb+6KN74yQdC UPvPLGWMx85QnLcX4HZF4jUWH39JTjP04yAbYd/H5y8g/+TC2mDchJ/+AT2Em8lwgO8I e2GgwSdxeWbVjt6lokwAtWqGtrN+wd0o9FbGUAhdrr6sOFd9Ds0dAhHQrpakWZNSPmzf NLAQ== X-Gm-Message-State: AC+VfDwUVApWhFOAPOvH/ZntgHoFCB8mfVs8J9/NQo1mBJTqg35TD89z i+oKLesvcipx7uW8ADkJLTwhnA== X-Google-Smtp-Source: ACHHUZ7wxkKOeG4ztmm9CSTdTxo05eRayBBzXSNa0sbnC0FPIt0p3APVeaOx3eP7HVooyqBUBSxJTA== X-Received: by 2002:a05:6512:41b:b0:4f3:a812:5ae with SMTP id u27-20020a056512041b00b004f3a81205aemr1635063lfk.37.1685495791143; Tue, 30 May 2023 18:16:31 -0700 (PDT) Received: from lothlorien.lan (dzdqv0yyyyyyyyyyybm5y-3.rev.dnainternet.fi. [2001:14ba:a0db:1f00::ab2]) by smtp.gmail.com with ESMTPSA id v24-20020ac25618000000b004f3787d8006sm505640lfd.128.2023.05.30.18.16.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 18:16:30 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 04/14] arm64: dts: qcom: qrb5165-rb5: remove useless enablement of mdss_mdp Date: Wed, 31 May 2023 04:16:13 +0300 Message-Id: <20230531011623.3808538-5-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531011623.3808538-1-dmitry.baryshkov@linaro.org> References: <20230531011623.3808538-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The MDP/DPU device is not disabled by default since the commit 0c25dad9f2a7 ("arm64: dts: qcom: sm8250: Don't disable MDP explicitly"), so there is not point in enabling it in the board DTS file. Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts index dd924331b0ee..dfcaac266456 100644 --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts @@ -639,10 +639,6 @@ &mdss { status = "okay"; }; -&mdss_mdp { - status = "okay"; -}; - &pm8150_adc { xo-therm@4c { reg = ; From patchwork Wed May 31 01:16:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 687543 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 522D7C7EE39 for ; Wed, 31 May 2023 01:16:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233987AbjEaBQj (ORCPT ); Tue, 30 May 2023 21:16:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233969AbjEaBQg (ORCPT ); Tue, 30 May 2023 21:16:36 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A2E511F for ; Tue, 30 May 2023 18:16:34 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-4f3bb61f860so6120538e87.3 for ; Tue, 30 May 2023 18:16:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685495794; x=1688087794; 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=IbsAZyU27eGiIY7Cnbju8/Nvcxc0+XDnAh4+N+PWw0M=; b=K9JxzYjJZSJJZp4yjd5Hg1RUlq3On79QkWwi/qCUM2S3Ko1vJAzwqSaBIvnbN6LNhJ QJ4pCxuKRKquYjmcUfe9kj2aN72KvZqSzfFVrMeoRXqcEcDkvuoqVBd3zm0RkmJEQtYL 29SOadlHIz2/SnL9kG71USDOLOBfARehD4hD2g8tQbWFw6bv7gg71VuuzeMsddaYPg+L 6RXsCW49oc7JTeXtn+y21aaguErvRWY9j8XnEGkWwLgIwOPUpZe7zd+IycMzoK9xKsD8 bgr+pyi5c6jOwbtuCP8cdtayonOwv+935B4vnVjzqXL5FllpaIotVpuS+IQHRXueNIhX wSeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685495794; x=1688087794; 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=IbsAZyU27eGiIY7Cnbju8/Nvcxc0+XDnAh4+N+PWw0M=; b=GwFYx1lQUUQOuuKLNT2BDccz9WLU9Kum2CwhcYPNsHeyHuCCCGtOFXPe0b6WdQZhHk VkUFg+TSd/PNQ1egOMdWQlSOLLfSy6I/QtRydBgl+fvBy7SkM7C7oUJY+akumngzqUi7 QfxTE6n0e5KGrvq2THEjDfS7rvb2W3rQMGG1e2XaHS/sQVePNUYznqxlG54U4+qi68Rh 72kZ6Ihnn070+361Dnp+foIyn5IX2J6RTxWRqQjsRiT6GV5/G6jARgKn/s7651PK/3DH +TCzMykTbKioRvzVzwcpCci1CH2Eb4vmMmbctp9wRSBRGc5QhHoDXzfyzkCRnLiGLGwa WWxw== X-Gm-Message-State: AC+VfDwNPdc5cF1rQ0hXHCcJudZwOlYMFCe9YAqOuhuyVYUxjootx0qQ +MkB6Og6tvUOrvdek1KPjAxr+A== X-Google-Smtp-Source: ACHHUZ5Fve4SUhmHbYaeEqHeCRjRgTAJV6fUaFLNP2YIqFeXJrYzr8g/lyMzy8FvWcFrfUZVC0N2Ig== X-Received: by 2002:ac2:55bc:0:b0:4f4:bc9d:ca00 with SMTP id y28-20020ac255bc000000b004f4bc9dca00mr1470755lfg.39.1685495794077; Tue, 30 May 2023 18:16:34 -0700 (PDT) Received: from lothlorien.lan (dzdqv0yyyyyyyyyyybm5y-3.rev.dnainternet.fi. [2001:14ba:a0db:1f00::ab2]) by smtp.gmail.com with ESMTPSA id v24-20020ac25618000000b004f3787d8006sm505640lfd.128.2023.05.30.18.16.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 18:16:33 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 07/14] arm64: dts: qcom: sc7180: rename labels for DSI nodes Date: Wed, 31 May 2023 04:16:16 +0300 Message-Id: <20230531011623.3808538-8-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531011623.3808538-1-dmitry.baryshkov@linaro.org> References: <20230531011623.3808538-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Currently in board files MDSS and DSI nodes stay apart, because labels for DSI nodes do not have the mdss_ prefix. It was found that grouping all display-related notes is more useful. To keep all display-related nodes close in the board files, change DSI node labels from dsi_* to mdss_dsi_*. Signed-off-by: Dmitry Baryshkov --- .../boot/dts/qcom/sc7180-acer-aspire1.dts | 32 ++++++------ arch/arm64/boot/dts/qcom/sc7180-idp.dts | 14 ++--- .../qcom/sc7180-trogdor-parade-ps8640.dtsi | 10 ++-- .../qcom/sc7180-trogdor-quackingstick-r0.dts | 2 +- .../qcom/sc7180-trogdor-quackingstick.dtsi | 52 +++++++++---------- .../dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 10 ++-- .../sc7180-trogdor-wormdingler-rev1-boe.dts | 2 +- .../dts/qcom/sc7180-trogdor-wormdingler.dtsi | 46 ++++++++-------- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 28 +++++----- arch/arm64/boot/dts/qcom/sc7180.dtsi | 22 ++++---- 10 files changed, 109 insertions(+), 109 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts index 2a80f4090085..b637b4270f88 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts @@ -143,21 +143,6 @@ reg_tp_3p3: touchpad-regulator { }; }; -&dsi0 { - vdda-supply = <&vreg_l3c_1p2>; - status = "okay"; -}; - -&dsi0_out { - remote-endpoint = <&sn65dsi86_in>; - data-lanes = <0 1 2 3>; -}; - -&dsi_phy { - vdds-supply = <&vreg_l4a_0p8>; - status = "okay"; -}; - &i2c2 { clock-frequency = <400000>; status = "okay"; @@ -269,7 +254,7 @@ port@0 { reg = <0>; sn65dsi86_in: endpoint { - remote-endpoint = <&dsi0_out>; + remote-endpoint = <&mdss_dsi0_out>; }; }; @@ -313,6 +298,21 @@ &mdss { status = "okay"; }; +&mdss_dsi0 { + vdda-supply = <&vreg_l3c_1p2>; + status = "okay"; +}; + +&mdss_dsi0_out { + remote-endpoint = <&sn65dsi86_in>; + data-lanes = <0 1 2 3>; +}; + +&mdss_dsi0_phy { + vdds-supply = <&vreg_l4a_0p8>; + status = "okay"; +}; + &pm6150_adc { thermistor@4e { reg = ; diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts index bd9ed03159cf..546db0d90630 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts @@ -295,7 +295,11 @@ vreg_bob: bob { }; }; -&dsi0 { +&mdss { + status = "okay"; +}; + +&mdss_dsi0 { status = "okay"; vdda-supply = <&vreg_l3c_1p2>; @@ -314,7 +318,7 @@ panel@0 { port { panel0_in: endpoint { - remote-endpoint = <&dsi0_out>; + remote-endpoint = <&mdss_dsi0_out>; }; }; }; @@ -329,15 +333,11 @@ endpoint { }; }; -&dsi_phy { +&mdss_dsi0_phy { status = "okay"; vdds-supply = <&vreg_l4a_0p8>; }; -&mdss { - status = "okay"; -}; - &qfprom { vcc-supply = <&vreg_l11a_1p8>; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi index 5aa7949b5328..bede23369fed 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi @@ -46,10 +46,6 @@ &pp3300_dx_edp { /* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */ -&dsi0_out { - remote-endpoint = <&ps8640_in>; -}; - edp_brij_i2c: &i2c2 { status = "okay"; clock-frequency = <400000>; @@ -74,7 +70,7 @@ ports { port@0 { reg = <0>; ps8640_in: endpoint { - remote-endpoint = <&dsi0_out>; + remote-endpoint = <&mdss_dsi0_out>; }; }; @@ -102,6 +98,10 @@ panel_in_edp: endpoint { }; }; +&mdss_dsi0_out { + remote-endpoint = <&ps8640_in>; +}; + &tlmm { edp_brij_ps8640_rst: edp-brij-ps8640-rst-state { pins = "gpio11"; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick-r0.dts index 5c81e44ed4a5..0a7f2286b541 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick-r0.dts @@ -15,7 +15,7 @@ / { compatible = "google,quackingstick-sku1537", "qcom,sc7180"; }; -&dsi_phy { +&mdss_dsi0_phy { qcom,phy-rescode-offset-top = /bits/ 8 <(-13) (-13) (-13) (-13) (-13)>; qcom,phy-rescode-offset-bot = /bits/ 8 <(-13) (-13) (-13) (-13) (-13)>; qcom,phy-drive-ldo-level = <375>; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi index 8e7b42f843d4..62ab6427dd65 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi @@ -52,7 +52,31 @@ keyboard-controller { }; }; -&dsi0 { +&gpio_keys { + status = "okay"; +}; + +&i2c4 { + status = "okay"; + clock-frequency = <400000>; + + ap_ts: touchscreen@10 { + compatible = "hid-over-i2c"; + reg = <0x10>; + pinctrl-names = "default"; + pinctrl-0 = <&ts_int_l>, <&ts_reset_l>; + + interrupt-parent = <&tlmm>; + interrupts = <9 IRQ_TYPE_LEVEL_LOW>; + + post-power-on-delay-ms = <20>; + hid-descr-addr = <0x0001>; + + vdd-supply = <&pp3300_ts>; + }; +}; + +&mdss_dsi0 { panel: panel@0 { /* Compatible will be filled in per-board */ reg = <0>; @@ -67,7 +91,7 @@ panel: panel@0 { port { panel_in: endpoint { - remote-endpoint = <&dsi0_out>; + remote-endpoint = <&mdss_dsi0_out>; }; }; }; @@ -82,30 +106,6 @@ endpoint { }; }; -&gpio_keys { - status = "okay"; -}; - -&i2c4 { - status = "okay"; - clock-frequency = <400000>; - - ap_ts: touchscreen@10 { - compatible = "hid-over-i2c"; - reg = <0x10>; - pinctrl-names = "default"; - pinctrl-0 = <&ts_int_l>, <&ts_reset_l>; - - interrupt-parent = <&tlmm>; - interrupts = <9 IRQ_TYPE_LEVEL_LOW>; - - post-power-on-delay-ms = <20>; - hid-descr-addr = <0x0001>; - - vdd-supply = <&pp3300_ts>; - }; -}; - &sdhc_2 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi index e52b8776755d..b0c3be4c3bb4 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi @@ -27,10 +27,6 @@ &pp3300_dx_edp { /* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */ -&dsi0_out { - remote-endpoint = <&sn65dsi86_in>; -}; - edp_brij_i2c: &i2c2 { status = "okay"; clock-frequency = <400000>; @@ -65,7 +61,7 @@ ports { port@0 { reg = <0>; sn65dsi86_in: endpoint { - remote-endpoint = <&dsi0_out>; + remote-endpoint = <&mdss_dsi0_out>; }; }; @@ -95,6 +91,10 @@ panel_in_edp: endpoint { }; }; +&mdss_dsi0_out { + remote-endpoint = <&sn65dsi86_in>; +}; + &tlmm { edp_brij_irq: edp-brij-irq-state { pins = "gpio11"; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe.dts index c5b0658bd632..6eeead70d3eb 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe.dts @@ -17,7 +17,7 @@ / { compatible = "google,wormdingler-sku1024", "qcom,sc7180"; }; -&dsi_phy { +&mdss_dsi0_phy { qcom,phy-rescode-offset-top = /bits/ 8 <31 31 31 31 (-32)>; qcom,phy-rescode-offset-bot = /bits/ 8 <31 31 31 31 (-32)>; qcom,phy-drive-ldo-level = <450>; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi index 262d6691abd9..2efa8a4bcda6 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi @@ -110,7 +110,28 @@ keyboard-controller { }; }; -&dsi0 { +&i2c4 { + status = "okay"; + clock-frequency = <400000>; + + ap_ts: touchscreen@1 { + compatible = "hid-over-i2c"; + reg = <0x01>; + pinctrl-names = "default"; + pinctrl-0 = <&ts_int_l>; + + interrupt-parent = <&tlmm>; + interrupts = <9 IRQ_TYPE_EDGE_FALLING>; + + post-power-on-delay-ms = <70>; + hid-descr-addr = <0x0001>; + + vdd-supply = <&pp3300_ts>; + vddl-supply = <&pp1800_ts>; + }; +}; + +&mdss_dsi0 { panel: panel@0 { reg = <0>; @@ -126,7 +147,7 @@ panel: panel@0 { port { panel_in: endpoint { - remote-endpoint = <&dsi0_out>; + remote-endpoint = <&mdss_dsi0_out>; }; }; }; @@ -141,27 +162,6 @@ endpoint { }; }; -&i2c4 { - status = "okay"; - clock-frequency = <400000>; - - ap_ts: touchscreen@1 { - compatible = "hid-over-i2c"; - reg = <0x01>; - pinctrl-names = "default"; - pinctrl-0 = <&ts_int_l>; - - interrupt-parent = <&tlmm>; - interrupts = <9 IRQ_TYPE_EDGE_FALLING>; - - post-power-on-delay-ms = <70>; - hid-descr-addr = <0x0001>; - - vdd-supply = <&pp3300_ts>; - vddl-supply = <&pp1800_ts>; - }; -}; - &pm6150_adc { skin-temp-thermistor@4d { reg = ; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 51d6c3502f3f..805fe1275e97 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -705,20 +705,6 @@ &camcc { status = "disabled"; }; -&dsi0 { - status = "okay"; - vdda-supply = <&vdda_mipi_dsi0_1p2>; -}; - -&dsi0_out { - data-lanes = <0 1 2 3>; -}; - -&dsi_phy { - status = "okay"; - vdds-supply = <&vdda_mipi_dsi0_pll>; -}; - ap_sar_sensor_i2c: &i2c5 { clock-frequency = <400000>; @@ -836,6 +822,20 @@ &mdss_dp_out { link-frequencies = /bits/ 64 <1620000000 2700000000 5400000000>; }; +&mdss_dsi0 { + status = "okay"; + vdda-supply = <&vdda_mipi_dsi0_1p2>; +}; + +&mdss_dsi0_out { + data-lanes = <0 1 2 3>; +}; + +&mdss_dsi0_phy { + status = "okay"; + vdds-supply = <&vdda_mipi_dsi0_pll>; +}; + &pm6150_adc { charger-thermistor@4f { reg = ; diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 2c05b5a5d92b..34eff97f8630 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -3005,7 +3005,7 @@ ports { port@0 { reg = <0>; dpu_intf1_out: endpoint { - remote-endpoint = <&dsi0_in>; + remote-endpoint = <&mdss_dsi0_in>; }; }; @@ -3042,7 +3042,7 @@ opp-460000000 { }; }; - dsi0: dsi@ae94000 { + mdss_dsi0: dsi@ae94000 { compatible = "qcom,sc7180-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0 0x0ae94000 0 0x400>; @@ -3065,12 +3065,12 @@ dsi0: dsi@ae94000 { "bus"; assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>; - assigned-clock-parents = <&dsi_phy 0>, <&dsi_phy 1>; + assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>; operating-points-v2 = <&dsi_opp_table>; power-domains = <&rpmhpd SC7180_CX>; - phys = <&dsi_phy>; + phys = <&mdss_dsi0_phy>; #address-cells = <1>; #size-cells = <0>; @@ -3083,14 +3083,14 @@ ports { port@0 { reg = <0>; - dsi0_in: endpoint { + mdss_dsi0_in: endpoint { remote-endpoint = <&dpu_intf1_out>; }; }; port@1 { reg = <1>; - dsi0_out: endpoint { + mdss_dsi0_out: endpoint { }; }; }; @@ -3115,13 +3115,13 @@ opp-358000000 { }; }; - dsi_phy: phy@ae94400 { + mdss_dsi0_phy: phy@ae94400 { compatible = "qcom,dsi-phy-10nm"; reg = <0 0x0ae94400 0 0x200>, <0 0x0ae94600 0 0x280>, <0 0x0ae94a00 0 0x1e0>; - reg-names = "dsi_phy", - "dsi_phy_lane", + reg-names = "dsi0_phy", + "dsi0_phy_lane", "dsi_pll"; #clock-cells = <1>; @@ -3212,8 +3212,8 @@ dispcc: clock-controller@af00000 { reg = <0 0x0af00000 0 0x200000>; clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GCC_DISP_GPLL0_CLK_SRC>, - <&dsi_phy 0>, - <&dsi_phy 1>, + <&mdss_dsi0_phy 0>, + <&mdss_dsi0_phy 1>, <&dp_phy 0>, <&dp_phy 1>; clock-names = "bi_tcxo", From patchwork Wed May 31 01:16:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 687542 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27139C7EE2E for ; Wed, 31 May 2023 01:16:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233782AbjEaBQl (ORCPT ); Tue, 30 May 2023 21:16:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234000AbjEaBQj (ORCPT ); Tue, 30 May 2023 21:16:39 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C43B6133 for ; Tue, 30 May 2023 18:16:36 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-4f3b5881734so6001255e87.0 for ; Tue, 30 May 2023 18:16:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685495795; x=1688087795; 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=8qcBH6bGVmZGIJBDLEVfU6rhkGcQMhUDNw/1p6tNesM=; b=n89DjNlA/pI0RjVSF8J1AW8jCKFkWcNM2CZYtpi493nQ/Uo59XLz3qXT+/e2oaxKcq DOeykrSTMCtUUkbcQFc7nosUNzk5YhaVs42Ol1hU4+pO3J1Yeni6yulwic+I0Ykc7k1g 1EFUcg62IVe9qdi81l9ylusqlTCkHU54saMiEv5eeo/Ltc8FOyi6Ns8cfGhH5EBiif1C eyir5bV8iKDR6Kae3451W8TaltiQDuWbwUMcps1NVrpIippgv5We9eVkc8HbP8HvRyoz bArDhNFq6UiiBLgiZ0jM1NQ83Q7b9LakaDGKhbIiYPd18hVrN0oCXMbjixbzNy094EfJ asog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685495795; x=1688087795; 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=8qcBH6bGVmZGIJBDLEVfU6rhkGcQMhUDNw/1p6tNesM=; b=jKkts9reOz7doz05d196oI6/R7SzNRuYZ4SJMkpaBKZczebA5ZJLug16f7wC4n3Suj tV4S4HFwbR6HUOfpwOcrM8rUHIzuCPwVIqZNJwOKDY1h8o5/btc8khtkfFp6TNfeA+L2 UX4jP9g+wzJYxaiEjfvqXvaPNjnADHx6FiPghpJ6yapOQto4cledoBG1PlUmhpqyQcyR hB+xrQKMfxYIBadY+f5pxPVOmK6fEZBjLFKv0gZ1h8RiDcZLhm3YSK78n3BpmREVWaup J3k8LHeZZ85ZV5tjUdYae7NuDzZwqRh/zVLb24zWRPAB15dbmhNsuirAjcbTkmx8b9RV KUqQ== X-Gm-Message-State: AC+VfDwJOsMBIdoyXg3vbFLEFgZQaNJ72wCs73JZstwEwMPsmPviAHSi BULVf4rKuS+0jjYRkb/TZD0e/2X7oRvS+RM5cXs= X-Google-Smtp-Source: ACHHUZ6HWgROSLBtmgVz6gcXBarSRzfUW6NbdmEtaRtb+My6G6ct6lH80/9Hdn5bCUOZwnIdCP9vYA== X-Received: by 2002:ac2:5237:0:b0:4f3:982a:8be1 with SMTP id i23-20020ac25237000000b004f3982a8be1mr1576327lfl.69.1685495795077; Tue, 30 May 2023 18:16:35 -0700 (PDT) Received: from lothlorien.lan (dzdqv0yyyyyyyyyyybm5y-3.rev.dnainternet.fi. [2001:14ba:a0db:1f00::ab2]) by smtp.gmail.com with ESMTPSA id v24-20020ac25618000000b004f3787d8006sm505640lfd.128.2023.05.30.18.16.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 18:16:34 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 08/14] arm64: dts: qcom: sc7280: rename labels for DSI nodes Date: Wed, 31 May 2023 04:16:17 +0300 Message-Id: <20230531011623.3808538-9-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531011623.3808538-1-dmitry.baryshkov@linaro.org> References: <20230531011623.3808538-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Currently in board files MDSS and DSI nodes stay apart, because labels for DSI nodes do not have the mdss_ prefix. It was found that grouping all display-related notes is more useful. To keep all display-related nodes close in the board files, change DSI node labels from dsi_* to mdss_dsi_*. Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sc7280.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 1aa3c6bf81f0..2f5e73da8b6d 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3888,7 +3888,7 @@ ports { port@0 { reg = <0>; dpu_intf1_out: endpoint { - remote-endpoint = <&dsi0_in>; + remote-endpoint = <&mdss_dsi0_in>; }; }; @@ -3973,14 +3973,14 @@ ports { port@0 { reg = <0>; - dsi0_in: endpoint { + mdss_dsi0_in: endpoint { remote-endpoint = <&dpu_intf1_out>; }; }; port@1 { reg = <1>; - dsi0_out: endpoint { + mdss_dsi0_out: endpoint { }; }; }; From patchwork Wed May 31 01:16:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 687541 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AD41C7EE2C for ; Wed, 31 May 2023 01:16:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233999AbjEaBQo (ORCPT ); Tue, 30 May 2023 21:16:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233981AbjEaBQn (ORCPT ); Tue, 30 May 2023 21:16:43 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD1DA10B for ; Tue, 30 May 2023 18:16:39 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-4f3bb395e69so6109150e87.2 for ; Tue, 30 May 2023 18:16:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685495798; x=1688087798; 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=XMJEYcHn8wCho//OE4bkVw8opEzX+BpNx5GppcxdOxc=; b=nm2Mqrxjy8KIcP2W1lgq2T/BWkrOhzdTDXZBGBZWfYi43/PtWIW//sMSEIygKC03CN WDfFSYgXPf9gsheI5viE5W/zWBb3rQr9PTWH7HybUYPS7j4s3+eiMIBVcQ6nZijttbhz Ash286AtXuoV54GO9sx7pL4ioOEYOVNGMZ3AXYo9qHXEEpLiQ0vqVqaW6BG5/Bfpkh4n VrlvnN4Vff968hLMj+9NeICeYa8nYvTiDY4iDTkQ7Vw8Sm5AcRKL+5SUD7P9KVy09kwR nD9nzY5Fh+9epskvgU/xIesjtMAJ7riIO5ivVVgR7kbc4u3kSNzSLyUIV6EXI2sjH6/E 7fNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685495798; x=1688087798; 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=XMJEYcHn8wCho//OE4bkVw8opEzX+BpNx5GppcxdOxc=; b=j+X3iamty9Dj4IC+U83myO3NRxmCAhJ7gEaJDhQbEDMnDFdwnLV+uns2Vi6bcqDUBr 61z57tPau7B+sJt2v0f28uonzWGD69/nchrGOzanv9U2L5/LHQws8/15Mo86rSLMvuqe PsekmDKKOz3NcBkHRNzbg3cbXQer4ECugReQSIroDFYiQ7kk8vf3InYnZLQlaIBfJjYD RmSrqjDZnE7uDcaeneyw8HRPEzHcGALCsFd7TbttTiQe62h3m2/yrgolmJ/SPAimKpvt OhNcScJqA+tfdiPXU55cgCRdbrGLyqPt4dvA1t3rhSeR/Oiygrmc433qm5b1Q4XhcwBB xcFg== X-Gm-Message-State: AC+VfDwZbVO6LbcPZdM3n+/F+IzIYPDFwxH2PQWDP7mwq/FWfoWr7g0o CtUu4w4AJgAjpIM+nqyEBs6dHg== X-Google-Smtp-Source: ACHHUZ5sr4CmvCbXj+O/UxYVp/c9rk/aaFXZS7FliJdVlSNani7vtsw3L3cgoY8efiixPuR3Zrcy7Q== X-Received: by 2002:ac2:5fcf:0:b0:4f3:b1dc:b46b with SMTP id q15-20020ac25fcf000000b004f3b1dcb46bmr1608944lfg.1.1685495797977; Tue, 30 May 2023 18:16:37 -0700 (PDT) Received: from lothlorien.lan (dzdqv0yyyyyyyyyyybm5y-3.rev.dnainternet.fi. [2001:14ba:a0db:1f00::ab2]) by smtp.gmail.com with ESMTPSA id v24-20020ac25618000000b004f3787d8006sm505640lfd.128.2023.05.30.18.16.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 18:16:37 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 10/14] arm64: dts: qcom: sdm630: rename labels for DSI nodes Date: Wed, 31 May 2023 04:16:19 +0300 Message-Id: <20230531011623.3808538-11-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531011623.3808538-1-dmitry.baryshkov@linaro.org> References: <20230531011623.3808538-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Currently in board files MDSS and DSI nodes stay apart, because labels for DSI nodes do not have the mdss_ prefix. It was found that grouping all display-related notes is more useful. To keep all display-related nodes close in the board files, change DSI node labels from dsi_* to mdss_dsi_*. Signed-off-by: Dmitry Baryshkov --- .../boot/dts/qcom/sda660-inforce-ifc6560.dts | 16 ++++++------- arch/arm64/boot/dts/qcom/sdm630.dtsi | 20 ++++++++-------- arch/arm64/boot/dts/qcom/sdm660.dtsi | 24 +++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts index 7459525d9982..0b23d5bb3f26 100644 --- a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts +++ b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts @@ -134,7 +134,7 @@ port@0 { reg = <0>; adv7533_in: endpoint { - remote-endpoint = <&dsi0_out>; + remote-endpoint = <&mdss_dsi0_out>; }; }; @@ -183,25 +183,25 @@ bluetooth { }; }; -&dsi0 { +&mdss { + status = "okay"; +}; + +&mdss_dsi0 { status = "okay"; vdda-supply = <&vreg_l1a_1p225>; }; -&dsi0_out { +&mdss_dsi0_out { remote-endpoint = <&adv7533_in>; data-lanes = <0 1 2 3>; }; -&dsi0_phy { +&mdss_dsi0_phy { status = "okay"; vcca-supply = <&vreg_l1b_0p925>; }; -&mdss { - status = "okay"; -}; - &mmss_smmu { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index 897f2440c9c8..bba0f366ef03 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -1463,8 +1463,8 @@ mmcc: clock-controller@c8c0000 { <&sleep_clk>, <&gcc GCC_MMSS_GPLL0_CLK>, <&gcc GCC_MMSS_GPLL0_DIV_CLK>, - <&dsi0_phy 1>, - <&dsi0_phy 0>, + <&mdss_dsi0_phy 1>, + <&mdss_dsi0_phy 0>, <0>, <0>, <0>, @@ -1536,7 +1536,7 @@ ports { port@0 { reg = <0>; mdp5_intf1_out: endpoint { - remote-endpoint = <&dsi0_in>; + remote-endpoint = <&mdss_dsi0_in>; }; }; }; @@ -1572,7 +1572,7 @@ opp-412500000 { }; }; - dsi0: dsi@c994000 { + mdss_dsi0: dsi@c994000 { compatible = "qcom,sdm660-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0c994000 0x400>; @@ -1586,8 +1586,8 @@ dsi0: dsi@c994000 { assigned-clocks = <&mmcc BYTE0_CLK_SRC>, <&mmcc PCLK0_CLK_SRC>; - assigned-clock-parents = <&dsi0_phy 0>, - <&dsi0_phy 1>; + assigned-clock-parents = <&mdss_dsi0_phy 0>, + <&mdss_dsi0_phy 1>; clocks = <&mmcc MDSS_MDP_CLK>, <&mmcc MDSS_BYTE0_CLK>, @@ -1608,7 +1608,7 @@ dsi0: dsi@c994000 { "pixel", "core"; - phys = <&dsi0_phy>; + phys = <&mdss_dsi0_phy>; status = "disabled"; @@ -1618,20 +1618,20 @@ ports { port@0 { reg = <0>; - dsi0_in: endpoint { + mdss_dsi0_in: endpoint { remote-endpoint = <&mdp5_intf1_out>; }; }; port@1 { reg = <1>; - dsi0_out: endpoint { + mdss_dsi0_out: endpoint { }; }; }; }; - dsi0_phy: phy@c994400 { + mdss_dsi0_phy: phy@c994400 { compatible = "qcom,dsi-phy-14nm-660"; reg = <0x0c994400 0x100>, <0x0c994500 0x300>, diff --git a/arch/arm64/boot/dts/qcom/sdm660.dtsi b/arch/arm64/boot/dts/qcom/sdm660.dtsi index f0f27fc12c18..f89b27c99f40 100644 --- a/arch/arm64/boot/dts/qcom/sdm660.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm660.dtsi @@ -148,14 +148,14 @@ ports { port@1 { reg = <1>; mdp5_intf2_out: endpoint { - remote-endpoint = <&dsi1_in>; + remote-endpoint = <&mdss_dsi1_in>; }; }; }; }; &mdss { - dsi1: dsi@c996000 { + mdss_dsi1: dsi@c996000 { compatible = "qcom,sdm660-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0c996000 0x400>; @@ -170,8 +170,8 @@ dsi1: dsi@c996000 { assigned-clocks = <&mmcc BYTE1_CLK_SRC>, <&mmcc PCLK1_CLK_SRC>; - assigned-clock-parents = <&dsi1_phy 0>, - <&dsi1_phy 1>; + assigned-clock-parents = <&mdss_dsi1_phy 0>, + <&mdss_dsi1_phy 1>; clocks = <&mmcc MDSS_MDP_CLK>, <&mmcc MDSS_BYTE1_CLK>, @@ -192,7 +192,7 @@ dsi1: dsi@c996000 { "pixel", "core"; - phys = <&dsi1_phy>; + phys = <&mdss_dsi1_phy>; status = "disabled"; @@ -202,20 +202,20 @@ ports { port@0 { reg = <0>; - dsi1_in: endpoint { + mdss_dsi1_in: endpoint { remote-endpoint = <&mdp5_intf2_out>; }; }; port@1 { reg = <1>; - dsi1_out: endpoint { + mdss_dsi1_out: endpoint { }; }; }; }; - dsi1_phy: phy@c996400 { + mdss_dsi1_phy: phy@c996400 { compatible = "qcom,dsi-phy-14nm-660"; reg = <0x0c996400 0x100>, <0x0c996500 0x300>, @@ -239,10 +239,10 @@ &mmcc { <&sleep_clk>, <&gcc GCC_MMSS_GPLL0_CLK>, <&gcc GCC_MMSS_GPLL0_DIV_CLK>, - <&dsi0_phy 1>, - <&dsi0_phy 0>, - <&dsi1_phy 1>, - <&dsi1_phy 0>, + <&mdss_dsi0_phy 1>, + <&mdss_dsi0_phy 0>, + <&mdss_dsi1_phy 1>, + <&mdss_dsi1_phy 0>, <0>, <0>; }; From patchwork Wed May 31 01:16:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 687540 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0863C7EE2E for ; Wed, 31 May 2023 01:16:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234008AbjEaBQv (ORCPT ); Tue, 30 May 2023 21:16:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233981AbjEaBQu (ORCPT ); Tue, 30 May 2023 21:16:50 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE806121 for ; Tue, 30 May 2023 18:16:41 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-4f4f3ac389eso4530036e87.1 for ; Tue, 30 May 2023 18:16:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685495801; x=1688087801; 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=3MrQuWe2JNY9qcSKpceygwRhIAhyc/EgGyuqGKJJDOQ=; b=mphHFARl+tVvCgAwM81c99V3dNNf/cKzAjl8uCTecxQqWD5CmDtS4wekPP6tI8X2BE cwhCQhD2g1kNn3V0LmGnHok/4VHKjjx/c6WEVhJNHCug445Qrbg+lwDWGysrxxG8GAsH wVhPoEIv/yrzmRY08FJezTf7AowJzbJflXG1vVf/VT58nVnt8GWjpO6TmLjOLmYlm/fM yGdvDSXdGAaV9sS+o6LpXz8cS+G6g43uTDDdjPHFevzFZ2xLGouDcdKcmIIbquP7Dgua 3/X21iWp5rlmeGvQfWAPJ9dp62ZUOUBz/nJ1BN6NKzoQ0oUZgFB6BY1ihnPFAifOBbnc +XiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685495801; x=1688087801; 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=3MrQuWe2JNY9qcSKpceygwRhIAhyc/EgGyuqGKJJDOQ=; b=Td7AMV6gm7BSK8fE4gEaoa/3oFJMpp9jGDJoP4AsGXSjTnHYGSERIEc25rlpskI4Nf Fdk9vhjH1abYHR8FA9LA5up2Lq6aCSAB7zjoQTip7YnrftH0iZptbYMqptapTQEUXuM5 jaPQSU6ofR++1+frC28evjdLUn9y+drgYRk9y61z3BgonSM501A1wirhJ/QJa4u3YaGr ufVdP6Pw/07HZDuDDNYd8+bPtOnp6JPKBgtuOPaH7QOBpdd7VsN1IHQcgxyboQjjMWkr cnaKil4z00MR2CM9g6RKM1ZO1+8pzsayvH904VZjQ9kfYOX9HCzgcqgIniQI+hTj9ioF Gc5A== X-Gm-Message-State: AC+VfDzA6OFvYWAko9UGFboPY/WsYVikKVaFpKD+SPw6UL5/7GIuLEw8 OhQFIVYetl1JaNA2hdETVyiIMw== X-Google-Smtp-Source: ACHHUZ623riz1y1qDbvSXsDzfAORHwkuVERpTFa3gZIBt2SnwSslTqqp6kX2uFP1S1gCZ56OSkBCWw== X-Received: by 2002:ac2:5598:0:b0:4f4:e744:2e71 with SMTP id v24-20020ac25598000000b004f4e7442e71mr1665636lfg.64.1685495801133; Tue, 30 May 2023 18:16:41 -0700 (PDT) Received: from lothlorien.lan (dzdqv0yyyyyyyyyyybm5y-3.rev.dnainternet.fi. [2001:14ba:a0db:1f00::ab2]) by smtp.gmail.com with ESMTPSA id v24-20020ac25618000000b004f3787d8006sm505640lfd.128.2023.05.30.18.16.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 18:16:40 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 13/14] arm64: dts: qcom: msm8996: rename labels for HDMI nodes Date: Wed, 31 May 2023 04:16:22 +0300 Message-Id: <20230531011623.3808538-14-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531011623.3808538-1-dmitry.baryshkov@linaro.org> References: <20230531011623.3808538-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Currently in board files MDSS and HDMI nodes stay apart, because labels for HDMI nodes do not have the mdss_ prefix. It was found that grouping all display-related notes is more useful. To keep all display-related nodes close in the board files, change HDMI node labels from hdmi_* to mdss_hdmi_*. Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 50 ++++++++++---------- arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 6 +-- arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 4 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 16 +++---- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts index b599909c4463..537547b97459 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts @@ -208,25 +208,6 @@ &gpu { status = "okay"; }; -&hdmi { - status = "okay"; - - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>; - pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>; - - core-vdda-supply = <&vreg_l12a_1p8>; - core-vcc-supply = <&vreg_s4a_1p8>; -}; - -&hdmi_phy { - status = "okay"; - - vddio-supply = <&vreg_l12a_1p8>; - vcca-supply = <&vreg_l28a_0p925>; - #phy-cells = <0>; -}; - &hsusb_phy1 { status = "okay"; @@ -251,6 +232,25 @@ &mdss { status = "okay"; }; +&mdss_hdmi { + status = "okay"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&mdss_hdmi_hpd_active &mdss_hdmi_ddc_active>; + pinctrl-1 = <&mdss_hdmi_hpd_suspend &mdss_hdmi_ddc_suspend>; + + core-vdda-supply = <&vreg_l12a_1p8>; + core-vcc-supply = <&vreg_s4a_1p8>; +}; + +&mdss_hdmi_phy { + status = "okay"; + + vddio-supply = <&vreg_l12a_1p8>; + vcca-supply = <&vreg_l28a_0p925>; + #phy-cells = <0>; +}; + &mmcc { vdd-gfx-supply = <&vdd_gfx>; }; @@ -433,28 +433,28 @@ sdc2_cd_off: sdc2-cd-off-state { drive-strength = <2>; }; - hdmi_hpd_active: hdmi-hpd-active-state { + mdss_hdmi_hpd_active: mdss_hdmi-hpd-active-state { pins = "gpio34"; function = "hdmi_hot"; bias-pull-down; drive-strength = <16>; }; - hdmi_hpd_suspend: hdmi-hpd-suspend-state { + mdss_hdmi_hpd_suspend: mdss_hdmi-hpd-suspend-state { pins = "gpio34"; function = "hdmi_hot"; bias-pull-down; drive-strength = <2>; }; - hdmi_ddc_active: hdmi-ddc-active-state { + mdss_hdmi_ddc_active: mdss_hdmi-ddc-active-state { pins = "gpio32", "gpio33"; function = "hdmi_ddc"; drive-strength = <2>; bias-pull-up; }; - hdmi_ddc_suspend: hdmi-ddc-suspend-state { + mdss_hdmi_ddc_suspend: mdss_hdmi-ddc-suspend-state { pins = "gpio32", "gpio33"; function = "hdmi_ddc"; drive-strength = <2>; @@ -1043,7 +1043,7 @@ cpu { }; }; - hdmi-dai-link { + mdss_hdmi-dai-link { link-name = "HDMI"; cpu { sound-dai = <&q6afedai HDMI_RX>; @@ -1054,7 +1054,7 @@ platform { }; codec { - sound-dai = <&hdmi 0>; + sound-dai = <&mdss_hdmi 0>; }; }; diff --git a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts index ed2e2f6c6775..ac6471d1db1f 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts +++ b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts @@ -92,15 +92,15 @@ &gpu { status = "okay"; }; -&hdmi { +&mdss { status = "okay"; }; -&hdmi_phy { +&mdss_hdmi { status = "okay"; }; -&mdss { +&mdss_hdmi_phy { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8996-mtp.dts b/arch/arm64/boot/dts/qcom/msm8996-mtp.dts index 596ad4c896f5..495d45a16e63 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-mtp.dts +++ b/arch/arm64/boot/dts/qcom/msm8996-mtp.dts @@ -24,10 +24,10 @@ &blsp2_uart2 { status = "okay"; }; -&hdmi { +&mdss_hdmi { status = "okay"; }; -&hdmi_phy { +&mdss_hdmi_phy { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 3855366ca89f..0cb2d4f08c3a 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -895,7 +895,7 @@ mmcc: clock-controller@8c0000 { <&mdss_dsi0_phy 0>, <&mdss_dsi1_phy 1>, <&mdss_dsi1_phy 0>, - <&hdmi_phy>; + <&mdss_hdmi_phy>; clock-names = "xo", "gpll0", "gcc_mmss_noc_cfg_ahb_clk", @@ -980,7 +980,7 @@ ports { port@0 { reg = <0>; mdp5_intf3_out: endpoint { - remote-endpoint = <&hdmi_in>; + remote-endpoint = <&mdss_hdmi_in>; }; }; @@ -1136,8 +1136,8 @@ mdss_dsi1_phy: phy@996400 { status = "disabled"; }; - hdmi: hdmi-tx@9a0000 { - compatible = "qcom,hdmi-tx-8996"; + mdss_hdmi: mdss_hdmi-tx@9a0000 { + compatible = "qcom,mdss_hdmi-tx-8996"; reg = <0x009a0000 0x50c>, <0x00070000 0x6158>, <0x009e0000 0xfff>; @@ -1160,7 +1160,7 @@ hdmi: hdmi-tx@9a0000 { "alt_iface", "extp"; - phys = <&hdmi_phy>; + phys = <&mdss_hdmi_phy>; #sound-dai-cells = <1>; status = "disabled"; @@ -1171,16 +1171,16 @@ ports { port@0 { reg = <0>; - hdmi_in: endpoint { + mdss_hdmi_in: endpoint { remote-endpoint = <&mdp5_intf3_out>; }; }; }; }; - hdmi_phy: phy@9a0600 { + mdss_hdmi_phy: phy@9a0600 { #phy-cells = <0>; - compatible = "qcom,hdmi-phy-8996"; + compatible = "qcom,mdss_hdmi-phy-8996"; reg = <0x009a0600 0x1c4>, <0x009a0a00 0x124>, <0x009a0c00 0x124>, From patchwork Wed May 31 01:16:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 687539 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC4FFC7EE23 for ; Wed, 31 May 2023 01:16:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231791AbjEaBQz (ORCPT ); Tue, 30 May 2023 21:16:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234013AbjEaBQy (ORCPT ); Tue, 30 May 2023 21:16:54 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC107185 for ; Tue, 30 May 2023 18:16:43 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-4f3a611b3ddso524087e87.0 for ; Tue, 30 May 2023 18:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685495802; x=1688087802; 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=woCXnH6ZX399DdZ3p/jsAqXyUxOtUCvlbTzMc78ahto=; b=sn9JqEvP89KkQBTcgGG4c/utardQA8OulXb/6wzToQPfjyuCVZLc0rjGENXEYl1+JY 4h0SVzEtSns6eP8FH3M75rRvSUA6j3dHmv2jiUxHxP7cZ7AWDNPnZ6GImriqo2qsy5P3 TwceSQS/WOvh/iY9ucIMDH9wpZjFkSW8Jnb6+9fH5Fa6RrqCEEHotK7YuyDb8crldus/ G3ACdet4pvsXE3qKP1AMqrnm81InCaUddAPO8q4fq/alJJdnpTJLuFBLYda5e2qBjXQY k4uw0HudcuXAi4rozaW6Mb2HXUW63VSFIcUviUQ6hx+SBCUmqmnMCGBzzOPO6Z7HZPzT YLhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685495802; x=1688087802; 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=woCXnH6ZX399DdZ3p/jsAqXyUxOtUCvlbTzMc78ahto=; b=NQUak1AXy4uc8kZDY6dkRms98Xn+eA+LYitgUM4g1YHuPZd/wchH1EaW4o6N19NIK4 wDzqCVUa0N8UOfDE+laDtpMr59YT1DHH/6zcTz9jpCcazw7ZdmuWa73mlSOQQPBWK020 3x5nkAorY1HTisybFOJQR26sV/9b+46vXML9nSYHOWlIziG8G02T5VYonx3SHTvG06RH eJudD3V0jf/sPO11XlCSl9+YPahJi6vQoh0bWprfyHIyZh2n+5IuWaHZex7Z/XZMnhw5 5JAnmx9ls/FT9oWjMEWhmNMuwMTnsUjhA0x2xCJpqfA3lysaWq2zMxCGBj+vQf5ibmRx qgvg== X-Gm-Message-State: AC+VfDzAJwQmWcKcCSYykWsxjVgvELC1tFq6y8IfuNfjq+Cbk6FqheGW LlXzIuOrsJ0UEnk1b4TkoTWUZQ== X-Google-Smtp-Source: ACHHUZ5kMIq5U8eyFFK13ecC+zqqAJLVuB7ABierQG4uCyzxZs9zfF/tb5+fk/8SOHVxO9sVVpH1Fw== X-Received: by 2002:ac2:41c5:0:b0:4f3:b9c8:5da with SMTP id d5-20020ac241c5000000b004f3b9c805damr1279364lfi.33.1685495802077; Tue, 30 May 2023 18:16:42 -0700 (PDT) Received: from lothlorien.lan (dzdqv0yyyyyyyyyyybm5y-3.rev.dnainternet.fi. [2001:14ba:a0db:1f00::ab2]) by smtp.gmail.com with ESMTPSA id v24-20020ac25618000000b004f3787d8006sm505640lfd.128.2023.05.30.18.16.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 18:16:41 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 14/14] ARM: dts: qcom: msm8974: rename labels for DSI nodes Date: Wed, 31 May 2023 04:16:23 +0300 Message-Id: <20230531011623.3808538-15-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531011623.3808538-1-dmitry.baryshkov@linaro.org> References: <20230531011623.3808538-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Currently in board files MDSS and HDMI nodes stay apart, because labels for HDMI nodes do not have the mdss_ prefix. It was found that grouping all display-related notes is more useful. To keep all display-related nodes close in the board files, change DSI node aliases from dsi_* to mdss_dsi_*. Signed-off-by: Dmitry Baryshkov --- .../arm/boot/dts/qcom-apq8074-dragonboard.dts | 24 ++++++------- .../qcom-msm8974-lge-nexus5-hammerhead.dts | 16 ++++----- arch/arm/boot/dts/qcom-msm8974.dtsi | 36 +++++++++---------- .../boot/dts/qcom-msm8974pro-samsung-klte.dts | 24 ++++++------- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts index 72f7e09a5bbf..72f6611bbe49 100644 --- a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts +++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts @@ -48,7 +48,15 @@ eeprom: eeprom@52 { }; }; -&dsi0 { +&gpu { + status = "okay"; +}; + +&mdss { + status = "okay"; +}; + +&mdss_dsi0 { vdda-supply = <&pm8941_l2>; vdd-supply = <&pm8941_l22>; vddio-supply = <&pm8941_l12>; @@ -65,31 +73,23 @@ panel: panel@0 { port { panel_in: endpoint { - remote-endpoint = <&dsi0_out>; + remote-endpoint = <&mdss_dsi0_out>; }; }; }; }; -&dsi0_out { +&mdss_dsi0_out { remote-endpoint = <&panel_in>; data-lanes = <0 1 2 3>; }; -&dsi0_phy { +&mdss_dsi0_phy { status = "okay"; vddio-supply = <&pm8941_l12>; }; -&gpu { - status = "okay"; -}; - -&mdss { - status = "okay"; -}; - &pm8941_wled { qcom,cs-out; qcom,switching-freq = <3200>; diff --git a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts index 205907c8670a..60bdfddeae69 100644 --- a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts +++ b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts @@ -230,7 +230,11 @@ bluetooth { }; }; -&dsi0 { +&mdss { + status = "okay"; +}; + +&mdss_dsi0 { status = "okay"; vdda-supply = <&pm8941_l2>; @@ -246,27 +250,23 @@ panel: panel@0 { port { panel_in: endpoint { - remote-endpoint = <&dsi0_out>; + remote-endpoint = <&mdss_dsi0_out>; }; }; }; }; -&dsi0_out { +&mdss_dsi0_out { remote-endpoint = <&panel_in>; data-lanes = <0 1 2 3>; }; -&dsi0_phy { +&mdss_dsi0_phy { status = "okay"; vddio-supply = <&pm8941_l12>; }; -&mdss { - status = "okay"; -}; - &pm8941_gpios { gpio_keys_pin_a: gpio-keys-active-state { pins = "gpio2", "gpio3"; diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index 58e144957c5d..aeca504918a0 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -1837,10 +1837,10 @@ mmcc: clock-controller@fd8c0000 { <&gcc GPLL0_VOTE>, <&gcc GPLL1_VOTE>, <&rpmcc RPM_SMD_GFX3D_CLK_SRC>, - <&dsi0_phy 1>, - <&dsi0_phy 0>, - <&dsi1_phy 1>, - <&dsi1_phy 0>, + <&mdss_dsi0_phy 1>, + <&mdss_dsi0_phy 0>, + <&mdss_dsi1_phy 1>, + <&mdss_dsi1_phy 0>, <0>, <0>, <0>; @@ -1905,20 +1905,20 @@ ports { port@0 { reg = <0>; mdp5_intf1_out: endpoint { - remote-endpoint = <&dsi0_in>; + remote-endpoint = <&mdss_dsi0_in>; }; }; port@1 { reg = <1>; mdp5_intf2_out: endpoint { - remote-endpoint = <&dsi1_in>; + remote-endpoint = <&mdss_dsi1_in>; }; }; }; }; - dsi0: dsi@fd922800 { + mdss_dsi0: dsi@fd922800 { compatible = "qcom,msm8974-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0xfd922800 0x1f8>; @@ -1928,7 +1928,7 @@ dsi0: dsi@fd922800 { interrupts = <4>; assigned-clocks = <&mmcc BYTE0_CLK_SRC>, <&mmcc PCLK0_CLK_SRC>; - assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>; + assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>; clocks = <&mmcc MDSS_MDP_CLK>, <&mmcc MDSS_AHB_CLK>, @@ -1945,7 +1945,7 @@ dsi0: dsi@fd922800 { "core", "core_mmss"; - phys = <&dsi0_phy>; + phys = <&mdss_dsi0_phy>; status = "disabled"; @@ -1958,20 +1958,20 @@ ports { port@0 { reg = <0>; - dsi0_in: endpoint { + mdss_dsi0_in: endpoint { remote-endpoint = <&mdp5_intf1_out>; }; }; port@1 { reg = <1>; - dsi0_out: endpoint { + mdss_dsi0_out: endpoint { }; }; }; }; - dsi0_phy: phy@fd922a00 { + mdss_dsi0_phy: phy@fd922a00 { compatible = "qcom,dsi-phy-28nm-hpm"; reg = <0xfd922a00 0xd4>, <0xfd922b00 0x280>, @@ -1989,7 +1989,7 @@ dsi0_phy: phy@fd922a00 { status = "disabled"; }; - dsi1: dsi@fd922e00 { + mdss_dsi1: dsi@fd922e00 { compatible = "qcom,msm8974-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0xfd922e00 0x1f8>; @@ -1999,7 +1999,7 @@ dsi1: dsi@fd922e00 { interrupts = <4>; assigned-clocks = <&mmcc BYTE1_CLK_SRC>, <&mmcc PCLK1_CLK_SRC>; - assigned-clock-parents = <&dsi1_phy 0>, <&dsi1_phy 1>; + assigned-clock-parents = <&mdss_dsi1_phy 0>, <&mdss_dsi1_phy 1>; clocks = <&mmcc MDSS_MDP_CLK>, <&mmcc MDSS_AHB_CLK>, @@ -2016,7 +2016,7 @@ dsi1: dsi@fd922e00 { "core", "core_mmss"; - phys = <&dsi1_phy>; + phys = <&mdss_dsi1_phy>; status = "disabled"; @@ -2029,20 +2029,20 @@ ports { port@0 { reg = <0>; - dsi1_in: endpoint { + mdss_dsi1_in: endpoint { remote-endpoint = <&mdp5_intf2_out>; }; }; port@1 { reg = <1>; - dsi1_out: endpoint { + mdss_dsi1_out: endpoint { }; }; }; }; - dsi1_phy: phy@fd923000 { + mdss_dsi1_phy: phy@fd923000 { compatible = "qcom,dsi-phy-28nm-hpm"; reg = <0xfd923000 0xd4>, <0xfd923100 0x280>, diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts index eb505d6d7f31..3e2c86591ee2 100644 --- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts @@ -329,7 +329,15 @@ bluetooth { }; }; -&dsi0 { +&gpu { + status = "okay"; +}; + +&mdss { + status = "okay"; +}; + +&mdss_dsi0 { status = "okay"; vdda-supply = <&pma8084_l2>; @@ -351,31 +359,23 @@ panel: panel@0 { port { panel_in: endpoint { - remote-endpoint = <&dsi0_out>; + remote-endpoint = <&mdss_dsi0_out>; }; }; }; }; -&dsi0_out { +&mdss_dsi0_out { remote-endpoint = <&panel_in>; data-lanes = <0 1 2 3>; }; -&dsi0_phy { +&mdss_dsi0_phy { status = "okay"; vddio-supply = <&pma8084_l12>; }; -&gpu { - status = "okay"; -}; - -&mdss { - status = "okay"; -}; - &pma8084_gpios { gpio_keys_pin_a: gpio-keys-active-state { pins = "gpio2", "gpio3", "gpio5";