From nobody Fri Jun 19 16:08:04 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 166DDC43217 for ; Fri, 1 Apr 2022 20:10:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351706AbiDAUMh (ORCPT ); Fri, 1 Apr 2022 16:12:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351614AbiDAUMd (ORCPT ); Fri, 1 Apr 2022 16:12:33 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D070621405A for ; Fri, 1 Apr 2022 13:10:43 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id p15so8094454ejc.7 for ; Fri, 01 Apr 2022 13:10:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pkwzjXMnjNgWxqs20PZ0mplmA/H3MgK2N5/k8AKmLx0=; b=V+/9jQI5zfBoclaOwLPMGwOPs1FFrDSKx64gDd1j83ojIzTog27eURaTd+CzSQo2jh KruB/mfjTWgyJQHExdPTiSGkkdcXv/GhKKhIS8W3KP65rs27L3BE17APso1wuezIZIOn PwqpXoA1HQCD0bb+1YnEipAWEx0R3NPzUzptQ+PJKcjddd//GrDQFrtQMnsu0JljFTFg B0eK/7b5N9FVm+QPHefT5Ef2YTv9xM5QTS3A5O74oZjboHlUf/uN7SB+Atgj+IcsFW4i mDLZZQD6NO+xEXCWQCViahZMUoS9Hmi28DUygYj0UzDwE/qwgH4sl1pmnRmdivUTdN6q TC/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pkwzjXMnjNgWxqs20PZ0mplmA/H3MgK2N5/k8AKmLx0=; b=E+QDkZU6yFZwvXtzYBwbjWGQwNNopjoi+EV17Wr6IOMi6IMrAxl54KOlJ0UccqhIes foisROuHbpCwQ3qaN+JFt5aW9T7dRYt0XaMIPqS/NiL1n0ljaVRcrUC/5nsAoLGXrZyL 9W4uGyL6TETdXniCK2gacdIAfO0xI6tvXRjpTlMAGxWpp1svWqA4tWW6Yqr4dwajmyyU gcg4Vz1p2/n8pvgy2wcbsHpZrP3jdxDbAKlKX88HxdZt4M+oxkhyy+wSRnYl0Uvcd5Dd /x/Xcjg8WT/595r7CrCoInVpDpT7n5eXqG5KwYFIfnbsLhdR1+Qx66v5htL053u5aGTh 54tQ== X-Gm-Message-State: AOAM533dyv5B7jIC3mqdC7z29bIS6aZ5PFkrdm05YMDxY2QWIECyUpab wKQbC/5MZ/UGRwsrEPfo2vWFbw== X-Google-Smtp-Source: ABdhPJwQ/ABFj/W3fzrdT9VhNb8LJJVC2+tfUrwvjRBOC2UN9gfrT2+tv9p/6BrSIMz1IWvYWASqBw== X-Received: by 2002:a17:907:3d87:b0:6e0:bef:c3cb with SMTP id he7-20020a1709073d8700b006e00befc3cbmr1236863ejc.503.1648843842154; Fri, 01 Apr 2022 13:10:42 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-201-27.adslplus.ch. [188.155.201.27]) by smtp.gmail.com with ESMTPSA id bx5-20020a0564020b4500b00418fca53406sm1509041edb.27.2022.04.01.13.10.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 13:10:41 -0700 (PDT) From: Krzysztof Kozlowski To: Bjorn Andersson , Andy Gross , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , Mathieu Poirier , Kathiravan T , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 01/10] arm64: dts: qcom: msm8953: do not use underscore in node name Date: Fri, 1 Apr 2022 22:10:26 +0200 Message-Id: <20220401201035.189106-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> References: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Align RPM requests node with DT schema by using hyphen instead of underscore. Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/msm8953.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qc= om/msm8953.dtsi index 431228faacdd..aca13760bb75 100644 --- a/arch/arm64/boot/dts/qcom/msm8953.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi @@ -321,7 +321,7 @@ rpm { qcom,ipc =3D <&apcs 8 0>; qcom,smd-edge =3D <15>; =20 - rpm_requests: rpm_requests { + rpm_requests: rpm-requests { compatible =3D "qcom,rpm-msm8953"; qcom,smd-channels =3D "rpm_requests"; =20 --=20 2.32.0 From nobody Fri Jun 19 16:08:04 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E011EC4321E for ; Fri, 1 Apr 2022 20:10:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351693AbiDAUMl (ORCPT ); Fri, 1 Apr 2022 16:12:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345860AbiDAUMh (ORCPT ); Fri, 1 Apr 2022 16:12:37 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAF292156C2 for ; Fri, 1 Apr 2022 13:10:45 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id x34so4225051ede.8 for ; Fri, 01 Apr 2022 13:10:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vZSpTcuUm8K1XcOnNjGfRvdX99iMAx27okwDjYgvL64=; b=s514l3cehwTECRMHAc4oVh8Lhac5rDM7VsZkihN1to6DI5SOrc/DmRwA66MZNpOGeN z1KAOi70gQsdnwn1BEUXtd9eMOSfcgdFjNyWXQtXFuyGKJVi/EsXwNDusRU2WBZe7+5g BA2+5Zcbv+WHmg0p4cGHgSSpNcsXZKxlRVnBCrVfRNwLvwbva71VHr7yFlMEDcVb++c2 3B0VR371koPWu9tIs2/3ZTl73e5UoamFfqj79J2QMgmNtJENQWj/wYjczFyKAkRQ0sfG uSIkn0cy5+Ty7wxteoxqdbE3chIr0GYBJK7unkvRWSRhjN5Kxm8xBJOBuEOrhLyDPBVL fURQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vZSpTcuUm8K1XcOnNjGfRvdX99iMAx27okwDjYgvL64=; b=afVEBp7vl4MS+aoz3wjeA4xK/Pl1O2SpiLDZX8+OADIomzgDlh677HZTiIjSBtxFZ9 KyKa8ZfZg1T6WC2NMKQRfU4u1o2ckRD9wIvNzkVfEVNV+Ymf7y1ytCDPdCWpj2Ubuubr 9ZkI76TeAiL9wZkPy/izGGM/i4AKOyFKnavoKp5GFKvZMcSBE0/Bpj2yzYQN+WCtbUkA cTdudDwUcvpGf1oP+2R6Z8gwgehbSR2L4wgHtqHzj0XvKlvltbhMttR5I2hQv+pEmNhh 7rgAWqfpKh0no3qKOLqcBLrpQ2+bwLI5X7vnvNkD1Wi2kOXiSG13h60KLkDyQvgD//Rn UWGQ== X-Gm-Message-State: AOAM530kSCAnHVIso+LH1Y8XW9edp5bweMUSiaBAgOhqOQ9b39PyRLEM /3i45F/zj4yE5VNlVTI1ZSaUHA== X-Google-Smtp-Source: ABdhPJyu5vqa1NpW1FvnOrBS6maT+upb58FT6mJWm3l3rhXpz0gVmoF9622SkOdt3PUlF4HSdh1GuA== X-Received: by 2002:aa7:da81:0:b0:419:11e8:1039 with SMTP id q1-20020aa7da81000000b0041911e81039mr22622742eds.285.1648843844267; Fri, 01 Apr 2022 13:10:44 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-201-27.adslplus.ch. [188.155.201.27]) by smtp.gmail.com with ESMTPSA id bx5-20020a0564020b4500b00418fca53406sm1509041edb.27.2022.04.01.13.10.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 13:10:42 -0700 (PDT) From: Krzysztof Kozlowski To: Bjorn Andersson , Andy Gross , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , Mathieu Poirier , Kathiravan T , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 02/10] arm64: dts: qcom: msm8994: remove SMD qcom,local-pid property Date: Fri, 1 Apr 2022 22:10:27 +0200 Message-Id: <20220401201035.189106-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> References: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The Qualcomm SMD does not use qcom,local-pid property. Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/msm8994.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qc= om/msm8994.dtsi index 8c1dc5155b71..1ff7e2c03ce3 100644 --- a/arch/arm64/boot/dts/qcom/msm8994.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi @@ -233,7 +233,6 @@ rpm { interrupts =3D ; qcom,ipc =3D <&apcs 8 0>; qcom,smd-edge =3D <15>; - qcom,local-pid =3D <0>; qcom,remote-pid =3D <6>; =20 rpm_requests: rpm-requests { --=20 2.32.0 From nobody Fri Jun 19 16:08:04 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D5E1C4332F for ; Fri, 1 Apr 2022 20:10:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351734AbiDAUMn (ORCPT ); Fri, 1 Apr 2022 16:12:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351708AbiDAUMj (ORCPT ); Fri, 1 Apr 2022 16:12:39 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06E08215931 for ; Fri, 1 Apr 2022 13:10:47 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id b15so4244549edn.4 for ; Fri, 01 Apr 2022 13:10:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sPCP8q2t9mmowMCPujklX+PmP86KwmADww9ebRiXDzI=; b=GhS363ByZRL86Pn4YX8QGeTEZNgcgve9rTtFhLsS6bfdKrvWBwj5oY8x5J9F2HfuCw ntx5GCboVcvYtoBfU5vFRJFlLkxNeOMIaqI8H9mmAGU1T0QP0qetLL6RDFLdg9VpBeZP bAqed/UQPjQgnOg/QA9bcvxkHke8iZ98KOl671sIP2vtyGdKSk3yu40naSh7LvNems29 IDMAf1PZjfeahL6DCkr2ZUlnN9vzYKbMW+0pubDA1OBpl0bWnDXW2MMw4Jbww4YKytqV n5IW/G778o+MzJjO9FEXFKOsoq8JWdjdEmdQYdbxl6Pz0kd6onyIwam9uQumYGEtVC9s Q1Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sPCP8q2t9mmowMCPujklX+PmP86KwmADww9ebRiXDzI=; b=VkYwq/EOwmnTquNdjnbEVpL7alCsLFC7f4NCNk0VXu/MOxxr0aOuYAA2Dt3d3xBkf4 cZyBc1uX2yCp5WslzzlHBVFRJc6aWb4FNJTBkvvkxBN6KOLAabtCtKkWA4xNbAAkQloA K6BrKCNb92kVmkWuRDpUK6yWidaMnmRzTlQU7zCp1BeZHponsAK606Ysn2+a8N8XmSfU aY7C9iKMwof03z9EHJaG6Rxhgk5j4Sf5bsH9ZHTLGndCtq/ysZjTLhoRVAXjMlvlP4oW DE9/XvTS+zx2ev1hZ5cx8CiURPh5HRcBXkjHzNfuSenvB19JaemVRLadHoezTuVbv6d3 dLfQ== X-Gm-Message-State: AOAM532jTj6WwvWoebhuFZc20ojLDVOoifDxth+YpsUxfz+27kJ4g5UZ pTmzsrzKGFt0dEnnzr7d1zaUkQ== X-Google-Smtp-Source: ABdhPJxO17RtK3iw3c/J8HVKLZjSSJh2uya5eLbv6I7iVraHoeBQFAiBf5MNJGKlZV3bDnlQ4kmZzA== X-Received: by 2002:a05:6402:2794:b0:419:2ea9:7de3 with SMTP id b20-20020a056402279400b004192ea97de3mr22563439ede.169.1648843845493; Fri, 01 Apr 2022 13:10:45 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-201-27.adslplus.ch. [188.155.201.27]) by smtp.gmail.com with ESMTPSA id bx5-20020a0564020b4500b00418fca53406sm1509041edb.27.2022.04.01.13.10.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 13:10:45 -0700 (PDT) From: Krzysztof Kozlowski To: Bjorn Andersson , Andy Gross , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , Mathieu Poirier , Kathiravan T , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 03/10] arm64: dts: qcom: add RPM clock controller fallback compatible Date: Fri, 1 Apr 2022 22:10:28 +0200 Message-Id: <20220401201035.189106-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> References: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The bindings require a fallback compatible to RPM clock controller. Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8953.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8992.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- arch/arm64/boot/dts/qcom/qcs404.dtsi | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qc= om/msm8916.dtsi index e34963505e07..cf0482fdf69d 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -299,7 +299,7 @@ rpm_requests: rpm-requests { qcom,smd-channels =3D "rpm_requests"; =20 rpmcc: clock-controller { - compatible =3D "qcom,rpmcc-msm8916"; + compatible =3D "qcom,rpmcc-msm8916", "qcom,rpmcc"; #clock-cells =3D <1>; }; =20 diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qc= om/msm8953.dtsi index aca13760bb75..4fa0091d7a5e 100644 --- a/arch/arm64/boot/dts/qcom/msm8953.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi @@ -326,7 +326,7 @@ rpm_requests: rpm-requests { qcom,smd-channels =3D "rpm_requests"; =20 rpmcc: rpmcc { - compatible =3D "qcom,rpmcc-msm8953"; + compatible =3D "qcom,rpmcc-msm8953", "qcom,rpmcc"; clocks =3D <&xo_board>; clock-names =3D "xo"; #clock-cells =3D <1>; diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qc= om/msm8992.dtsi index 58fe58cc7703..c286381240ed 100644 --- a/arch/arm64/boot/dts/qcom/msm8992.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi @@ -11,7 +11,7 @@ /delete-node/ &cpu7_map; =20 &rpmcc { - compatible =3D "qcom,rpmcc-msm8992"; + compatible =3D "qcom,rpmcc-msm8992", "qcom,rpmcc"; }; =20 &tcsr_mutex { diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qc= om/msm8994.dtsi index 1ff7e2c03ce3..a36b1c7cf10e 100644 --- a/arch/arm64/boot/dts/qcom/msm8994.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi @@ -240,7 +240,7 @@ rpm_requests: rpm-requests { qcom,smd-channels =3D "rpm_requests"; =20 rpmcc: rpmcc { - compatible =3D "qcom,rpmcc-msm8994"; + compatible =3D "qcom,rpmcc-msm8994", "qcom,rpmcc"; #clock-cells =3D <1>; }; =20 diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qc= om/msm8996.dtsi index f0f81c23c16f..527afc90d9ef 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -456,7 +456,7 @@ rpm_requests: rpm-requests { qcom,glink-channels =3D "rpm_requests"; =20 rpmcc: qcom,rpmcc { - compatible =3D "qcom,rpmcc-msm8996"; + compatible =3D "qcom,rpmcc-msm8996", "qcom,rpmcc"; #clock-cells =3D <1>; }; =20 diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qco= m/qcs404.dtsi index 3f06f7cd3cf2..f0ade6a03208 100644 --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi @@ -226,7 +226,7 @@ rpm_requests: glink-channel { qcom,glink-channels =3D "rpm_requests"; =20 rpmcc: clock-controller { - compatible =3D "qcom,rpmcc-qcs404"; + compatible =3D "qcom,rpmcc-qcs404", "qcom,rpmcc"; #clock-cells =3D <1>; }; =20 --=20 2.32.0 From nobody Fri Jun 19 16:08:04 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFB9EC433F5 for ; Fri, 1 Apr 2022 20:11:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351770AbiDAUMt (ORCPT ); Fri, 1 Apr 2022 16:12:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351714AbiDAUMj (ORCPT ); Fri, 1 Apr 2022 16:12:39 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D21B221A8AB for ; Fri, 1 Apr 2022 13:10:48 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id u26so4191269eda.12 for ; Fri, 01 Apr 2022 13:10:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yLz7aILXGbmCujlTI/g4EfDEC7wYnFYansE6wl1+BpI=; b=PxHyDvJR26H9mDD/PwV4JiYvxj7YL0fkB7i5YMP1Gf2xT7q1GpkA/Sm0jVGd19n3FY WUU+Zo9FwAAqqwN/cQN6MRC9XqY1PmcZ0kDsCkdSOPceSM2d27c8HqHjHZ68GSedte6h wwDhzr16zY5wnQ1pp+IrwTzagBcaEq7a9qurEf3wGnL+Tz/JrTCWAXzjH00mVt/OfRGV QJMLDSbFmkmIwk6Q1r4nplyUOjldlccOsJHdUcCbV3P8uRNiBNBEiziDi7UBdTG4ne1N oofhk2pIaQV/9lZnjc6xLEa6wP1LVKmNf5ozhLU3BnmWoVrJV8vvO6GQcQVV+P09QSyT kr+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yLz7aILXGbmCujlTI/g4EfDEC7wYnFYansE6wl1+BpI=; b=4ROUOnz+oU8EaeVaOcIH1BvhPJkRqkLTeZq2/xy72wsAO5nhGLhYiXvOgivbZS1/TC RR3Wjl1gG2eyevkGm1HMDstACD71WYmSRQmJgXqQfJxOur4Mz7IeNTnZuTPpeyIjudyd 95TwC3ZYFrIKZBKokJM59v8COx4c+pPhEQg9uMvpoeplBiRadZJXyYliWvc/1XvluEho C1BsCD1U7OMkhbJY7UgY5hqFWzziWCGJmC88gIsfaYnRlw+I5mZok/GPkwgvrbgQMDbT EFERK/Sae5FDWJWZXIUTsy0zfB37l1V+A/cE5C5W5+gri4/Tq+KFvn/7HcACV10Wf29I pYxg== X-Gm-Message-State: AOAM530iNBqpWc0LpfPnmjpkz24bFgb7L4ATbXElnqG5WOgUKasNoiUO OgvOxwty7GebUclxjSYBfpXw8w== X-Google-Smtp-Source: ABdhPJzw259othySLhLy7RggcO11QlDizMLjwIjmeo/ASWp80QmrYaKNi/O++Se0nG6Wx35SN2iAwg== X-Received: by 2002:a05:6402:6da:b0:3fd:cacb:f4b2 with SMTP id n26-20020a05640206da00b003fdcacbf4b2mr22483918edy.332.1648843847292; Fri, 01 Apr 2022 13:10:47 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-201-27.adslplus.ch. [188.155.201.27]) by smtp.gmail.com with ESMTPSA id bx5-20020a0564020b4500b00418fca53406sm1509041edb.27.2022.04.01.13.10.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 13:10:46 -0700 (PDT) From: Krzysztof Kozlowski To: Bjorn Andersson , Andy Gross , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , Mathieu Poirier , Kathiravan T , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 04/10] ARM: dts: qcom: msm8974-lge-nexus5: move gpio-keys out of soc Date: Fri, 1 Apr 2022 22:10:29 +0200 Message-Id: <20220401201035.189106-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> References: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The GPIO keys are not part of SoC and they should be defined inside of the root node. Signed-off-by: Krzysztof Kozlowski --- .../qcom-msm8974-lge-nexus5-hammerhead.dts | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/arc= h/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts index 069136170198..6d5fb60e798f 100644 --- a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts +++ b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts @@ -19,6 +19,27 @@ chosen { stdout-path =3D "serial0:115200n8"; }; =20 + gpio-keys { + compatible =3D "gpio-keys"; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&gpio_keys_pin_a>; + + volume-up { + label =3D "volume_up"; + gpios =3D <&pm8941_gpios 2 GPIO_ACTIVE_LOW>; + linux,input-type =3D <1>; + linux,code =3D ; + }; + + volume-down { + label =3D "volume_down"; + gpios =3D <&pm8941_gpios 3 GPIO_ACTIVE_LOW>; + linux,input-type =3D <1>; + linux,code =3D ; + }; + }; + smd { rpm { rpm_requests { @@ -448,27 +469,6 @@ bcrmf@1 { }; }; =20 - gpio-keys { - compatible =3D "gpio-keys"; - - pinctrl-names =3D "default"; - pinctrl-0 =3D <&gpio_keys_pin_a>; - - volume-up { - label =3D "volume_up"; - gpios =3D <&pm8941_gpios 2 GPIO_ACTIVE_LOW>; - linux,input-type =3D <1>; - linux,code =3D ; - }; - - volume-down { - label =3D "volume_down"; - gpios =3D <&pm8941_gpios 3 GPIO_ACTIVE_LOW>; - linux,input-type =3D <1>; - linux,code =3D ; - }; - }; - serial@f9960000 { status =3D "okay"; =20 --=20 2.32.0 From nobody Fri Jun 19 16:08:04 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6803C4332F for ; Fri, 1 Apr 2022 20:11:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351778AbiDAUMx (ORCPT ); Fri, 1 Apr 2022 16:12:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351735AbiDAUMk (ORCPT ); Fri, 1 Apr 2022 16:12:40 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C72521C064 for ; Fri, 1 Apr 2022 13:10:50 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id lr4so8048422ejb.11 for ; Fri, 01 Apr 2022 13:10:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9KUw4q+j+PkM/aYrJwy81EirlGgfz0uvY4K3Ls2IZB0=; b=BpFwrRepLyui6gXaecZa3WVCkf/wzwdD1YlV8iGfLjjORT55EyQWplOvSvoLViR8xI uAAHTh1eccIdfJi7b73lfcDaXLAGRXGRqYJJFXPZrcfm7BDp9wY6GKrL4BC8GlL0Hzy2 wg5ztOn6Ar8uQQkgJGZfDgxCgmAWm1WHxCHqxkZ0u9ycwDWInZdp8OKItOsK2MIRsn1E CT0+wLRWJPNxnQ9VlGYTs4ZFj6WsRo+q0Kg8/OdIsvQcdoKPd5cGQFOm4rdrj/3iJVXT ER7/hvLmRk/KlVU1ZIu3d0cie2kELof6Kav2Z0HSBwaJpkpqO4YEC1zxW3qbSye38t1T ka8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9KUw4q+j+PkM/aYrJwy81EirlGgfz0uvY4K3Ls2IZB0=; b=jQLJ/jS5HpzEEus6kFG7kA+NKv8KgfTzPGypifUovx9QXaKq5UWnmNzz/xf6kTsmfD VEvhdCLggQqIXaiZ2X3WwoZgAR4zmdpwixghhti9bPZqIRZIHUklFpyr6omdMPne9wkC 9xxoo5Y5lgLHMNF3QsAxDLNXejS/4wK+KYb7f4PKXyewvMqPV0um4uLPO1FuVnTqAqQQ eI0CRZfWvj6ZFB35ckd6lV5qWNVXzfN6ooUrW46imqu+vyLdAZxlPGSis/RUXkjfIXc3 52biLQwf4Fkz4LwSnAVt9v2rnLj+nHYUB2u4pBDyndeiiKd/XZ3kX0XMfChGpPskdMJy Xcaw== X-Gm-Message-State: AOAM531fFdsjWnJWEJ9ITKooLH3s3/RNeAVQ/9g1SJxN0OrkhX3L9/9O GyBVFzU/6qJ8iIFmUB1pl09ZJw== X-Google-Smtp-Source: ABdhPJxlK455fS4hKBklASLqBLdG2YFxVh3hWggdL4wwu9rjt+VAJTGViomKGuj5Q3ubvKQ4HPoO8g== X-Received: by 2002:a17:907:6d0a:b0:6db:f0f8:6528 with SMTP id sa10-20020a1709076d0a00b006dbf0f86528mr1272712ejc.466.1648843848774; Fri, 01 Apr 2022 13:10:48 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-201-27.adslplus.ch. [188.155.201.27]) by smtp.gmail.com with ESMTPSA id bx5-20020a0564020b4500b00418fca53406sm1509041edb.27.2022.04.01.13.10.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 13:10:48 -0700 (PDT) From: Krzysztof Kozlowski To: Bjorn Andersson , Andy Gross , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , Mathieu Poirier , Kathiravan T , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 05/10] ARM: dts: qcom: msm8974-samsung-klte: move gpio-keys out of soc Date: Fri, 1 Apr 2022 22:10:30 +0200 Message-Id: <20220401201035.189106-6-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> References: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The GPIO keys are not part of SoC and they should be defined inside of the root node. Signed-off-by: Krzysztof Kozlowski --- .../boot/dts/qcom-msm8974-samsung-klte.dts | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts b/arch/arm/boo= t/dts/qcom-msm8974-samsung-klte.dts index 96e1c978b878..6e036a440532 100644 --- a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts @@ -20,6 +20,38 @@ chosen { stdout-path =3D "serial0:115200n8"; }; =20 + gpio-keys { + compatible =3D "gpio-keys"; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&gpio_keys_pin_a>; + + volume-down { + label =3D "volume_down"; + gpios =3D <&pma8084_gpios 2 GPIO_ACTIVE_LOW>; + linux,input-type =3D <1>; + linux,code =3D ; + debounce-interval =3D <15>; + }; + + home-key { + label =3D "home_key"; + gpios =3D <&pma8084_gpios 3 GPIO_ACTIVE_LOW>; + linux,input-type =3D <1>; + linux,code =3D ; + wakeup-source; + debounce-interval =3D <15>; + }; + + volume-up { + label =3D "volume_up"; + gpios =3D <&pma8084_gpios 5 GPIO_ACTIVE_LOW>; + linux,input-type =3D <1>; + linux,code =3D ; + debounce-interval =3D <15>; + }; + }; + smd { rpm { rpm_requests { @@ -347,38 +379,6 @@ bluetooth { }; }; =20 - gpio-keys { - compatible =3D "gpio-keys"; - - pinctrl-names =3D "default"; - pinctrl-0 =3D <&gpio_keys_pin_a>; - - volume-down { - label =3D "volume_down"; - gpios =3D <&pma8084_gpios 2 GPIO_ACTIVE_LOW>; - linux,input-type =3D <1>; - linux,code =3D ; - debounce-interval =3D <15>; - }; - - home-key { - label =3D "home_key"; - gpios =3D <&pma8084_gpios 3 GPIO_ACTIVE_LOW>; - linux,input-type =3D <1>; - linux,code =3D ; - wakeup-source; - debounce-interval =3D <15>; - }; - - volume-up { - label =3D "volume_up"; - gpios =3D <&pma8084_gpios 5 GPIO_ACTIVE_LOW>; - linux,input-type =3D <1>; - linux,code =3D ; - debounce-interval =3D <15>; - }; - }; - pinctrl@fd510000 { blsp2_uart8_pins_active: blsp2-uart8-pins-active { pins =3D "gpio45", "gpio46", "gpio47", "gpio48"; --=20 2.32.0 From nobody Fri Jun 19 16:08:04 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15A40C433F5 for ; Fri, 1 Apr 2022 20:11:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351799AbiDAUM5 (ORCPT ); Fri, 1 Apr 2022 16:12:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351712AbiDAUMq (ORCPT ); Fri, 1 Apr 2022 16:12:46 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10E9F21C074 for ; Fri, 1 Apr 2022 13:10:53 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id k23so4657919ejd.3 for ; Fri, 01 Apr 2022 13:10:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aUOVTelyybMbf5KREcp+WAToMZfPKCMger9ffEIgN3w=; b=Z+qOH/vJ/5x+18peisUe/O109HWwVCqO0jSz6iYYSjh3IAL/YlNV3fGNYWc/3/4GLE 3LNAsFzCTZcCodP3XNIrB5IUdWiuw6QGGY1xim1Hr7QsCAuAeZKFmcC7wN4h1IasB8cy kfcyrx6aRBv0vddp/NBubj1bH/BS3P1za5M2g2NwncNzmE1wqBrFGVBaFGTBNl+Kt8qd dz/ajAZZm/6Dv+MVPQma2xGhXH/XBF1BWbZPBg8pRn1yhqCxQI/PEIuB6oNyirGqtcd+ P0ydsw/kW8KRebU9IwuVZM2iK9tISYWqvA+F15WCfxM8cJoag6Z7q3MkdapDJ7DvXO1b IzPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aUOVTelyybMbf5KREcp+WAToMZfPKCMger9ffEIgN3w=; b=oAC7qIro0U2/W5bN50CmJ84mV1pw/3FTCmYgRJ5ninc10cEykTzeTXBsk0vFxtgFMb GJ7A4iWs7qRLdh9TGk5b5mlwSoNau0gG92aFuCYics0BTjwSWQ01ah6/pH3Mo8zOg3Mh Q4I9OsDeZGxs6s5nroPUTcBjdZaXyQ5VVOj8t7p3QY+XmAlL5tln+vYg+YMTnH4nE0J8 7t9bq/Qv4NcVMP7uCmEJ5aFjMpDkPmVxRV06weAiH3QSLJtqureml6Eepw8WmfN8RADE twE5QBpmeRKLPcaZ8bJqs2v5JI7eE3M/r+rfdgZGzHV+Awt0587LAL6+Nh2woQXchsmv DnfA== X-Gm-Message-State: AOAM532BZQk+HNZZWb9Z/rbp2Mv/HpgkutnRre44jWh5zALY1WOJ+hAC cWl6+2ps6Bc3gcB6n4uakPTb4w== X-Google-Smtp-Source: ABdhPJxd+xQdXWK9Nhphj6GuURL9a9z4/opWshsIHpZlIcl/V8QfpwcFDqH5lvRVVOJoK69Te6HroQ== X-Received: by 2002:a17:906:d554:b0:6df:c373:9e5f with SMTP id cr20-20020a170906d55400b006dfc3739e5fmr1173864ejc.645.1648843850275; Fri, 01 Apr 2022 13:10:50 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-201-27.adslplus.ch. [188.155.201.27]) by smtp.gmail.com with ESMTPSA id bx5-20020a0564020b4500b00418fca53406sm1509041edb.27.2022.04.01.13.10.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 13:10:49 -0700 (PDT) From: Krzysztof Kozlowski To: Bjorn Andersson , Andy Gross , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , Mathieu Poirier , Kathiravan T , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 06/10] ARM: dts: qcom: msm8974: override nodes by label Date: Fri, 1 Apr 2022 22:10:31 +0200 Message-Id: <20220401201035.189106-7-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> References: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Using node paths to extend or override a device tree node is error prone. If there was a typo error, a new node will be created instead of extending the existing node. This will lead to run-time errors that could be hard to detect. A mistyped label on the other hand, will cause a dtc compile error (during build time). This also reduces the indentation making the code easier to read. Re-order the overrides by label name. The pre/post DTBS are the same. Signed-off-by: Krzysztof Kozlowski --- .../arm/boot/dts/qcom-apq8074-dragonboard.dts | 614 +++++----- .../boot/dts/qcom-msm8974-fairphone-fp2.dts | 581 +++++---- .../qcom-msm8974-lge-nexus5-hammerhead.dts | 1075 ++++++++-------- .../boot/dts/qcom-msm8974-samsung-klte.dts | 1083 ++++++++--------- .../dts/qcom-msm8974-sony-xperia-amami.dts | 569 +++++---- .../dts/qcom-msm8974-sony-xperia-castor.dts | 908 +++++++------- .../dts/qcom-msm8974-sony-xperia-honami.dts | 636 +++++----- arch/arm/boot/dts/qcom-msm8974.dtsi | 16 +- 8 files changed, 2730 insertions(+), 2752 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/arch/arm/boot= /dts/qcom-apq8074-dragonboard.dts index 83793b835d40..4c510701ff83 100644 --- a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts +++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts @@ -17,330 +17,324 @@ chosen { stdout-path =3D "serial0:115200n8"; }; =20 - soc { - serial@f991e000 { - status =3D "okay"; +}; + +&blsp_i2c11 { + status =3D "okay"; + clock-frequency =3D <200000>; + pinctrl-0 =3D <&i2c11_pins>; + pinctrl-names =3D "default"; + + eeprom: eeprom@52 { + compatible =3D "atmel,24c128"; + reg =3D <0x52>; + pagesize =3D <32>; + read-only; + }; +}; + +&blsp1_uart2 { + status =3D "okay"; +}; + +&msmgpio { + i2c11_pins: i2c11 { + mux { + pins =3D "gpio83", "gpio84"; + function =3D "blsp_i2c11"; }; + }; =20 - sdhci@f9824900 { - bus-width =3D <8>; - non-removable; - status =3D "okay"; + spi8_default: spi8_default { + mosi { + pins =3D "gpio45"; + function =3D "blsp_spi8"; + }; + miso { + pins =3D "gpio46"; + function =3D "blsp_spi8"; + }; + cs { + pins =3D "gpio47"; + function =3D "blsp_spi8"; + }; + clk { + pins =3D "gpio48"; + function =3D "blsp_spi8"; + }; + }; =20 - vmmc-supply =3D <&pm8941_l20>; - vqmmc-supply =3D <&pm8941_s3>; + sdhc1_pin_a: sdhc1-pin-active { + clk { + pins =3D "sdc1_clk"; + drive-strength =3D <16>; + bias-disable; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc1_pin_a>; + cmd-data { + pins =3D "sdc1_cmd", "sdc1_data"; + drive-strength =3D <10>; + bias-pull-up; }; + }; =20 - sdhci@f98a4900 { - cd-gpios =3D <&msmgpio 62 0x1>; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>; - bus-width =3D <4>; - status =3D "okay"; + sdhc2_cd_pin_a: sdhc2-cd-pin-active { + pins =3D "gpio62"; + function =3D "gpio"; + + drive-strength =3D <2>; + bias-disable; + }; =20 - vmmc-supply =3D <&pm8941_l21>; - vqmmc-supply =3D <&pm8941_l13>; + sdhc2_pin_a: sdhc2-pin-active { + clk { + pins =3D "sdc2_clk"; + drive-strength =3D <10>; + bias-disable; }; =20 - usb@f9a55000 { - status =3D "okay"; - phys =3D <&usb_hs2_phy>; - phy-select =3D <&tcsr 0xb000 1>; - extcon =3D <&smbb>, <&usb_id>; - vbus-supply =3D <&chg_otg>; - hnp-disable; - srp-disable; - adp-disable; - ulpi { - phy@b { - status =3D "okay"; - v3p3-supply =3D <&pm8941_l24>; - v1p8-supply =3D <&pm8941_l6>; - extcon =3D <&smbb>; - qcom,init-seq =3D /bits/ 8 <0x1 0x63>; - }; - }; - }; - - - pinctrl@fd510000 { - i2c11_pins: i2c11 { - mux { - pins =3D "gpio83", "gpio84"; - function =3D "blsp_i2c11"; - }; - }; - - spi8_default: spi8_default { - mosi { - pins =3D "gpio45"; - function =3D "blsp_spi8"; - }; - miso { - pins =3D "gpio46"; - function =3D "blsp_spi8"; - }; - cs { - pins =3D "gpio47"; - function =3D "blsp_spi8"; - }; - clk { - pins =3D "gpio48"; - function =3D "blsp_spi8"; - }; - }; - - sdhc1_pin_a: sdhc1-pin-active { - clk { - pins =3D "sdc1_clk"; - drive-strength =3D <16>; - bias-disable; - }; - - cmd-data { - pins =3D "sdc1_cmd", "sdc1_data"; - drive-strength =3D <10>; - bias-pull-up; - }; - }; - - sdhc2_cd_pin_a: sdhc2-cd-pin-active { - pins =3D "gpio62"; - function =3D "gpio"; - - drive-strength =3D <2>; - bias-disable; - }; - - sdhc2_pin_a: sdhc2-pin-active { - clk { - pins =3D "sdc2_clk"; - drive-strength =3D <10>; - bias-disable; - }; - - cmd-data { - pins =3D "sdc2_cmd", "sdc2_data"; - drive-strength =3D <6>; - bias-pull-up; - }; - }; - }; - - i2c@f9967000 { + cmd-data { + pins =3D "sdc2_cmd", "sdc2_data"; + drive-strength =3D <6>; + bias-pull-up; + }; + }; +}; + +&otg { + status =3D "okay"; + phys =3D <&usb_hs2_phy>; + phy-select =3D <&tcsr 0xb000 1>; + extcon =3D <&smbb>, <&usb_id>; + vbus-supply =3D <&chg_otg>; + hnp-disable; + srp-disable; + adp-disable; + ulpi { + phy@b { status =3D "okay"; - clock-frequency =3D <200000>; - pinctrl-0 =3D <&i2c11_pins>; - pinctrl-names =3D "default"; + v3p3-supply =3D <&pm8941_l24>; + v1p8-supply =3D <&pm8941_l6>; + extcon =3D <&smbb>; + qcom,init-seq =3D /bits/ 8 <0x1 0x63>; + }; + }; +}; + +&rpm_requests { + pm8841-regulators { + s1 { + regulator-min-microvolt =3D <675000>; + regulator-max-microvolt =3D <1050000>; + }; =20 - eeprom: eeprom@52 { - compatible =3D "atmel,24c128"; - reg =3D <0x52>; - pagesize =3D <32>; - read-only; - }; + s2 { + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1050000>; + }; + + s3 { + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1050000>; + }; + + s4 { + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1050000>; }; }; =20 - smd { - rpm { - rpm_requests { - pm8841-regulators { - s1 { - regulator-min-microvolt =3D <675000>; - regulator-max-microvolt =3D <1050000>; - }; - - s2 { - regulator-min-microvolt =3D <500000>; - regulator-max-microvolt =3D <1050000>; - }; - - s3 { - regulator-min-microvolt =3D <500000>; - regulator-max-microvolt =3D <1050000>; - }; - - s4 { - regulator-min-microvolt =3D <500000>; - regulator-max-microvolt =3D <1050000>; - }; - }; - - pm8941-regulators { - vdd_l1_l3-supply =3D <&pm8941_s1>; - vdd_l2_lvs1_2_3-supply =3D <&pm8941_s3>; - vdd_l4_l11-supply =3D <&pm8941_s1>; - vdd_l5_l7-supply =3D <&pm8941_s2>; - vdd_l6_l12_l14_l15-supply =3D <&pm8941_s2>; - vin_5vs-supply =3D <&pm8941_5v>; - - s1 { - regulator-min-microvolt =3D <1300000>; - regulator-max-microvolt =3D <1300000>; - regulator-always-on; - regulator-boot-on; - }; - - s2 { - regulator-min-microvolt =3D <2150000>; - regulator-max-microvolt =3D <2150000>; - regulator-boot-on; - }; - - s3 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - regulator-always-on; - regulator-boot-on; - }; - - l1 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - - regulator-always-on; - regulator-boot-on; - }; - - l2 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - }; - - l3 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - }; - - l4 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - }; - - l5 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l6 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-boot-on; - }; - - l7 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-boot-on; - }; - - l8 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l9 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - }; - - l10 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - regulator-always-on; - }; - - l11 { - regulator-min-microvolt =3D <1300000>; - regulator-max-microvolt =3D <1300000>; - }; - - l12 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-always-on; - regulator-boot-on; - }; - - l13 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - - regulator-boot-on; - }; - - l14 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l15 { - regulator-min-microvolt =3D <2050000>; - regulator-max-microvolt =3D <2050000>; - }; - - l16 { - regulator-min-microvolt =3D <2700000>; - regulator-max-microvolt =3D <2700000>; - }; - - l17 { - regulator-min-microvolt =3D <2700000>; - regulator-max-microvolt =3D <2700000>; - }; - - l18 { - regulator-min-microvolt =3D <2850000>; - regulator-max-microvolt =3D <2850000>; - }; - - l19 { - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - regulator-always-on; - }; - - l20 { - regulator-min-microvolt =3D <2950000>; - regulator-max-microvolt =3D <2950000>; - - regulator-allow-set-load; - regulator-boot-on; - regulator-system-load =3D <200000>; - }; - - l21 { - regulator-min-microvolt =3D <2950000>; - regulator-max-microvolt =3D <2950000>; - - regulator-boot-on; - }; - - l22 { - regulator-min-microvolt =3D <3000000>; - regulator-max-microvolt =3D <3000000>; - }; - - l23 { - regulator-min-microvolt =3D <3000000>; - regulator-max-microvolt =3D <3000000>; - }; - - l24 { - regulator-min-microvolt =3D <3075000>; - regulator-max-microvolt =3D <3075000>; - - regulator-boot-on; - }; - }; - }; + pm8941-regulators { + vdd_l1_l3-supply =3D <&pm8941_s1>; + vdd_l2_lvs1_2_3-supply =3D <&pm8941_s3>; + vdd_l4_l11-supply =3D <&pm8941_s1>; + vdd_l5_l7-supply =3D <&pm8941_s2>; + vdd_l6_l12_l14_l15-supply =3D <&pm8941_s2>; + vin_5vs-supply =3D <&pm8941_5v>; + + s1 { + regulator-min-microvolt =3D <1300000>; + regulator-max-microvolt =3D <1300000>; + regulator-always-on; + regulator-boot-on; + }; + + s2 { + regulator-min-microvolt =3D <2150000>; + regulator-max-microvolt =3D <2150000>; + regulator-boot-on; + }; + + s3 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + regulator-always-on; + regulator-boot-on; + }; + + l1 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; + + regulator-always-on; + regulator-boot-on; + }; + + l2 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; + }; + + l3 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; + }; + + l4 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; + }; + + l5 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; + + l6 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + + regulator-boot-on; + }; + + l7 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + + regulator-boot-on; + }; + + l8 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; + + l9 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; + }; + + l10 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + regulator-always-on; + }; + + l11 { + regulator-min-microvolt =3D <1300000>; + regulator-max-microvolt =3D <1300000>; + }; + + l12 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + + regulator-always-on; + regulator-boot-on; + }; + + l13 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; + + regulator-boot-on; + }; + + l14 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; + + l15 { + regulator-min-microvolt =3D <2050000>; + regulator-max-microvolt =3D <2050000>; + }; + + l16 { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <2700000>; + }; + + l17 { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <2700000>; + }; + + l18 { + regulator-min-microvolt =3D <2850000>; + regulator-max-microvolt =3D <2850000>; + }; + + l19 { + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + regulator-always-on; + }; + + l20 { + regulator-min-microvolt =3D <2950000>; + regulator-max-microvolt =3D <2950000>; + + regulator-allow-set-load; + regulator-boot-on; + regulator-system-load =3D <200000>; + }; + + l21 { + regulator-min-microvolt =3D <2950000>; + regulator-max-microvolt =3D <2950000>; + + regulator-boot-on; + }; + + l22 { + regulator-min-microvolt =3D <3000000>; + regulator-max-microvolt =3D <3000000>; + }; + + l23 { + regulator-min-microvolt =3D <3000000>; + regulator-max-microvolt =3D <3000000>; + }; + + l24 { + regulator-min-microvolt =3D <3075000>; + regulator-max-microvolt =3D <3075000>; + + regulator-boot-on; }; }; }; + +&sdhci1 { + bus-width =3D <8>; + non-removable; + status =3D "okay"; + + vmmc-supply =3D <&pm8941_l20>; + vqmmc-supply =3D <&pm8941_s3>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc1_pin_a>; +}; + +&sdhci3 { + cd-gpios =3D <&msmgpio 62 0x1>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>; + bus-width =3D <4>; + status =3D "okay"; + + vmmc-supply =3D <&pm8941_l21>; + vqmmc-supply =3D <&pm8941_l13>; +}; diff --git a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts b/arch/arm/bo= ot/dts/qcom-msm8974-fairphone-fp2.dts index 6d77e0f8ca4d..f72a53a0e962 100644 --- a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts +++ b/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts @@ -55,345 +55,340 @@ vibrator { vcc-supply =3D <&pm8941_l18>; }; =20 - smd { - rpm { - rpm_requests { - pm8841-regulators { - s1 { - regulator-min-microvolt =3D <675000>; - regulator-max-microvolt =3D <1050000>; - }; - - s2 { - regulator-min-microvolt =3D <500000>; - regulator-max-microvolt =3D <1050000>; - }; - - s3 { - regulator-min-microvolt =3D <1050000>; - regulator-max-microvolt =3D <1050000>; - }; - }; - - pm8941-regulators { - vdd_l1_l3-supply =3D <&pm8941_s1>; - vdd_l2_lvs1_2_3-supply =3D <&pm8941_s3>; - vdd_l4_l11-supply =3D <&pm8941_s1>; - vdd_l5_l7-supply =3D <&pm8941_s2>; - vdd_l6_l12_l14_l15-supply =3D <&pm8941_s2>; - vdd_l9_l10_l17_l22-supply =3D <&vreg_boost>; - vdd_l13_l20_l23_l24-supply =3D <&vreg_boost>; - vdd_l21-supply =3D <&vreg_boost>; - - s1 { - regulator-min-microvolt =3D <1300000>; - regulator-max-microvolt =3D <1300000>; - - regulator-always-on; - regulator-boot-on; - }; - - s2 { - regulator-min-microvolt =3D <2150000>; - regulator-max-microvolt =3D <2150000>; - - regulator-boot-on; - }; - - s3 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-always-on; - regulator-boot-on; - }; - - l1 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - - regulator-always-on; - regulator-boot-on; - }; - - l2 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - }; - - l3 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - }; - - l4 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - }; - - l5 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l6 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-boot-on; - }; - - l7 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-boot-on; - }; - - l8 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l9 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - }; - - l10 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - }; - - l11 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1350000>; - }; - - l12 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-always-on; - regulator-boot-on; - }; - - l13 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - - regulator-boot-on; - }; - - l14 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l15 { - regulator-min-microvolt =3D <2050000>; - regulator-max-microvolt =3D <2050000>; - }; - - l16 { - regulator-min-microvolt =3D <2700000>; - regulator-max-microvolt =3D <2700000>; - }; - - l17 { - regulator-min-microvolt =3D <2850000>; - regulator-max-microvolt =3D <2850000>; - }; - - l18 { - regulator-min-microvolt =3D <2850000>; - regulator-max-microvolt =3D <2850000>; - }; - - l19 { - regulator-min-microvolt =3D <2900000>; - regulator-max-microvolt =3D <3350000>; - }; - - l20 { - regulator-min-microvolt =3D <2950000>; - regulator-max-microvolt =3D <2950000>; - - regulator-boot-on; - regulator-system-load =3D <200000>; - regulator-allow-set-load; - }; - - l21 { - regulator-min-microvolt =3D <2950000>; - regulator-max-microvolt =3D <2950000>; - - regulator-boot-on; - }; - - l22 { - regulator-min-microvolt =3D <3000000>; - regulator-max-microvolt =3D <3300000>; - }; - - l23 { - regulator-min-microvolt =3D <3000000>; - regulator-max-microvolt =3D <3000000>; - }; - - l24 { - regulator-min-microvolt =3D <3075000>; - regulator-max-microvolt =3D <3075000>; - - regulator-boot-on; - }; - }; - }; +}; + +&blsp1_uart2 { + status =3D "okay"; +}; + +&imem { + status =3D "okay"; + + reboot-mode { + mode-normal =3D <0x77665501>; + mode-bootloader =3D <0x77665500>; + mode-recovery =3D <0x77665502>; + }; +}; + +&msmgpio { + sdhc1_pin_a: sdhc1-pin-active { + clk { + pins =3D "sdc1_clk"; + drive-strength =3D <16>; + bias-disable; + }; + + cmd-data { + pins =3D "sdc1_cmd", "sdc1_data"; + drive-strength =3D <10>; + bias-pull-up; + }; + }; + + sdhc2_pin_a: sdhc2-pin-active { + clk { + pins =3D "sdc2_clk"; + drive-strength =3D <10>; + bias-disable; + }; + + cmd-data { + pins =3D "sdc2_cmd", "sdc2_data"; + drive-strength =3D <6>; + bias-pull-up; + }; + }; + + wcnss_pin_a: wcnss-pin-active { + wlan { + pins =3D "gpio36", "gpio37", "gpio38", "gpio39", "gpio40"; + function =3D "wlan"; + + drive-strength =3D <6>; + bias-pull-down; + }; + + bt { + pins =3D "gpio35", "gpio43", "gpio44"; + function =3D "bt"; + + drive-strength =3D <2>; + bias-pull-down; + }; + + fm { + pins =3D "gpio41", "gpio42"; + function =3D "fm"; + + drive-strength =3D <2>; + bias-pull-down; }; }; }; =20 -&soc { - serial@f991e000 { - status =3D "okay"; +&otg { + status =3D "okay"; + + phys =3D <&usb_hs1_phy>; + phy-select =3D <&tcsr 0xb000 0>; + extcon =3D <&smbb>, <&usb_id>; + vbus-supply =3D <&chg_otg>; + + hnp-disable; + srp-disable; + adp-disable; + + ulpi { + phy@a { + status =3D "okay"; + + v1p8-supply =3D <&pm8941_l6>; + v3p3-supply =3D <&pm8941_l24>; + + extcon =3D <&smbb>; + qcom,init-seq =3D /bits/ 8 <0x1 0x64>; + }; }; +}; =20 - remoteproc@fb21b000 { - status =3D "okay"; +&pronto { + status =3D "okay"; =20 - vddmx-supply =3D <&pm8841_s1>; - vddcx-supply =3D <&pm8841_s2>; + vddmx-supply =3D <&pm8841_s1>; + vddcx-supply =3D <&pm8841_s2>; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&wcnss_pin_a>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&wcnss_pin_a>; =20 - smd-edge { - qcom,remote-pid =3D <4>; - label =3D "pronto"; + smd-edge { + qcom,remote-pid =3D <4>; + label =3D "pronto"; =20 - wcnss { - status =3D "okay"; - }; + wcnss { + status =3D "okay"; }; }; +}; =20 - pinctrl@fd510000 { - sdhc1_pin_a: sdhc1-pin-active { - clk { - pins =3D "sdc1_clk"; - drive-strength =3D <16>; - bias-disable; - }; +&rpm_requests { + pm8841-regulators { + s1 { + regulator-min-microvolt =3D <675000>; + regulator-max-microvolt =3D <1050000>; + }; =20 - cmd-data { - pins =3D "sdc1_cmd", "sdc1_data"; - drive-strength =3D <10>; - bias-pull-up; - }; + s2 { + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1050000>; }; =20 - sdhc2_pin_a: sdhc2-pin-active { - clk { - pins =3D "sdc2_clk"; - drive-strength =3D <10>; - bias-disable; - }; + s3 { + regulator-min-microvolt =3D <1050000>; + regulator-max-microvolt =3D <1050000>; + }; + }; =20 - cmd-data { - pins =3D "sdc2_cmd", "sdc2_data"; - drive-strength =3D <6>; - bias-pull-up; - }; + pm8941-regulators { + vdd_l1_l3-supply =3D <&pm8941_s1>; + vdd_l2_lvs1_2_3-supply =3D <&pm8941_s3>; + vdd_l4_l11-supply =3D <&pm8941_s1>; + vdd_l5_l7-supply =3D <&pm8941_s2>; + vdd_l6_l12_l14_l15-supply =3D <&pm8941_s2>; + vdd_l9_l10_l17_l22-supply =3D <&vreg_boost>; + vdd_l13_l20_l23_l24-supply =3D <&vreg_boost>; + vdd_l21-supply =3D <&vreg_boost>; + + s1 { + regulator-min-microvolt =3D <1300000>; + regulator-max-microvolt =3D <1300000>; + + regulator-always-on; + regulator-boot-on; }; =20 - wcnss_pin_a: wcnss-pin-active { - wlan { - pins =3D "gpio36", "gpio37", "gpio38", "gpio39", "gpio40"; - function =3D "wlan"; + s2 { + regulator-min-microvolt =3D <2150000>; + regulator-max-microvolt =3D <2150000>; =20 - drive-strength =3D <6>; - bias-pull-down; - }; + regulator-boot-on; + }; =20 - bt { - pins =3D "gpio35", "gpio43", "gpio44"; - function =3D "bt"; + s3 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; =20 - drive-strength =3D <2>; - bias-pull-down; - }; + regulator-always-on; + regulator-boot-on; + }; =20 - fm { - pins =3D "gpio41", "gpio42"; - function =3D "fm"; + l1 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; =20 - drive-strength =3D <2>; - bias-pull-down; - }; + regulator-always-on; + regulator-boot-on; }; - }; =20 - sdhci@f9824900 { - status =3D "okay"; + l2 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; + }; =20 - vmmc-supply =3D <&pm8941_l20>; - vqmmc-supply =3D <&pm8941_s3>; + l3 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; + }; =20 - bus-width =3D <8>; - non-removable; + l4 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc1_pin_a>; - }; + l5 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - sdhci@f98a4900 { - status =3D "okay"; + l6 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; =20 - vmmc-supply =3D <&pm8941_l21>; - vqmmc-supply =3D <&pm8941_l13>; + regulator-boot-on; + }; =20 - bus-width =3D <4>; + l7 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc2_pin_a>; - }; + regulator-boot-on; + }; + + l8 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; + + l9 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; + }; =20 - usb@f9a55000 { - status =3D "okay"; + l10 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; + }; =20 - phys =3D <&usb_hs1_phy>; - phy-select =3D <&tcsr 0xb000 0>; - extcon =3D <&smbb>, <&usb_id>; - vbus-supply =3D <&chg_otg>; + l11 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1350000>; + }; =20 - hnp-disable; - srp-disable; - adp-disable; + l12 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; =20 - ulpi { - phy@a { - status =3D "okay"; + regulator-always-on; + regulator-boot-on; + }; =20 - v1p8-supply =3D <&pm8941_l6>; - v3p3-supply =3D <&pm8941_l24>; + l13 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; =20 - extcon =3D <&smbb>; - qcom,init-seq =3D /bits/ 8 <0x1 0x64>; - }; + regulator-boot-on; }; - }; =20 - imem@fe805000 { - status =3D "okay"; + l14 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; + + l15 { + regulator-min-microvolt =3D <2050000>; + regulator-max-microvolt =3D <2050000>; + }; + + l16 { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <2700000>; + }; + + l17 { + regulator-min-microvolt =3D <2850000>; + regulator-max-microvolt =3D <2850000>; + }; =20 - reboot-mode { - mode-normal =3D <0x77665501>; - mode-bootloader =3D <0x77665500>; - mode-recovery =3D <0x77665502>; + l18 { + regulator-min-microvolt =3D <2850000>; + regulator-max-microvolt =3D <2850000>; + }; + + l19 { + regulator-min-microvolt =3D <2900000>; + regulator-max-microvolt =3D <3350000>; + }; + + l20 { + regulator-min-microvolt =3D <2950000>; + regulator-max-microvolt =3D <2950000>; + + regulator-boot-on; + regulator-system-load =3D <200000>; + regulator-allow-set-load; + }; + + l21 { + regulator-min-microvolt =3D <2950000>; + regulator-max-microvolt =3D <2950000>; + + regulator-boot-on; + }; + + l22 { + regulator-min-microvolt =3D <3000000>; + regulator-max-microvolt =3D <3300000>; + }; + + l23 { + regulator-min-microvolt =3D <3000000>; + regulator-max-microvolt =3D <3000000>; + }; + + l24 { + regulator-min-microvolt =3D <3075000>; + regulator-max-microvolt =3D <3075000>; + + regulator-boot-on; }; }; }; =20 +&sdhci1 { + status =3D "okay"; + + vmmc-supply =3D <&pm8941_l20>; + vqmmc-supply =3D <&pm8941_s3>; + + bus-width =3D <8>; + non-removable; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc1_pin_a>; +}; + +&sdhci3 { + status =3D "okay"; + + vmmc-supply =3D <&pm8941_l21>; + vqmmc-supply =3D <&pm8941_l13>; + + bus-width =3D <4>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc2_pin_a>; +}; + &spmi_bus { pm8941@0 { gpios@c000 { diff --git a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/arc= h/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts index 6d5fb60e798f..a72ef21b2fc7 100644 --- a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts +++ b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts @@ -40,209 +40,6 @@ volume-down { }; }; =20 - smd { - rpm { - rpm_requests { - pm8841-regulators { - s1 { - regulator-min-microvolt =3D <675000>; - regulator-max-microvolt =3D <1050000>; - }; - - s2 { - regulator-min-microvolt =3D <500000>; - regulator-max-microvolt =3D <1050000>; - }; - - s3 { - regulator-min-microvolt =3D <1050000>; - regulator-max-microvolt =3D <1050000>; - }; - - s4 { - regulator-min-microvolt =3D <815000>; - regulator-max-microvolt =3D <900000>; - }; - }; - - pm8941-regulators { - vdd_l1_l3-supply =3D <&pm8941_s1>; - vdd_l2_lvs1_2_3-supply =3D <&pm8941_s3>; - vdd_l4_l11-supply =3D <&pm8941_s1>; - vdd_l5_l7-supply =3D <&pm8941_s2>; - vdd_l6_l12_l14_l15-supply =3D <&pm8941_s2>; - vdd_l8_l16_l18_l19-supply =3D <&vreg_vph_pwr>; - vdd_l9_l10_l17_l22-supply =3D <&vreg_boost>; - vdd_l13_l20_l23_l24-supply =3D <&vreg_boost>; - vdd_l21-supply =3D <&vreg_boost>; - - s1 { - regulator-min-microvolt =3D <1300000>; - regulator-max-microvolt =3D <1300000>; - - regulator-always-on; - regulator-boot-on; - }; - - s2 { - regulator-min-microvolt =3D <2150000>; - regulator-max-microvolt =3D <2150000>; - - regulator-boot-on; - }; - - s3 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-always-on; - regulator-boot-on; - }; - - l1 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - - regulator-always-on; - regulator-boot-on; - }; - - l2 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - }; - - l3 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - }; - - l4 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - }; - - l5 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l6 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-boot-on; - }; - - l7 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-boot-on; - }; - - l8 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l9 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - }; - - l10 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - }; - - l11 { - regulator-min-microvolt =3D <1300000>; - regulator-max-microvolt =3D <1300000>; - }; - - l12 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-always-on; - regulator-boot-on; - }; - - l13 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - - regulator-boot-on; - }; - - l14 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l15 { - regulator-min-microvolt =3D <2050000>; - regulator-max-microvolt =3D <2050000>; - }; - - l16 { - regulator-min-microvolt =3D <2700000>; - regulator-max-microvolt =3D <2700000>; - }; - - l17 { - regulator-min-microvolt =3D <2850000>; - regulator-max-microvolt =3D <2850000>; - }; - - l18 { - regulator-min-microvolt =3D <2850000>; - regulator-max-microvolt =3D <2850000>; - }; - - l19 { - regulator-min-microvolt =3D <3000000>; - regulator-max-microvolt =3D <3300000>; - }; - - l20 { - regulator-min-microvolt =3D <2950000>; - regulator-max-microvolt =3D <2950000>; - - regulator-boot-on; - regulator-system-load =3D <200000>; - regulator-allow-set-load; - }; - - l21 { - regulator-min-microvolt =3D <2950000>; - regulator-max-microvolt =3D <2950000>; - - regulator-boot-on; - }; - - l22 { - regulator-min-microvolt =3D <3000000>; - regulator-max-microvolt =3D <3300000>; - }; - - l23 { - regulator-min-microvolt =3D <3000000>; - regulator-max-microvolt =3D <3000000>; - }; - - l24 { - regulator-min-microvolt =3D <3075000>; - regulator-max-microvolt =3D <3075000>; - - regulator-boot-on; - }; - }; - }; - }; - }; - vreg_wlan: wlan-regulator { compatible =3D "regulator-fixed"; =20 @@ -256,464 +53,682 @@ vreg_wlan: wlan-regulator { pinctrl-names =3D "default"; pinctrl-0 =3D <&wlan_regulator_pin>; }; + + gpio-keys { + compatible =3D "gpio-keys"; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&gpio_keys_pin_a>; + + volume-up { + label =3D "volume_up"; + gpios =3D <&pm8941_gpios 2 GPIO_ACTIVE_LOW>; + linux,input-type =3D <1>; + linux,code =3D ; + }; + + volume-down { + label =3D "volume_down"; + gpios =3D <&pm8941_gpios 3 GPIO_ACTIVE_LOW>; + linux,input-type =3D <1>; + linux,code =3D ; + }; + }; }; =20 -&soc { - serial@f991d000 { - status =3D "okay"; +&blsp1_uart1 { + status =3D "okay"; +}; + +&blsp2_uart10 { + status =3D "okay"; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&blsp2_uart10_pin_a>; + + bluetooth { + compatible =3D "brcm,bcm43438-bt"; + max-speed =3D <3000000>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&bt_pin>; + + host-wakeup-gpios =3D <&msmgpio 42 GPIO_ACTIVE_HIGH>; + device-wakeup-gpios =3D <&msmgpio 62 GPIO_ACTIVE_HIGH>; + shutdown-gpios =3D <&msmgpio 41 GPIO_ACTIVE_HIGH>; }; +}; =20 - pinctrl@fd510000 { - sdhc1_pin_a: sdhc1-pin-active { - clk { - pins =3D "sdc1_clk"; - drive-strength =3D <16>; - bias-disable; - }; +&blsp_i2c1 { + status =3D "okay"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c1_pins>; + clock-frequency =3D <100000>; + qcom,src-freq =3D <50000000>; =20 - cmd-data { - pins =3D "sdc1_cmd", "sdc1_data"; - drive-strength =3D <10>; - bias-pull-up; - }; + charger: bq24192@6b { + compatible =3D "ti,bq24192"; + reg =3D <0x6b>; + interrupts-extended =3D <&spmi_bus 0 0xd5 0 IRQ_TYPE_EDGE_FALLING>; + + omit-battery-class; + + usb_otg_vbus: usb-otg-vbus { }; + }; + + fuelgauge: max17048@36 { + compatible =3D "maxim,max17048"; + reg =3D <0x36>; + + maxim,double-soc; + maxim,rcomp =3D /bits/ 8 <0x4d>; + + interrupt-parent =3D <&msmgpio>; + interrupts =3D <9 IRQ_TYPE_LEVEL_LOW>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&fuelgauge_pin>; + + maxim,alert-low-soc-level =3D <2>; + }; +}; + +&blsp_i2c2 { + status =3D "okay"; + + clock-frequency =3D <355000>; + qcom,src-freq =3D <50000000>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c2_pins>; + + synaptics@70 { + compatible =3D "syna,rmi4-i2c"; + reg =3D <0x70>; + + interrupts-extended =3D <&msmgpio 5 IRQ_TYPE_EDGE_FALLING>; + vdd-supply =3D <&pm8941_l22>; + vio-supply =3D <&pm8941_lvs3>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&touch_pin>; + + #address-cells =3D <1>; + #size-cells =3D <0>; + + rmi4-f01@1 { + reg =3D <0x1>; + syna,nosleep-mode =3D <1>; }; =20 - sdhc2_pin_a: sdhc2-pin-active { - clk { - pins =3D "sdc2_clk"; - drive-strength =3D <6>; - bias-disable; + rmi4-f12@12 { + reg =3D <0x12>; + syna,sensor-type =3D <1>; + }; + }; +}; + +&blsp_i2c3 { + status =3D "okay"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c3_pins>; + clock-frequency =3D <100000>; + qcom,src-freq =3D <50000000>; + + avago_apds993@39 { + compatible =3D "avago,apds9930"; + reg =3D <0x39>; + interrupts-extended =3D <&msmgpio 61 IRQ_TYPE_EDGE_FALLING>; + vdd-supply =3D <&pm8941_l17>; + vddio-supply =3D <&pm8941_lvs1>; + led-max-microamp =3D <100000>; + amstaos,proximity-diodes =3D <0>; + }; +}; + +&blsp_i2c11 { + status =3D "okay"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c11_pins>; + clock-frequency =3D <355000>; + qcom,src-freq =3D <50000000>; + + led-controller@38 { + compatible =3D "ti,lm3630a"; + status =3D "okay"; + reg =3D <0x38>; + + #address-cells =3D <1>; + #size-cells =3D <0>; + + led@0 { + reg =3D <0>; + led-sources =3D <0 1>; + label =3D "lcd-backlight"; + default-brightness =3D <200>; + }; + }; +}; + +&blsp_i2c12 { + status =3D "okay"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c12_pins>; + clock-frequency =3D <100000>; + qcom,src-freq =3D <50000000>; + + mpu6515@68 { + compatible =3D "invensense,mpu6515"; + reg =3D <0x68>; + interrupts-extended =3D <&msmgpio 73 IRQ_TYPE_EDGE_FALLING>; + vddio-supply =3D <&pm8941_lvs1>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&mpu6515_pin>; + + mount-matrix =3D "0", "-1", "0", + "-1", "0", "0", + "0", "0", "1"; + + i2c-gate { + #address-cells =3D <1>; + #size-cells =3D <0>; + ak8963@f { + compatible =3D "asahi-kasei,ak8963"; + reg =3D <0x0f>; + gpios =3D <&msmgpio 67 0>; + vid-supply =3D <&pm8941_lvs1>; + vdd-supply =3D <&pm8941_l17>; }; =20 - cmd-data { - pins =3D "sdc2_cmd", "sdc2_data"; - drive-strength =3D <6>; - bias-pull-up; + bmp280@76 { + compatible =3D "bosch,bmp280"; + reg =3D <0x76>; + vdda-supply =3D <&pm8941_lvs1>; + vddd-supply =3D <&pm8941_l17>; }; }; + }; +}; =20 - i2c1_pins: i2c1 { - mux { - pins =3D "gpio2", "gpio3"; - function =3D "blsp_i2c1"; +&msmgpio { + sdhc1_pin_a: sdhc1-pin-active { + clk { + pins =3D "sdc1_clk"; + drive-strength =3D <16>; + bias-disable; + }; =20 - drive-strength =3D <2>; - bias-disable; - }; + cmd-data { + pins =3D "sdc1_cmd", "sdc1_data"; + drive-strength =3D <10>; + bias-pull-up; }; + }; =20 - i2c2_pins: i2c2 { - mux { - pins =3D "gpio6", "gpio7"; - function =3D "blsp_i2c2"; + sdhc2_pin_a: sdhc2-pin-active { + clk { + pins =3D "sdc2_clk"; + drive-strength =3D <6>; + bias-disable; + }; =20 - drive-strength =3D <2>; - bias-disable; - }; + cmd-data { + pins =3D "sdc2_cmd", "sdc2_data"; + drive-strength =3D <6>; + bias-pull-up; }; + }; =20 - i2c3_pins: i2c3 { - mux { - pins =3D "gpio10", "gpio11"; - function =3D "blsp_i2c3"; - drive-strength =3D <2>; - bias-disable; - }; + i2c1_pins: i2c1 { + mux { + pins =3D "gpio2", "gpio3"; + function =3D "blsp_i2c1"; + + drive-strength =3D <2>; + bias-disable; }; + }; =20 - i2c11_pins: i2c11 { - mux { - pins =3D "gpio83", "gpio84"; - function =3D "blsp_i2c11"; + i2c2_pins: i2c2 { + mux { + pins =3D "gpio6", "gpio7"; + function =3D "blsp_i2c2"; =20 - drive-strength =3D <2>; - bias-disable; - }; + drive-strength =3D <2>; + bias-disable; }; + }; =20 - i2c12_pins: i2c12 { - mux { - pins =3D "gpio87", "gpio88"; - function =3D "blsp_i2c12"; - drive-strength =3D <2>; - bias-disable; - }; + i2c3_pins: i2c3 { + mux { + pins =3D "gpio10", "gpio11"; + function =3D "blsp_i2c3"; + drive-strength =3D <2>; + bias-disable; }; + }; =20 - mpu6515_pin: mpu6515 { - irq { - pins =3D "gpio73"; - function =3D "gpio"; - bias-disable; - input-enable; - }; + i2c11_pins: i2c11 { + mux { + pins =3D "gpio83", "gpio84"; + function =3D "blsp_i2c11"; + + drive-strength =3D <2>; + bias-disable; }; + }; =20 - touch_pin: touch { - int { - pins =3D "gpio5"; - function =3D "gpio"; + i2c12_pins: i2c12 { + mux { + pins =3D "gpio87", "gpio88"; + function =3D "blsp_i2c12"; + drive-strength =3D <2>; + bias-disable; + }; + }; =20 - drive-strength =3D <2>; - bias-disable; - input-enable; - }; + mpu6515_pin: mpu6515 { + irq { + pins =3D "gpio73"; + function =3D "gpio"; + bias-disable; + input-enable; + }; + }; =20 - reset { - pins =3D "gpio8"; - function =3D "gpio"; + touch_pin: touch { + int { + pins =3D "gpio5"; + function =3D "gpio"; =20 - drive-strength =3D <2>; - bias-pull-up; - }; + drive-strength =3D <2>; + bias-disable; + input-enable; }; =20 - panel_pin: panel { - te { - pins =3D "gpio12"; - function =3D "mdp_vsync"; + reset { + pins =3D "gpio8"; + function =3D "gpio"; =20 - drive-strength =3D <2>; - bias-disable; - }; + drive-strength =3D <2>; + bias-pull-up; }; + }; =20 - bt_pin: bt { - hostwake { - pins =3D "gpio42"; - function =3D "gpio"; - }; + panel_pin: panel { + te { + pins =3D "gpio12"; + function =3D "mdp_vsync"; =20 - devwake { - pins =3D "gpio62"; - function =3D "gpio"; - }; + drive-strength =3D <2>; + bias-disable; + }; + }; =20 - shutdown { - pins =3D "gpio41"; - function =3D "gpio"; - }; + bt_pin: bt { + hostwake { + pins =3D "gpio42"; + function =3D "gpio"; }; =20 - blsp2_uart10_pin_a: blsp2-uart10-pin-active { - tx { - pins =3D "gpio53"; - function =3D "blsp_uart10"; + devwake { + pins =3D "gpio62"; + function =3D "gpio"; + }; =20 - drive-strength =3D <2>; - bias-disable; - }; + shutdown { + pins =3D "gpio41"; + function =3D "gpio"; + }; + }; =20 - rx { - pins =3D "gpio54"; - function =3D "blsp_uart10"; + blsp2_uart10_pin_a: blsp2-uart10-pin-active { + tx { + pins =3D "gpio53"; + function =3D "blsp_uart10"; =20 - drive-strength =3D <2>; - bias-pull-up; - }; + drive-strength =3D <2>; + bias-disable; + }; =20 - cts { - pins =3D "gpio55"; - function =3D "blsp_uart10"; + rx { + pins =3D "gpio54"; + function =3D "blsp_uart10"; =20 - drive-strength =3D <2>; - bias-pull-up; - }; + drive-strength =3D <2>; + bias-pull-up; + }; =20 - rts { - pins =3D "gpio56"; - function =3D "blsp_uart10"; + cts { + pins =3D "gpio55"; + function =3D "blsp_uart10"; =20 - drive-strength =3D <2>; - bias-disable; - }; + drive-strength =3D <2>; + bias-pull-up; }; - }; =20 - sdhci@f9824900 { - status =3D "okay"; + rts { + pins =3D "gpio56"; + function =3D "blsp_uart10"; =20 - vmmc-supply =3D <&pm8941_l20>; - vqmmc-supply =3D <&pm8941_s3>; + drive-strength =3D <2>; + bias-disable; + }; + }; +}; =20 - bus-width =3D <8>; - non-removable; +&mdss { + status =3D "okay"; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc1_pin_a>; + mdp@fd900000 { + status =3D "okay"; }; =20 - sdhci@f98a4900 { + dsi@fd922800 { status =3D "okay"; =20 - max-frequency =3D <100000000>; - bus-width =3D <4>; - non-removable; - vmmc-supply =3D <&vreg_wlan>; - vqmmc-supply =3D <&pm8941_s3>; - - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc2_pin_a>; + vdda-supply =3D <&pm8941_l2>; + vdd-supply =3D <&pm8941_lvs3>; + vddio-supply =3D <&pm8941_l12>; =20 #address-cells =3D <1>; #size-cells =3D <0>; =20 - bcrmf@1 { - compatible =3D "brcm,bcm4339-fmac", "brcm,bcm4329-fmac"; - reg =3D <1>; + ports { + port@1 { + endpoint { + remote-endpoint =3D <&panel_in>; + data-lanes =3D <0 1 2 3>; + }; + }; + }; =20 - brcm,drive-strength =3D <10>; + panel: panel@0 { + reg =3D <0>; + compatible =3D "lg,acx467akm-7"; =20 pinctrl-names =3D "default"; - pinctrl-0 =3D <&wlan_sleep_clk_pin>; + pinctrl-0 =3D <&panel_pin>; + + port { + panel_in: endpoint { + remote-endpoint =3D <&dsi0_out>; + }; + }; }; }; =20 - serial@f9960000 { + dsi-phy@fd922a00 { status =3D "okay"; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&blsp2_uart10_pin_a>; + vddio-supply =3D <&pm8941_l12>; + }; +}; =20 - bluetooth { - compatible =3D "brcm,bcm43438-bt"; - max-speed =3D <3000000>; +&otg { + status =3D "okay"; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&bt_pin>; + phys =3D <&usb_hs1_phy>; + phy-select =3D <&tcsr 0xb000 0>; =20 - host-wakeup-gpios =3D <&msmgpio 42 GPIO_ACTIVE_HIGH>; - device-wakeup-gpios =3D <&msmgpio 62 GPIO_ACTIVE_HIGH>; - shutdown-gpios =3D <&msmgpio 41 GPIO_ACTIVE_HIGH>; - }; - }; + extcon =3D <&charger>, <&usb_id>; + vbus-supply =3D <&usb_otg_vbus>; =20 - i2c@f9967000 { - status =3D "okay"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&i2c11_pins>; - clock-frequency =3D <355000>; - qcom,src-freq =3D <50000000>; + hnp-disable; + srp-disable; + adp-disable; =20 - led-controller@38 { - compatible =3D "ti,lm3630a"; + ulpi { + phy@a { status =3D "okay"; - reg =3D <0x38>; =20 - #address-cells =3D <1>; - #size-cells =3D <0>; + v1p8-supply =3D <&pm8941_l6>; + v3p3-supply =3D <&pm8941_l24>; =20 - led@0 { - reg =3D <0>; - led-sources =3D <0 1>; - label =3D "lcd-backlight"; - default-brightness =3D <200>; - }; + qcom,init-seq =3D /bits/ 8 <0x1 0x64>; }; }; +}; =20 - i2c@f9968000 { - status =3D "okay"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&i2c12_pins>; - clock-frequency =3D <100000>; - qcom,src-freq =3D <50000000>; +&rpm_requests { + pm8841-regulators { + s1 { + regulator-min-microvolt =3D <675000>; + regulator-max-microvolt =3D <1050000>; + }; =20 - mpu6515@68 { - compatible =3D "invensense,mpu6515"; - reg =3D <0x68>; - interrupts-extended =3D <&msmgpio 73 IRQ_TYPE_EDGE_FALLING>; - vddio-supply =3D <&pm8941_lvs1>; + s2 { + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1050000>; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&mpu6515_pin>; - - mount-matrix =3D "0", "-1", "0", - "-1", "0", "0", - "0", "0", "1"; - - i2c-gate { - #address-cells =3D <1>; - #size-cells =3D <0>; - ak8963@f { - compatible =3D "asahi-kasei,ak8963"; - reg =3D <0x0f>; - gpios =3D <&msmgpio 67 0>; - vid-supply =3D <&pm8941_lvs1>; - vdd-supply =3D <&pm8941_l17>; - }; + s3 { + regulator-min-microvolt =3D <1050000>; + regulator-max-microvolt =3D <1050000>; + }; =20 - bmp280@76 { - compatible =3D "bosch,bmp280"; - reg =3D <0x76>; - vdda-supply =3D <&pm8941_lvs1>; - vddd-supply =3D <&pm8941_l17>; - }; - }; + s4 { + regulator-min-microvolt =3D <815000>; + regulator-max-microvolt =3D <900000>; }; }; =20 - i2c@f9923000 { - status =3D "okay"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&i2c1_pins>; - clock-frequency =3D <100000>; - qcom,src-freq =3D <50000000>; - - charger: bq24192@6b { - compatible =3D "ti,bq24192"; - reg =3D <0x6b>; - interrupts-extended =3D <&spmi_bus 0 0xd5 0 IRQ_TYPE_EDGE_FALLING>; + pm8941-regulators { + vdd_l1_l3-supply =3D <&pm8941_s1>; + vdd_l2_lvs1_2_3-supply =3D <&pm8941_s3>; + vdd_l4_l11-supply =3D <&pm8941_s1>; + vdd_l5_l7-supply =3D <&pm8941_s2>; + vdd_l6_l12_l14_l15-supply =3D <&pm8941_s2>; + vdd_l8_l16_l18_l19-supply =3D <&vreg_vph_pwr>; + vdd_l9_l10_l17_l22-supply =3D <&vreg_boost>; + vdd_l13_l20_l23_l24-supply =3D <&vreg_boost>; + vdd_l21-supply =3D <&vreg_boost>; + + s1 { + regulator-min-microvolt =3D <1300000>; + regulator-max-microvolt =3D <1300000>; + + regulator-always-on; + regulator-boot-on; + }; =20 - omit-battery-class; + s2 { + regulator-min-microvolt =3D <2150000>; + regulator-max-microvolt =3D <2150000>; =20 - usb_otg_vbus: usb-otg-vbus { }; + regulator-boot-on; }; =20 - fuelgauge: max17048@36 { - compatible =3D "maxim,max17048"; - reg =3D <0x36>; + s3 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; =20 - maxim,double-soc; - maxim,rcomp =3D /bits/ 8 <0x4d>; + regulator-always-on; + regulator-boot-on; + }; =20 - interrupt-parent =3D <&msmgpio>; - interrupts =3D <9 IRQ_TYPE_LEVEL_LOW>; + l1 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&fuelgauge_pin>; + regulator-always-on; + regulator-boot-on; + }; =20 - maxim,alert-low-soc-level =3D <2>; + l2 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; }; - }; =20 - i2c@f9924000 { - status =3D "okay"; + l3 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; + }; =20 - clock-frequency =3D <355000>; - qcom,src-freq =3D <50000000>; + l4 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&i2c2_pins>; + l5 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - synaptics@70 { - compatible =3D "syna,rmi4-i2c"; - reg =3D <0x70>; + l6 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; =20 - interrupts-extended =3D <&msmgpio 5 IRQ_TYPE_EDGE_FALLING>; - vdd-supply =3D <&pm8941_l22>; - vio-supply =3D <&pm8941_lvs3>; + regulator-boot-on; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&touch_pin>; + l7 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; =20 - #address-cells =3D <1>; - #size-cells =3D <0>; + regulator-boot-on; + }; =20 - rmi4-f01@1 { - reg =3D <0x1>; - syna,nosleep-mode =3D <1>; - }; + l8 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - rmi4-f12@12 { - reg =3D <0x12>; - syna,sensor-type =3D <1>; - }; + l9 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; }; - }; =20 - i2c@f9925000 { - status =3D "okay"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&i2c3_pins>; - clock-frequency =3D <100000>; - qcom,src-freq =3D <50000000>; + l10 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; + }; =20 - avago_apds993@39 { - compatible =3D "avago,apds9930"; - reg =3D <0x39>; - interrupts-extended =3D <&msmgpio 61 IRQ_TYPE_EDGE_FALLING>; - vdd-supply =3D <&pm8941_l17>; - vddio-supply =3D <&pm8941_lvs1>; - led-max-microamp =3D <100000>; - amstaos,proximity-diodes =3D <0>; + l11 { + regulator-min-microvolt =3D <1300000>; + regulator-max-microvolt =3D <1300000>; }; - }; =20 - usb@f9a55000 { - status =3D "okay"; + l12 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; =20 - phys =3D <&usb_hs1_phy>; - phy-select =3D <&tcsr 0xb000 0>; + regulator-always-on; + regulator-boot-on; + }; =20 - extcon =3D <&charger>, <&usb_id>; - vbus-supply =3D <&usb_otg_vbus>; + l13 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; =20 - hnp-disable; - srp-disable; - adp-disable; + regulator-boot-on; + }; =20 - ulpi { - phy@a { - status =3D "okay"; + l14 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - v1p8-supply =3D <&pm8941_l6>; - v3p3-supply =3D <&pm8941_l24>; + l15 { + regulator-min-microvolt =3D <2050000>; + regulator-max-microvolt =3D <2050000>; + }; =20 - qcom,init-seq =3D /bits/ 8 <0x1 0x64>; - }; + l16 { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <2700000>; }; - }; =20 - mdss@fd900000 { - status =3D "okay"; + l17 { + regulator-min-microvolt =3D <2850000>; + regulator-max-microvolt =3D <2850000>; + }; =20 - mdp@fd900000 { - status =3D "okay"; + l18 { + regulator-min-microvolt =3D <2850000>; + regulator-max-microvolt =3D <2850000>; }; =20 - dsi@fd922800 { - status =3D "okay"; + l19 { + regulator-min-microvolt =3D <3000000>; + regulator-max-microvolt =3D <3300000>; + }; =20 - vdda-supply =3D <&pm8941_l2>; - vdd-supply =3D <&pm8941_lvs3>; - vddio-supply =3D <&pm8941_l12>; + l20 { + regulator-min-microvolt =3D <2950000>; + regulator-max-microvolt =3D <2950000>; =20 - #address-cells =3D <1>; - #size-cells =3D <0>; + regulator-boot-on; + regulator-system-load =3D <200000>; + regulator-allow-set-load; + }; =20 - ports { - port@1 { - endpoint { - remote-endpoint =3D <&panel_in>; - data-lanes =3D <0 1 2 3>; - }; - }; - }; + l21 { + regulator-min-microvolt =3D <2950000>; + regulator-max-microvolt =3D <2950000>; =20 - panel: panel@0 { - reg =3D <0>; - compatible =3D "lg,acx467akm-7"; + regulator-boot-on; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&panel_pin>; + l22 { + regulator-min-microvolt =3D <3000000>; + regulator-max-microvolt =3D <3300000>; + }; =20 - port { - panel_in: endpoint { - remote-endpoint =3D <&dsi0_out>; - }; - }; - }; + l23 { + regulator-min-microvolt =3D <3000000>; + regulator-max-microvolt =3D <3000000>; }; =20 - dsi-phy@fd922a00 { - status =3D "okay"; + l24 { + regulator-min-microvolt =3D <3075000>; + regulator-max-microvolt =3D <3075000>; =20 - vddio-supply =3D <&pm8941_l12>; + regulator-boot-on; }; }; }; =20 +&sdhci1 { + status =3D "okay"; + + vmmc-supply =3D <&pm8941_l20>; + vqmmc-supply =3D <&pm8941_s3>; + + bus-width =3D <8>; + non-removable; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc1_pin_a>; +}; + +&sdhci3 { + status =3D "okay"; + + max-frequency =3D <100000000>; + bus-width =3D <4>; + non-removable; + vmmc-supply =3D <&vreg_wlan>; + vqmmc-supply =3D <&pm8941_s3>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc2_pin_a>; + + #address-cells =3D <1>; + #size-cells =3D <0>; + + bcrmf@1 { + compatible =3D "brcm,bcm4339-fmac", "brcm,bcm4329-fmac"; + reg =3D <1>; + + brcm,drive-strength =3D <10>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&wlan_sleep_clk_pin>; + }; +}; + &spmi_bus { pm8941@0 { gpios@c000 { diff --git a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts b/arch/arm/boo= t/dts/qcom-msm8974-samsung-klte.dts index 6e036a440532..ffa31625de17 100644 --- a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts @@ -12,8 +12,8 @@ / { =20 aliases { serial0 =3D &blsp1_uart1; - mmc0 =3D &sdhc_1; /* SDC1 eMMC slot */ - mmc1 =3D &sdhc_2; /* SDC2 SD card slot */ + mmc0 =3D &sdhci1; /* SDC1 eMMC slot */ + mmc1 =3D &sdhci2; /* SDC2 SD card slot */ }; =20 chosen { @@ -52,197 +52,6 @@ volume-up { }; }; =20 - smd { - rpm { - rpm_requests { - pma8084-regulators { - compatible =3D "qcom,rpm-pma8084-regulators"; - status =3D "okay"; - - pma8084_s1: s1 { - regulator-min-microvolt =3D <675000>; - regulator-max-microvolt =3D <1050000>; - regulator-always-on; - }; - - pma8084_s2: s2 { - regulator-min-microvolt =3D <500000>; - regulator-max-microvolt =3D <1050000>; - }; - - pma8084_s3: s3 { - regulator-min-microvolt =3D <1300000>; - regulator-max-microvolt =3D <1300000>; - }; - - pma8084_s4: s4 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - pma8084_s5: s5 { - regulator-min-microvolt =3D <2150000>; - regulator-max-microvolt =3D <2150000>; - }; - - pma8084_s6: s6 { - regulator-min-microvolt =3D <1050000>; - regulator-max-microvolt =3D <1050000>; - }; - - pma8084_l1: l1 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - }; - - pma8084_l2: l2 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - }; - - pma8084_l3: l3 { - regulator-min-microvolt =3D <1050000>; - regulator-max-microvolt =3D <1200000>; - }; - - pma8084_l4: l4 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1225000>; - }; - - pma8084_l5: l5 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - pma8084_l6: l6 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - pma8084_l7: l7 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - pma8084_l8: l8 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - pma8084_l9: l9 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - }; - - pma8084_l10: l10 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - }; - - pma8084_l11: l11 { - regulator-min-microvolt =3D <1300000>; - regulator-max-microvolt =3D <1300000>; - }; - - pma8084_l12: l12 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - regulator-always-on; - }; - - pma8084_l13: l13 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - }; - - pma8084_l14: l14 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - pma8084_l15: l15 { - regulator-min-microvolt =3D <2050000>; - regulator-max-microvolt =3D <2050000>; - }; - - pma8084_l16: l16 { - regulator-min-microvolt =3D <2700000>; - regulator-max-microvolt =3D <2700000>; - }; - - pma8084_l17: l17 { - regulator-min-microvolt =3D <2850000>; - regulator-max-microvolt =3D <2850000>; - }; - - pma8084_l18: l18 { - regulator-min-microvolt =3D <2850000>; - regulator-max-microvolt =3D <2850000>; - }; - - pma8084_l19: l19 { - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - }; - - pma8084_l20: l20 { - regulator-min-microvolt =3D <2950000>; - regulator-max-microvolt =3D <2950000>; - - regulator-allow-set-load; - regulator-system-load =3D <200000>; - }; - - pma8084_l21: l21 { - regulator-min-microvolt =3D <2950000>; - regulator-max-microvolt =3D <2950000>; - - regulator-allow-set-load; - regulator-system-load =3D <200000>; - }; - - pma8084_l22: l22 { - regulator-min-microvolt =3D <3000000>; - regulator-max-microvolt =3D <3300000>; - }; - - pma8084_l23: l23 { - regulator-min-microvolt =3D <3000000>; - regulator-max-microvolt =3D <3000000>; - }; - - pma8084_l24: l24 { - regulator-min-microvolt =3D <3075000>; - regulator-max-microvolt =3D <3075000>; - }; - - pma8084_l25: l25 { - regulator-min-microvolt =3D <2100000>; - regulator-max-microvolt =3D <2100000>; - }; - - pma8084_l26: l26 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2050000>; - }; - - pma8084_l27: l27 { - regulator-min-microvolt =3D <1000000>; - regulator-max-microvolt =3D <1225000>; - }; - - pma8084_lvs1: lvs1 {}; - pma8084_lvs2: lvs2 {}; - pma8084_lvs3: lvs3 {}; - pma8084_lvs4: lvs4 {}; - - pma8084_5vs1: 5vs1 {}; - }; - }; - }; - }; - i2c-gpio-touchkey { compatible =3D "i2c-gpio"; #address-cells =3D <1>; @@ -353,493 +162,677 @@ adsp-pil { }; }; =20 -&soc { - serial@f991e000 { - status =3D "okay"; - }; +&blsp_i2c2 { + status =3D "okay"; =20 - /* blsp2_uart8 */ - serial@f995e000 { - status =3D "okay"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c2_pins>; =20 - pinctrl-names =3D "default", "sleep"; - pinctrl-0 =3D <&blsp2_uart8_pins_active>; - pinctrl-1 =3D <&blsp2_uart8_pins_sleep>; + touchscreen@20 { + compatible =3D "syna,rmi4-i2c"; + reg =3D <0x20>; =20 - bluetooth { - compatible =3D "brcm,bcm43540-bt"; - max-speed =3D <3000000>; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&bt_pins>; - device-wakeup-gpios =3D <&msmgpio 91 GPIO_ACTIVE_HIGH>; - shutdown-gpios =3D <&gpio_expander 9 GPIO_ACTIVE_HIGH>; - interrupt-parent =3D <&msmgpio>; - interrupts =3D <75 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names =3D "host-wakeup"; - }; - }; + interrupt-parent =3D <&pma8084_gpios>; + interrupts =3D <8 IRQ_TYPE_EDGE_FALLING>; =20 - pinctrl@fd510000 { - blsp2_uart8_pins_active: blsp2-uart8-pins-active { - pins =3D "gpio45", "gpio46", "gpio47", "gpio48"; - function =3D "blsp_uart8"; - drive-strength =3D <8>; - bias-disable; + vdd-supply =3D <&max77826_ldo13>; + vio-supply =3D <&pma8084_lvs2>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&touch_pin>; + + syna,startup-delay-ms =3D <100>; + + #address-cells =3D <1>; + #size-cells =3D <0>; + + rmi4-f01@1 { + reg =3D <0x1>; + syna,nosleep-mode =3D <1>; }; =20 - blsp2_uart8_pins_sleep: blsp2-uart8-pins-sleep { - pins =3D "gpio45", "gpio46", "gpio47", "gpio48"; - function =3D "gpio"; - drive-strength =3D <2>; - bias-pull-down; + rmi4-f12@12 { + reg =3D <0x12>; + syna,sensor-type =3D <1>; }; + }; +}; =20 - bt_pins: bt-pins { - hostwake { - pins =3D "gpio75"; - function =3D "gpio"; - drive-strength =3D <16>; - input-enable; +&blsp_i2c6 { + status =3D "okay"; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c6_pins>; + + pmic@60 { + reg =3D <0x60>; + compatible =3D "maxim,max77826"; + + regulators { + max77826_ldo1: LDO1 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; }; =20 - devwake { - pins =3D "gpio91"; - function =3D "gpio"; - drive-strength =3D <2>; + max77826_ldo2: LDO2 { + regulator-min-microvolt =3D <1000000>; + regulator-max-microvolt =3D <1000000>; }; - }; =20 - sdhc1_pin_a: sdhc1-pin-active { - clk { - pins =3D "sdc1_clk"; - drive-strength =3D <4>; - bias-disable; + max77826_ldo3: LDO3 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; }; =20 - cmd-data { - pins =3D "sdc1_cmd", "sdc1_data"; - drive-strength =3D <4>; - bias-pull-up; + max77826_ldo4: LDO4 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; }; - }; =20 - sdhc2_pin_a: sdhc2-pin-active { - clk-cmd-data { - pins =3D "gpio35", "gpio36", "gpio37", "gpio38", - "gpio39", "gpio40"; - function =3D "sdc3"; - drive-strength =3D <8>; - bias-disable; + max77826_ldo5: LDO5 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; }; - }; =20 - sdhc2_cd_pin: sdhc2-cd { - pins =3D "gpio62"; - function =3D "gpio"; + max77826_ldo6: LDO6 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <3300000>; + }; =20 - drive-strength =3D <2>; - bias-disable; - }; + max77826_ldo7: LDO7 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - sdhc3_pin_a: sdhc3-pin-active { - clk { - pins =3D "sdc2_clk"; - drive-strength =3D <6>; - bias-disable; + max77826_ldo8: LDO8 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <3300000>; }; =20 - cmd-data { - pins =3D "sdc2_cmd", "sdc2_data"; - drive-strength =3D <6>; - bias-pull-up; + max77826_ldo9: LDO9 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; }; - }; =20 - i2c2_pins: i2c2 { - mux { - pins =3D "gpio6", "gpio7"; - function =3D "blsp_i2c2"; + max77826_ldo10: LDO10 { + regulator-min-microvolt =3D <2800000>; + regulator-max-microvolt =3D <2950000>; + }; =20 - drive-strength =3D <2>; - bias-disable; + max77826_ldo11: LDO11 { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <2950000>; }; - }; =20 - i2c6_pins: i2c6 { - mux { - pins =3D "gpio29", "gpio30"; - function =3D "blsp_i2c6"; + max77826_ldo12: LDO12 { + regulator-min-microvolt =3D <2500000>; + regulator-max-microvolt =3D <3300000>; + }; =20 - drive-strength =3D <2>; - bias-disable; + max77826_ldo13: LDO13 { + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; }; - }; =20 - i2c12_pins: i2c12 { - mux { - pins =3D "gpio87", "gpio88"; - function =3D "blsp_i2c12"; + max77826_ldo14: LDO14 { + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + }; =20 - drive-strength =3D <2>; - bias-disable; + max77826_ldo15: LDO15 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; }; - }; =20 - i2c_touchkey_pins: i2c-touchkey { - mux { - pins =3D "gpio95", "gpio96"; - function =3D "gpio"; - input-enable; - bias-pull-up; + max77826_buck: BUCK { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; }; - }; =20 - i2c_led_gpioex_pins: i2c-led-gpioex { - mux { - pins =3D "gpio120", "gpio121"; - function =3D "gpio"; - input-enable; - bias-pull-down; + max77826_buckboost: BUCKBOOST { + regulator-min-microvolt =3D <3400000>; + regulator-max-microvolt =3D <3400000>; }; }; + }; +}; =20 - gpioex_pin: gpioex { - res { - pins =3D "gpio145"; - function =3D "gpio"; +&blsp_i2c12 { + status =3D "okay"; =20 - bias-pull-up; - drive-strength =3D <2>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c12_pins>; + + fuelgauge@36 { + compatible =3D "maxim,max17048"; + reg =3D <0x36>; + + maxim,double-soc; + maxim,rcomp =3D /bits/ 8 <0x56>; + + interrupt-parent =3D <&pma8084_gpios>; + interrupts =3D <21 IRQ_TYPE_LEVEL_LOW>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&fuelgauge_pin>; + }; +}; + +&blsp1_uart2 { + status =3D "okay"; +}; + +&blsp2_uart8 { + status =3D "okay"; + + pinctrl-names =3D "default", "sleep"; + pinctrl-0 =3D <&blsp2_uart8_pins_active>; + pinctrl-1 =3D <&blsp2_uart8_pins_sleep>; + + bluetooth { + compatible =3D "brcm,bcm43540-bt"; + max-speed =3D <3000000>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&bt_pins>; + device-wakeup-gpios =3D <&msmgpio 91 GPIO_ACTIVE_HIGH>; + shutdown-gpios =3D <&gpio_expander 9 GPIO_ACTIVE_HIGH>; + interrupt-parent =3D <&msmgpio>; + interrupts =3D <75 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names =3D "host-wakeup"; + }; +}; + +&gpu { + status =3D "ok"; +}; + +&mdss { + status =3D "ok"; + + mdp@fd900000 { + status =3D "ok"; + }; + + dsi@fd922800 { + status =3D "ok"; + + vdda-supply =3D <&pma8084_l2>; + vdd-supply =3D <&pma8084_l22>; + vddio-supply =3D <&pma8084_l12>; + + #address-cells =3D <1>; + #size-cells =3D <0>; + + ports { + port@1 { + endpoint { + remote-endpoint =3D <&panel_in>; + data-lanes =3D <0 1 2 3>; + }; }; }; =20 - wifi_pin: wifi { - int { - pins =3D "gpio92"; - function =3D "gpio"; + panel: panel@0 { + reg =3D <0>; + compatible =3D "samsung,s6e3fa2"; =20 - input-enable; - bias-pull-down; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&panel_te_pin &panel_rst_pin>; + + iovdd-supply =3D <&pma8084_lvs4>; + vddr-supply =3D <&vreg_panel>; + + reset-gpios =3D <&pma8084_gpios 17 GPIO_ACTIVE_LOW>; + te-gpios =3D <&msmgpio 12 GPIO_ACTIVE_HIGH>; + + port { + panel_in: endpoint { + remote-endpoint =3D <&dsi0_out>; + }; }; }; + }; =20 - panel_te_pin: panel { - te { - pins =3D "gpio12"; - function =3D "mdp_vsync"; + dsi-phy@fd922a00 { + status =3D "ok"; =20 - drive-strength =3D <2>; - bias-disable; - }; + vddio-supply =3D <&pma8084_l12>; + }; +}; + +&msmgpio { + blsp2_uart8_pins_active: blsp2-uart8-pins-active { + pins =3D "gpio45", "gpio46", "gpio47", "gpio48"; + function =3D "blsp_uart8"; + drive-strength =3D <8>; + bias-disable; + }; + + blsp2_uart8_pins_sleep: blsp2-uart8-pins-sleep { + pins =3D "gpio45", "gpio46", "gpio47", "gpio48"; + function =3D "gpio"; + drive-strength =3D <2>; + bias-pull-down; + }; + + bt_pins: bt-pins { + hostwake { + pins =3D "gpio75"; + function =3D "gpio"; + drive-strength =3D <16>; + input-enable; + }; + + devwake { + pins =3D "gpio91"; + function =3D "gpio"; + drive-strength =3D <2>; }; }; =20 - sdhc_1: sdhci@f9824900 { - status =3D "okay"; + sdhc1_pin_a: sdhc1-pin-active { + clk { + pins =3D "sdc1_clk"; + drive-strength =3D <4>; + bias-disable; + }; + + cmd-data { + pins =3D "sdc1_cmd", "sdc1_data"; + drive-strength =3D <4>; + bias-pull-up; + }; + }; =20 - vmmc-supply =3D <&pma8084_l20>; - vqmmc-supply =3D <&pma8084_s4>; + sdhc2_pin_a: sdhc2-pin-active { + clk-cmd-data { + pins =3D "gpio35", "gpio36", "gpio37", "gpio38", + "gpio39", "gpio40"; + function =3D "sdc3"; + drive-strength =3D <8>; + bias-disable; + }; + }; =20 - bus-width =3D <8>; - non-removable; + sdhc2_cd_pin: sdhc2-cd { + pins =3D "gpio62"; + function =3D "gpio"; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc1_pin_a>; + drive-strength =3D <2>; + bias-disable; }; =20 - sdhc_2: sdhci@f9864900 { - status =3D "okay"; + sdhc3_pin_a: sdhc3-pin-active { + clk { + pins =3D "sdc2_clk"; + drive-strength =3D <6>; + bias-disable; + }; + + cmd-data { + pins =3D "sdc2_cmd", "sdc2_data"; + drive-strength =3D <6>; + bias-pull-up; + }; + }; =20 - max-frequency =3D <100000000>; + i2c2_pins: i2c2 { + mux { + pins =3D "gpio6", "gpio7"; + function =3D "blsp_i2c2"; =20 - vmmc-supply =3D <&pma8084_l21>; - vqmmc-supply =3D <&pma8084_l13>; + drive-strength =3D <2>; + bias-disable; + }; + }; =20 - bus-width =3D <4>; + i2c6_pins: i2c6 { + mux { + pins =3D "gpio29", "gpio30"; + function =3D "blsp_i2c6"; =20 - /* cd-gpio is intentionally disabled. If enabled, an SD card - * present during boot is not initialized correctly. Without - * cd-gpios the driver resorts to polling, so hotplug works. - */ - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc2_pin_a /* &sdhc2_cd_pin */>; - // cd-gpios =3D <&msmgpio 62 GPIO_ACTIVE_LOW>; + drive-strength =3D <2>; + bias-disable; + }; }; =20 - sdhci@f98a4900 { - status =3D "okay"; + i2c12_pins: i2c12 { + mux { + pins =3D "gpio87", "gpio88"; + function =3D "blsp_i2c12"; =20 - #address-cells =3D <1>; - #size-cells =3D <0>; + drive-strength =3D <2>; + bias-disable; + }; + }; =20 - max-frequency =3D <100000000>; + i2c_touchkey_pins: i2c-touchkey { + mux { + pins =3D "gpio95", "gpio96"; + function =3D "gpio"; + input-enable; + bias-pull-up; + }; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc3_pin_a>; + i2c_led_gpioex_pins: i2c-led-gpioex { + mux { + pins =3D "gpio120", "gpio121"; + function =3D "gpio"; + input-enable; + bias-pull-down; + }; + }; =20 - vmmc-supply =3D <&vreg_wlan>; - vqmmc-supply =3D <&pma8084_s4>; + gpioex_pin: gpioex { + res { + pins =3D "gpio145"; + function =3D "gpio"; =20 - bus-width =3D <4>; - non-removable; + bias-pull-up; + drive-strength =3D <2>; + }; + }; =20 - wifi@1 { - reg =3D <1>; - compatible =3D "brcm,bcm4329-fmac"; + wifi_pin: wifi { + int { + pins =3D "gpio92"; + function =3D "gpio"; =20 - interrupt-parent =3D <&msmgpio>; - interrupts =3D <92 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names =3D "host-wake"; + input-enable; + bias-pull-down; + }; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&wlan_sleep_clk_pin &wifi_pin>; + panel_te_pin: panel { + te { + pins =3D "gpio12"; + function =3D "mdp_vsync"; + + drive-strength =3D <2>; + bias-disable; }; }; +}; =20 - usb@f9a55000 { - status =3D "okay"; +&mss_pil { + cx-supply =3D <&pma8084_s2>; + mss-supply =3D <&pma8084_s6>; + mx-supply =3D <&pma8084_s1>; + pll-supply =3D <&pma8084_l12>; +}; =20 - phys =3D <&usb_hs1_phy>; - phy-select =3D <&tcsr 0xb000 0>; - /*extcon =3D <&smbb>, <&usb_id>;*/ - /*vbus-supply =3D <&chg_otg>;*/ +&otg { + status =3D "okay"; =20 - hnp-disable; - srp-disable; - adp-disable; + phys =3D <&usb_hs1_phy>; + phy-select =3D <&tcsr 0xb000 0>; + /*extcon =3D <&smbb>, <&usb_id>;*/ + /*vbus-supply =3D <&chg_otg>;*/ =20 - ulpi { - phy@a { - status =3D "okay"; + hnp-disable; + srp-disable; + adp-disable; =20 - v1p8-supply =3D <&pma8084_l6>; - v3p3-supply =3D <&pma8084_l24>; + ulpi { + phy@a { + status =3D "okay"; =20 - /*extcon =3D <&smbb>;*/ - qcom,init-seq =3D /bits/ 8 <0x1 0x64>; - }; + v1p8-supply =3D <&pma8084_l6>; + v3p3-supply =3D <&pma8084_l24>; + + /*extcon =3D <&smbb>;*/ + qcom,init-seq =3D /bits/ 8 <0x1 0x64>; }; }; +}; =20 - i2c@f9924000 { +&rpm_requests { + pma8084-regulators { + compatible =3D "qcom,rpm-pma8084-regulators"; status =3D "okay"; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&i2c2_pins>; + pma8084_s1: s1 { + regulator-min-microvolt =3D <675000>; + regulator-max-microvolt =3D <1050000>; + regulator-always-on; + }; =20 - touchscreen@20 { - compatible =3D "syna,rmi4-i2c"; - reg =3D <0x20>; + pma8084_s2: s2 { + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1050000>; + }; =20 - interrupt-parent =3D <&pma8084_gpios>; - interrupts =3D <8 IRQ_TYPE_EDGE_FALLING>; + pma8084_s3: s3 { + regulator-min-microvolt =3D <1300000>; + regulator-max-microvolt =3D <1300000>; + }; =20 - vdd-supply =3D <&max77826_ldo13>; - vio-supply =3D <&pma8084_lvs2>; + pma8084_s4: s4 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&touch_pin>; + pma8084_s5: s5 { + regulator-min-microvolt =3D <2150000>; + regulator-max-microvolt =3D <2150000>; + }; =20 - syna,startup-delay-ms =3D <100>; + pma8084_s6: s6 { + regulator-min-microvolt =3D <1050000>; + regulator-max-microvolt =3D <1050000>; + }; =20 - #address-cells =3D <1>; - #size-cells =3D <0>; + pma8084_l1: l1 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; + }; =20 - rmi4-f01@1 { - reg =3D <0x1>; - syna,nosleep-mode =3D <1>; - }; + pma8084_l2: l2 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; + }; =20 - rmi4-f12@12 { - reg =3D <0x12>; - syna,sensor-type =3D <1>; - }; + pma8084_l3: l3 { + regulator-min-microvolt =3D <1050000>; + regulator-max-microvolt =3D <1200000>; }; - }; =20 - i2c@f9928000 { - status =3D "okay"; + pma8084_l4: l4 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1225000>; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&i2c6_pins>; + pma8084_l5: l5 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - pmic@60 { - reg =3D <0x60>; - compatible =3D "maxim,max77826"; + pma8084_l6: l6 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - regulators { - max77826_ldo1: LDO1 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - }; + pma8084_l7: l7 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - max77826_ldo2: LDO2 { - regulator-min-microvolt =3D <1000000>; - regulator-max-microvolt =3D <1000000>; - }; + pma8084_l8: l8 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - max77826_ldo3: LDO3 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - }; + pma8084_l9: l9 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; + }; =20 - max77826_ldo4: LDO4 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; + pma8084_l10: l10 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; + }; =20 - max77826_ldo5: LDO5 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; + pma8084_l11: l11 { + regulator-min-microvolt =3D <1300000>; + regulator-max-microvolt =3D <1300000>; + }; =20 - max77826_ldo6: LDO6 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <3300000>; - }; + pma8084_l12: l12 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + regulator-always-on; + }; =20 - max77826_ldo7: LDO7 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; + pma8084_l13: l13 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; + }; =20 - max77826_ldo8: LDO8 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <3300000>; - }; + pma8084_l14: l14 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - max77826_ldo9: LDO9 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; + pma8084_l15: l15 { + regulator-min-microvolt =3D <2050000>; + regulator-max-microvolt =3D <2050000>; + }; =20 - max77826_ldo10: LDO10 { - regulator-min-microvolt =3D <2800000>; - regulator-max-microvolt =3D <2950000>; - }; + pma8084_l16: l16 { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <2700000>; + }; =20 - max77826_ldo11: LDO11 { - regulator-min-microvolt =3D <2700000>; - regulator-max-microvolt =3D <2950000>; - }; + pma8084_l17: l17 { + regulator-min-microvolt =3D <2850000>; + regulator-max-microvolt =3D <2850000>; + }; =20 - max77826_ldo12: LDO12 { - regulator-min-microvolt =3D <2500000>; - regulator-max-microvolt =3D <3300000>; - }; + pma8084_l18: l18 { + regulator-min-microvolt =3D <2850000>; + regulator-max-microvolt =3D <2850000>; + }; =20 - max77826_ldo13: LDO13 { - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - }; + pma8084_l19: l19 { + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + }; =20 - max77826_ldo14: LDO14 { - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - }; + pma8084_l20: l20 { + regulator-min-microvolt =3D <2950000>; + regulator-max-microvolt =3D <2950000>; =20 - max77826_ldo15: LDO15 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; + regulator-allow-set-load; + regulator-system-load =3D <200000>; + }; =20 - max77826_buck: BUCK { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - }; + pma8084_l21: l21 { + regulator-min-microvolt =3D <2950000>; + regulator-max-microvolt =3D <2950000>; =20 - max77826_buckboost: BUCKBOOST { - regulator-min-microvolt =3D <3400000>; - regulator-max-microvolt =3D <3400000>; - }; - }; + regulator-allow-set-load; + regulator-system-load =3D <200000>; }; - }; =20 - i2c@f9968000 { - status =3D "okay"; + pma8084_l22: l22 { + regulator-min-microvolt =3D <3000000>; + regulator-max-microvolt =3D <3300000>; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&i2c12_pins>; + pma8084_l23: l23 { + regulator-min-microvolt =3D <3000000>; + regulator-max-microvolt =3D <3000000>; + }; =20 - fuelgauge@36 { - compatible =3D "maxim,max17048"; - reg =3D <0x36>; + pma8084_l24: l24 { + regulator-min-microvolt =3D <3075000>; + regulator-max-microvolt =3D <3075000>; + }; =20 - maxim,double-soc; - maxim,rcomp =3D /bits/ 8 <0x56>; + pma8084_l25: l25 { + regulator-min-microvolt =3D <2100000>; + regulator-max-microvolt =3D <2100000>; + }; =20 - interrupt-parent =3D <&pma8084_gpios>; - interrupts =3D <21 IRQ_TYPE_LEVEL_LOW>; + pma8084_l26: l26 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2050000>; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&fuelgauge_pin>; + pma8084_l27: l27 { + regulator-min-microvolt =3D <1000000>; + regulator-max-microvolt =3D <1225000>; }; - }; =20 - adreno@fdb00000 { - status =3D "ok"; + pma8084_lvs1: lvs1 {}; + pma8084_lvs2: lvs2 {}; + pma8084_lvs3: lvs3 {}; + pma8084_lvs4: lvs4 {}; + + pma8084_5vs1: 5vs1 {}; }; +}; =20 - mdss@fd900000 { - status =3D "ok"; +&sdhci1 { + status =3D "okay"; =20 - mdp@fd900000 { - status =3D "ok"; - }; + vmmc-supply =3D <&pma8084_l20>; + vqmmc-supply =3D <&pma8084_s4>; + + bus-width =3D <8>; + non-removable; =20 - dsi@fd922800 { - status =3D "ok"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc1_pin_a>; +}; =20 - vdda-supply =3D <&pma8084_l2>; - vdd-supply =3D <&pma8084_l22>; - vddio-supply =3D <&pma8084_l12>; +&sdhci2 { + status =3D "okay"; =20 - #address-cells =3D <1>; - #size-cells =3D <0>; + max-frequency =3D <100000000>; =20 - ports { - port@1 { - endpoint { - remote-endpoint =3D <&panel_in>; - data-lanes =3D <0 1 2 3>; - }; - }; - }; + vmmc-supply =3D <&pma8084_l21>; + vqmmc-supply =3D <&pma8084_l13>; =20 - panel: panel@0 { - reg =3D <0>; - compatible =3D "samsung,s6e3fa2"; + bus-width =3D <4>; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&panel_te_pin &panel_rst_pin>; + /* cd-gpio is intentionally disabled. If enabled, an SD card + * present during boot is not initialized correctly. Without + * cd-gpios the driver resorts to polling, so hotplug works. + */ + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc2_pin_a /* &sdhc2_cd_pin */>; + // cd-gpios =3D <&msmgpio 62 GPIO_ACTIVE_LOW>; +}; =20 - iovdd-supply =3D <&pma8084_lvs4>; - vddr-supply =3D <&vreg_panel>; +&sdhci3 { + status =3D "okay"; =20 - reset-gpios =3D <&pma8084_gpios 17 GPIO_ACTIVE_LOW>; - te-gpios =3D <&msmgpio 12 GPIO_ACTIVE_HIGH>; + #address-cells =3D <1>; + #size-cells =3D <0>; =20 - port { - panel_in: endpoint { - remote-endpoint =3D <&dsi0_out>; - }; - }; - }; - }; + max-frequency =3D <100000000>; =20 - dsi-phy@fd922a00 { - status =3D "ok"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc3_pin_a>; =20 - vddio-supply =3D <&pma8084_l12>; - }; - }; + vmmc-supply =3D <&vreg_wlan>; + vqmmc-supply =3D <&pma8084_s4>; =20 - remoteproc@fc880000 { - cx-supply =3D <&pma8084_s2>; - mss-supply =3D <&pma8084_s6>; - mx-supply =3D <&pma8084_s1>; - pll-supply =3D <&pma8084_l12>; + bus-width =3D <4>; + non-removable; + + wifi@1 { + reg =3D <1>; + compatible =3D "brcm,bcm4329-fmac"; + + interrupt-parent =3D <&msmgpio>; + interrupts =3D <92 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names =3D "host-wake"; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&wlan_sleep_clk_pin &wifi_pin>; }; }; =20 diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-amami.dts b/arch/ar= m/boot/dts/qcom-msm8974-sony-xperia-amami.dts index 79e2cfbbb1ba..4f28ca3340de 100644 --- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-amami.dts +++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-amami.dts @@ -57,339 +57,332 @@ memory@0 { reg =3D <0 0x40000000>, <0x40000000 0x40000000>; device_type =3D "memory"; }; +}; =20 - smd { - rpm { - rpm_requests { - pm8841-regulators { - s1 { - regulator-min-microvolt =3D <675000>; - regulator-max-microvolt =3D <1050000>; - }; - - s2 { - regulator-min-microvolt =3D <500000>; - regulator-max-microvolt =3D <1050000>; - }; - - s3 { - regulator-min-microvolt =3D <500000>; - regulator-max-microvolt =3D <1050000>; - }; - - s4 { - regulator-min-microvolt =3D <500000>; - regulator-max-microvolt =3D <1050000>; - }; - }; - - pm8941-regulators { - vdd_l1_l3-supply =3D <&pm8941_s1>; - vdd_l2_lvs1_2_3-supply =3D <&pm8941_s3>; - vdd_l4_l11-supply =3D <&pm8941_s1>; - vdd_l5_l7-supply =3D <&pm8941_s2>; - vdd_l6_l12_l14_l15-supply =3D <&pm8941_s2>; - vdd_l9_l10_l17_l22-supply =3D <&vreg_boost>; - vdd_l13_l20_l23_l24-supply =3D <&vreg_boost>; - vdd_l21-supply =3D <&vreg_boost>; - - s1 { - regulator-min-microvolt =3D <1300000>; - regulator-max-microvolt =3D <1300000>; - regulator-always-on; - regulator-boot-on; - }; - - s2 { - regulator-min-microvolt =3D <2150000>; - regulator-max-microvolt =3D <2150000>; - regulator-boot-on; - }; - - s3 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - regulator-always-on; - regulator-boot-on; - }; - - s4 { - regulator-min-microvolt =3D <5000000>; - regulator-max-microvolt =3D <5000000>; - }; - - l1 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - - regulator-always-on; - regulator-boot-on; - }; - - l2 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - }; - - l3 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - }; - - l4 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - }; - - l5 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l6 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-boot-on; - }; - - l7 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-boot-on; - }; - - l8 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l9 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - }; - - l11 { - regulator-min-microvolt =3D <1300000>; - regulator-max-microvolt =3D <1350000>; - }; - - l12 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-always-on; - regulator-boot-on; - }; - - l13 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - - regulator-boot-on; - }; - - l14 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l15 { - regulator-min-microvolt =3D <2050000>; - regulator-max-microvolt =3D <2050000>; - }; - - l16 { - regulator-min-microvolt =3D <2700000>; - regulator-max-microvolt =3D <2700000>; - }; - - l17 { - regulator-min-microvolt =3D <2700000>; - regulator-max-microvolt =3D <2700000>; - }; - - l18 { - regulator-min-microvolt =3D <2850000>; - regulator-max-microvolt =3D <2850000>; - }; - - l19 { - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - }; - - l20 { - regulator-min-microvolt =3D <2950000>; - regulator-max-microvolt =3D <2950000>; - - regulator-allow-set-load; - regulator-boot-on; - regulator-system-load =3D <200000>; - }; - - l21 { - regulator-min-microvolt =3D <2950000>; - regulator-max-microvolt =3D <2950000>; - - regulator-boot-on; - }; - - l22 { - regulator-min-microvolt =3D <3000000>; - regulator-max-microvolt =3D <3000000>; - }; - - l23 { - regulator-min-microvolt =3D <2800000>; - regulator-max-microvolt =3D <2800000>; - }; - - l24 { - regulator-min-microvolt =3D <3075000>; - regulator-max-microvolt =3D <3075000>; - - regulator-boot-on; - }; - }; - }; +&blsp1_uart2 { + status =3D "okay"; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&blsp1_uart2_pin_a>; +}; + +&blsp2_dma { + qcom,controlled-remotely; +}; + +&msmgpio { + blsp1_uart2_pin_a: blsp1-uart2-pin-active { + rx { + pins =3D "gpio5"; + function =3D "blsp_uart2"; + + drive-strength =3D <2>; + bias-pull-up; + }; + + tx { + pins =3D "gpio4"; + function =3D "blsp_uart2"; + + drive-strength =3D <4>; + bias-disable; }; }; -}; =20 -&soc { - sdhci@f9824900 { - status =3D "okay"; + i2c2_pins: i2c2 { + mux { + pins =3D "gpio6", "gpio7"; + function =3D "blsp_i2c2"; =20 - vmmc-supply =3D <&pm8941_l20>; - vqmmc-supply =3D <&pm8941_s3>; + drive-strength =3D <2>; + bias-disable; + }; + }; =20 - bus-width =3D <8>; - non-removable; + sdhc1_pin_a: sdhc1-pin-active { + clk { + pins =3D "sdc1_clk"; + drive-strength =3D <16>; + bias-disable; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc1_pin_a>; + cmd-data { + pins =3D "sdc1_cmd", "sdc1_data"; + drive-strength =3D <10>; + bias-pull-up; + }; }; =20 - sdhci@f98a4900 { - status =3D "okay"; + sdhc2_cd_pin_a: sdhc2-cd-pin-active { + pins =3D "gpio62"; + function =3D "gpio"; =20 - bus-width =3D <4>; + drive-strength =3D <2>; + bias-disable; + }; =20 - vmmc-supply =3D <&pm8941_l21>; - vqmmc-supply =3D <&pm8941_l13>; + sdhc2_pin_a: sdhc2-pin-active { + clk { + pins =3D "sdc2_clk"; + drive-strength =3D <10>; + bias-disable; + }; =20 - cd-gpios =3D <&msmgpio 62 GPIO_ACTIVE_LOW>; + cmd-data { + pins =3D "sdc2_cmd", "sdc2_data"; + drive-strength =3D <6>; + bias-pull-up; + }; + }; +}; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>; +&otg { + status =3D "okay"; + + phys =3D <&usb_hs1_phy>; + phy-select =3D <&tcsr 0xb000 0>; + extcon =3D <&smbb>, <&usb_id>; + vbus-supply =3D <&chg_otg>; + + hnp-disable; + srp-disable; + adp-disable; + + ulpi { + phy@a { + status =3D "okay"; + + v1p8-supply =3D <&pm8941_l6>; + v3p3-supply =3D <&pm8941_l24>; + + extcon =3D <&smbb>; + qcom,init-seq =3D /bits/ 8 <0x1 0x64>; + }; }; +}; + +&rpm_requests { + pm8841-regulators { + s1 { + regulator-min-microvolt =3D <675000>; + regulator-max-microvolt =3D <1050000>; + }; =20 - serial@f991e000 { - status =3D "okay"; + s2 { + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1050000>; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&blsp1_uart2_pin_a>; + s3 { + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1050000>; + }; + + s4 { + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1050000>; + }; }; =20 + pm8941-regulators { + vdd_l1_l3-supply =3D <&pm8941_s1>; + vdd_l2_lvs1_2_3-supply =3D <&pm8941_s3>; + vdd_l4_l11-supply =3D <&pm8941_s1>; + vdd_l5_l7-supply =3D <&pm8941_s2>; + vdd_l6_l12_l14_l15-supply =3D <&pm8941_s2>; + vdd_l9_l10_l17_l22-supply =3D <&vreg_boost>; + vdd_l13_l20_l23_l24-supply =3D <&vreg_boost>; + vdd_l21-supply =3D <&vreg_boost>; + + s1 { + regulator-min-microvolt =3D <1300000>; + regulator-max-microvolt =3D <1300000>; + regulator-always-on; + regulator-boot-on; + }; =20 - pinctrl@fd510000 { - blsp1_uart2_pin_a: blsp1-uart2-pin-active { - rx { - pins =3D "gpio5"; - function =3D "blsp_uart2"; + s2 { + regulator-min-microvolt =3D <2150000>; + regulator-max-microvolt =3D <2150000>; + regulator-boot-on; + }; =20 - drive-strength =3D <2>; - bias-pull-up; - }; + s3 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + regulator-always-on; + regulator-boot-on; + }; =20 - tx { - pins =3D "gpio4"; - function =3D "blsp_uart2"; + s4 { + regulator-min-microvolt =3D <5000000>; + regulator-max-microvolt =3D <5000000>; + }; =20 - drive-strength =3D <4>; - bias-disable; - }; + l1 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; + + regulator-always-on; + regulator-boot-on; }; =20 - i2c2_pins: i2c2 { - mux { - pins =3D "gpio6", "gpio7"; - function =3D "blsp_i2c2"; + l2 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; + }; =20 - drive-strength =3D <2>; - bias-disable; - }; + l3 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; }; =20 - sdhc1_pin_a: sdhc1-pin-active { - clk { - pins =3D "sdc1_clk"; - drive-strength =3D <16>; - bias-disable; - }; + l4 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; + }; =20 - cmd-data { - pins =3D "sdc1_cmd", "sdc1_data"; - drive-strength =3D <10>; - bias-pull-up; - }; + l5 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; }; =20 - sdhc2_cd_pin_a: sdhc2-cd-pin-active { - pins =3D "gpio62"; - function =3D "gpio"; + l6 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; =20 - drive-strength =3D <2>; - bias-disable; - }; + regulator-boot-on; + }; =20 - sdhc2_pin_a: sdhc2-pin-active { - clk { - pins =3D "sdc2_clk"; - drive-strength =3D <10>; - bias-disable; - }; + l7 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; =20 - cmd-data { - pins =3D "sdc2_cmd", "sdc2_data"; - drive-strength =3D <6>; - bias-pull-up; - }; + regulator-boot-on; }; - }; =20 - dma-controller@f9944000 { - qcom,controlled-remotely; - }; + l8 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - usb@f9a55000 { - status =3D "okay"; + l9 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; + }; =20 - phys =3D <&usb_hs1_phy>; - phy-select =3D <&tcsr 0xb000 0>; - extcon =3D <&smbb>, <&usb_id>; - vbus-supply =3D <&chg_otg>; + l11 { + regulator-min-microvolt =3D <1300000>; + regulator-max-microvolt =3D <1350000>; + }; =20 - hnp-disable; - srp-disable; - adp-disable; + l12 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; =20 - ulpi { - phy@a { - status =3D "okay"; + regulator-always-on; + regulator-boot-on; + }; =20 - v1p8-supply =3D <&pm8941_l6>; - v3p3-supply =3D <&pm8941_l24>; + l13 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; =20 - extcon =3D <&smbb>; - qcom,init-seq =3D /bits/ 8 <0x1 0x64>; - }; + regulator-boot-on; + }; + + l14 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; + + l15 { + regulator-min-microvolt =3D <2050000>; + regulator-max-microvolt =3D <2050000>; + }; + + l16 { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <2700000>; + }; + + l17 { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <2700000>; + }; + + l18 { + regulator-min-microvolt =3D <2850000>; + regulator-max-microvolt =3D <2850000>; + }; + + l19 { + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + }; + + l20 { + regulator-min-microvolt =3D <2950000>; + regulator-max-microvolt =3D <2950000>; + + regulator-allow-set-load; + regulator-boot-on; + regulator-system-load =3D <200000>; + }; + + l21 { + regulator-min-microvolt =3D <2950000>; + regulator-max-microvolt =3D <2950000>; + + regulator-boot-on; + }; + + l22 { + regulator-min-microvolt =3D <3000000>; + regulator-max-microvolt =3D <3000000>; + }; + + l23 { + regulator-min-microvolt =3D <2800000>; + regulator-max-microvolt =3D <2800000>; + }; + + l24 { + regulator-min-microvolt =3D <3075000>; + regulator-max-microvolt =3D <3075000>; + + regulator-boot-on; }; }; }; =20 +&sdhci1 { + status =3D "okay"; + + vmmc-supply =3D <&pm8941_l20>; + vqmmc-supply =3D <&pm8941_s3>; + + bus-width =3D <8>; + non-removable; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc1_pin_a>; +}; + +&sdhci3 { + status =3D "okay"; + + bus-width =3D <4>; + + vmmc-supply =3D <&pm8941_l21>; + vqmmc-supply =3D <&pm8941_l13>; + + cd-gpios =3D <&msmgpio 62 GPIO_ACTIVE_LOW>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>; +}; + &spmi_bus { pm8941@0 { charger@1000 { diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts b/arch/a= rm/boot/dts/qcom-msm8974-sony-xperia-castor.dts index e66937e3f7dd..f4b537294fb4 100644 --- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts +++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts @@ -53,186 +53,6 @@ volume-up { }; }; =20 - smd { - rpm { - rpm_requests { - pm8941-regulators { - vdd_l1_l3-supply =3D <&pm8941_s1>; - vdd_l2_lvs1_2_3-supply =3D <&pm8941_s3>; - vdd_l4_l11-supply =3D <&pm8941_s1>; - vdd_l5_l7-supply =3D <&pm8941_s2>; - vdd_l6_l12_l14_l15-supply =3D <&pm8941_s2>; - vdd_l9_l10_l17_l22-supply =3D <&vreg_boost>; - vdd_l13_l20_l23_l24-supply =3D <&vreg_boost>; - vdd_l21-supply =3D <&vreg_boost>; - - s1 { - regulator-min-microvolt =3D <1300000>; - regulator-max-microvolt =3D <1300000>; - regulator-always-on; - regulator-boot-on; - }; - - s2 { - regulator-min-microvolt =3D <2150000>; - regulator-max-microvolt =3D <2150000>; - regulator-boot-on; - }; - - s3 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - regulator-always-on; - regulator-boot-on; - - regulator-system-load =3D <154000>; - }; - - s4 { - regulator-min-microvolt =3D <5000000>; - regulator-max-microvolt =3D <5000000>; - }; - - l1 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - - regulator-always-on; - regulator-boot-on; - }; - - l2 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - }; - - l3 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - }; - - l4 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - }; - - l5 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l6 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-boot-on; - }; - - l7 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-boot-on; - }; - - l8 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l9 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - }; - - l11 { - regulator-min-microvolt =3D <1300000>; - regulator-max-microvolt =3D <1350000>; - }; - - l12 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-always-on; - regulator-boot-on; - }; - - l13 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - - regulator-boot-on; - }; - - l14 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l15 { - regulator-min-microvolt =3D <2050000>; - regulator-max-microvolt =3D <2050000>; - }; - - l16 { - regulator-min-microvolt =3D <2700000>; - regulator-max-microvolt =3D <2700000>; - }; - - l17 { - regulator-min-microvolt =3D <2700000>; - regulator-max-microvolt =3D <2700000>; - }; - - l18 { - regulator-min-microvolt =3D <2850000>; - regulator-max-microvolt =3D <2850000>; - }; - - l19 { - regulator-min-microvolt =3D <2850000>; - regulator-max-microvolt =3D <2850000>; - }; - - l20 { - regulator-min-microvolt =3D <2950000>; - regulator-max-microvolt =3D <2950000>; - - regulator-allow-set-load; - regulator-boot-on; - regulator-allow-set-load; - regulator-system-load =3D <500000>; - }; - - l21 { - regulator-min-microvolt =3D <2950000>; - regulator-max-microvolt =3D <2950000>; - - regulator-boot-on; - }; - - l22 { - regulator-min-microvolt =3D <3000000>; - regulator-max-microvolt =3D <3000000>; - }; - - l23 { - regulator-min-microvolt =3D <2800000>; - regulator-max-microvolt =3D <2800000>; - }; - - l24 { - regulator-min-microvolt =3D <3075000>; - regulator-max-microvolt =3D <3075000>; - - regulator-boot-on; - }; - }; - }; - }; - }; - vreg_bl_vddio: lcd-backlight-vddio { compatible =3D "regulator-fixed"; regulator-name =3D "vreg_bl_vddio"; @@ -277,385 +97,559 @@ vreg_wlan: wlan-regulator { }; }; =20 -&soc { - sdhci@f9824900 { - status =3D "okay"; +&blsp_i2c8 { + status =3D "okay"; =20 - vmmc-supply =3D <&pm8941_l20>; - vqmmc-supply =3D <&pm8941_s3>; + clock-frequency =3D <355000>; + qcom,src-freq =3D <50000000>; =20 - bus-width =3D <8>; - non-removable; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c8_pins>; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc1_pin_a>; - }; + synaptics@2c { + compatible =3D "syna,rmi4-i2c"; + reg =3D <0x2c>; =20 - sdhci@f9864900 { - status =3D "okay"; + interrupt-parent =3D <&msmgpio>; + interrupts =3D <86 IRQ_TYPE_EDGE_FALLING>; =20 - max-frequency =3D <100000000>; - non-removable; - vmmc-supply =3D <&vreg_wlan>; + #address-cells =3D <1>; + #size-cells =3D <0>; + + vdd-supply =3D <&pm8941_l22>; + vio-supply =3D <&pm8941_lvs3>; =20 pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc3_pin_a>; + pinctrl-0 =3D <&ts_int_pin>; =20 - #address-cells =3D <1>; - #size-cells =3D <0>; + syna,startup-delay-ms =3D <10>; =20 - bcrmf@1 { - compatible =3D "brcm,bcm4339-fmac", "brcm,bcm4329-fmac"; - reg =3D <1>; + rmi-f01@1 { + reg =3D <0x1>; + syna,nosleep =3D <1>; + }; =20 - brcm,drive-strength =3D <10>; + rmi-f11@11 { + reg =3D <0x11>; + syna,f11-flip-x =3D <1>; + syna,sensor-type =3D <1>; + }; + }; +}; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&wlan_sleep_clk_pin>; +&blsp_i2c11 { + status =3D "okay"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c11_pins>; + clock-frequency =3D <355000>; + qcom,src-freq =3D <50000000>; + + lp8566_wled: backlight@2c { + compatible =3D "ti,lp8556"; + reg =3D <0x2c>; + power-supply =3D <&vreg_bl_vddio>; + + bl-name =3D "backlight"; + dev-ctrl =3D /bits/ 8 <0x05>; + init-brt =3D /bits/ 8 <0x3f>; + rom_a0h { + rom-addr =3D /bits/ 8 <0xa0>; + rom-val =3D /bits/ 8 <0xff>; + }; + rom_a1h { + rom-addr =3D /bits/ 8 <0xa1>; + rom-val =3D /bits/ 8 <0x3f>; + }; + rom_a2h { + rom-addr =3D /bits/ 8 <0xa2>; + rom-val =3D /bits/ 8 <0x20>; + }; + rom_a3h { + rom-addr =3D /bits/ 8 <0xa3>; + rom-val =3D /bits/ 8 <0x5e>; + }; + rom_a4h { + rom-addr =3D /bits/ 8 <0xa4>; + rom-val =3D /bits/ 8 <0x02>; + }; + rom_a5h { + rom-addr =3D /bits/ 8 <0xa5>; + rom-val =3D /bits/ 8 <0x04>; + }; + rom_a6h { + rom-addr =3D /bits/ 8 <0xa6>; + rom-val =3D /bits/ 8 <0x80>; + }; + rom_a7h { + rom-addr =3D /bits/ 8 <0xa7>; + rom-val =3D /bits/ 8 <0xf7>; + }; + rom_a9h { + rom-addr =3D /bits/ 8 <0xa9>; + rom-val =3D /bits/ 8 <0x80>; + }; + rom_aah { + rom-addr =3D /bits/ 8 <0xaa>; + rom-val =3D /bits/ 8 <0x0f>; + }; + rom_aeh { + rom-addr =3D /bits/ 8 <0xae>; + rom-val =3D /bits/ 8 <0x0f>; }; }; +}; + +&blsp1_uart2 { + status =3D "okay"; =20 - sdhci@f98a4900 { - status =3D "okay"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&blsp1_uart2_pin_a>; +}; =20 - bus-width =3D <4>; +&blsp2_uart7 { + status =3D "ok"; =20 - vmmc-supply =3D <&pm8941_l21>; - vqmmc-supply =3D <&pm8941_l13>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&blsp2_uart7_pin_a>; =20 - cd-gpios =3D <&msmgpio 62 GPIO_ACTIVE_LOW>; + bluetooth { + compatible =3D "brcm,bcm43438-bt"; + max-speed =3D <3000000>; =20 pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>; + pinctrl-0 =3D <&bt_host_wake_pin>, + <&bt_dev_wake_pin>, + <&bt_reg_on_pin>; + + host-wakeup-gpios =3D <&msmgpio 95 GPIO_ACTIVE_HIGH>; + device-wakeup-gpios =3D <&msmgpio 96 GPIO_ACTIVE_HIGH>; + shutdown-gpios =3D <&pm8941_gpios 16 GPIO_ACTIVE_HIGH>; }; +}; =20 - serial@f991e000 { - status =3D "okay"; +&msmgpio { + blsp1_uart2_pin_a: blsp1-uart2-pin-active { + rx { + pins =3D "gpio5"; + function =3D "blsp_uart2"; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&blsp1_uart2_pin_a>; + drive-strength =3D <2>; + bias-pull-up; + }; + + tx { + pins =3D "gpio4"; + function =3D "blsp_uart2"; + + drive-strength =3D <4>; + bias-disable; + }; }; =20 - serial@f995d000 { - status =3D "ok"; + blsp2_uart7_pin_a: blsp2-uart7-pin-active { + tx { + pins =3D "gpio41"; + function =3D "blsp_uart7"; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&blsp2_uart7_pin_a>; + drive-strength =3D <2>; + bias-disable; + }; + + rx { + pins =3D "gpio42"; + function =3D "blsp_uart7"; =20 - bluetooth { - compatible =3D "brcm,bcm43438-bt"; - max-speed =3D <3000000>; + drive-strength =3D <2>; + bias-pull-up; + }; + + cts { + pins =3D "gpio43"; + function =3D "blsp_uart7"; + + drive-strength =3D <2>; + bias-pull-up; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&bt_host_wake_pin>, - <&bt_dev_wake_pin>, - <&bt_reg_on_pin>; + rts { + pins =3D "gpio44"; + function =3D "blsp_uart7"; =20 - host-wakeup-gpios =3D <&msmgpio 95 GPIO_ACTIVE_HIGH>; - device-wakeup-gpios =3D <&msmgpio 96 GPIO_ACTIVE_HIGH>; - shutdown-gpios =3D <&pm8941_gpios 16 GPIO_ACTIVE_HIGH>; + drive-strength =3D <2>; + bias-disable; }; }; =20 - usb@f9a55000 { - status =3D "okay"; + i2c8_pins: i2c8 { + mux { + pins =3D "gpio47", "gpio48"; + function =3D "blsp_i2c8"; =20 - phys =3D <&usb_hs1_phy>; - phy-select =3D <&tcsr 0xb000 0>; - extcon =3D <&smbb>, <&usb_id>; - vbus-supply =3D <&chg_otg>; + drive-strength =3D <2>; + bias-disable; + }; + }; =20 - hnp-disable; - srp-disable; - adp-disable; + i2c11_pins: i2c11 { + mux { + pins =3D "gpio83", "gpio84"; + function =3D "blsp_i2c11"; =20 - ulpi { - phy@a { - status =3D "okay"; + drive-strength =3D <2>; + bias-disable; + }; + }; =20 - v1p8-supply =3D <&pm8941_l6>; - v3p3-supply =3D <&pm8941_l24>; + lcd_backlight_en_pin_a: lcd-backlight-vddio { + pins =3D "gpio69"; + drive-strength =3D <10>; + output-low; + bias-disable; + }; =20 - extcon =3D <&smbb>; - qcom,init-seq =3D /bits/ 8 <0x1 0x64>; - }; + sdhc1_pin_a: sdhc1-pin-active { + clk { + pins =3D "sdc1_clk"; + drive-strength =3D <16>; + bias-disable; + }; + + cmd-data { + pins =3D "sdc1_cmd", "sdc1_data"; + drive-strength =3D <10>; + bias-pull-up; }; }; =20 - pinctrl@fd510000 { - blsp1_uart2_pin_a: blsp1-uart2-pin-active { - rx { - pins =3D "gpio5"; - function =3D "blsp_uart2"; + sdhc2_cd_pin_a: sdhc2-cd-pin-active { + pins =3D "gpio62"; + function =3D "gpio"; =20 - drive-strength =3D <2>; - bias-pull-up; - }; + drive-strength =3D <2>; + bias-disable; + }; =20 - tx { - pins =3D "gpio4"; - function =3D "blsp_uart2"; + sdhc2_pin_a: sdhc2-pin-active { + clk { + pins =3D "sdc2_clk"; + drive-strength =3D <6>; + bias-disable; + }; =20 - drive-strength =3D <4>; - bias-disable; - }; + cmd-data { + pins =3D "sdc2_cmd", "sdc2_data"; + drive-strength =3D <6>; + bias-pull-up; }; + }; =20 - blsp2_uart7_pin_a: blsp2-uart7-pin-active { - tx { - pins =3D "gpio41"; - function =3D "blsp_uart7"; + sdhc3_pin_a: sdhc3-pin-active { + clk { + pins =3D "gpio40"; + function =3D "sdc3"; =20 - drive-strength =3D <2>; - bias-disable; - }; + drive-strength =3D <10>; + bias-disable; + }; =20 - rx { - pins =3D "gpio42"; - function =3D "blsp_uart7"; + cmd { + pins =3D "gpio39"; + function =3D "sdc3"; =20 - drive-strength =3D <2>; - bias-pull-up; - }; + drive-strength =3D <10>; + bias-pull-up; + }; =20 - cts { - pins =3D "gpio43"; - function =3D "blsp_uart7"; + data { + pins =3D "gpio35", "gpio36", "gpio37", "gpio38"; + function =3D "sdc3"; =20 - drive-strength =3D <2>; - bias-pull-up; - }; + drive-strength =3D <10>; + bias-pull-up; + }; + }; =20 - rts { - pins =3D "gpio44"; - function =3D "blsp_uart7"; + ts_int_pin: synaptics { + pin { + pins =3D "gpio86"; + function =3D "gpio"; =20 - drive-strength =3D <2>; - bias-disable; - }; + drive-strength =3D <2>; + bias-disable; + input-enable; }; + }; =20 - i2c8_pins: i2c8 { - mux { - pins =3D "gpio47", "gpio48"; - function =3D "blsp_i2c8"; + bt_host_wake_pin: bt-host-wake { + pins =3D "gpio95"; + function =3D "gpio"; =20 - drive-strength =3D <2>; - bias-disable; - }; + drive-strength =3D <2>; + bias-disable; + output-low; + }; + + bt_dev_wake_pin: bt-dev-wake { + pins =3D "gpio96"; + function =3D "gpio"; + + drive-strength =3D <2>; + bias-disable; + }; +}; + +&otg { + status =3D "okay"; + + phys =3D <&usb_hs1_phy>; + phy-select =3D <&tcsr 0xb000 0>; + extcon =3D <&smbb>, <&usb_id>; + vbus-supply =3D <&chg_otg>; + + hnp-disable; + srp-disable; + adp-disable; + + ulpi { + phy@a { + status =3D "okay"; + + v1p8-supply =3D <&pm8941_l6>; + v3p3-supply =3D <&pm8941_l24>; + + extcon =3D <&smbb>; + qcom,init-seq =3D /bits/ 8 <0x1 0x64>; + }; + }; +}; + +&rpm_requests { + pm8941-regulators { + vdd_l1_l3-supply =3D <&pm8941_s1>; + vdd_l2_lvs1_2_3-supply =3D <&pm8941_s3>; + vdd_l4_l11-supply =3D <&pm8941_s1>; + vdd_l5_l7-supply =3D <&pm8941_s2>; + vdd_l6_l12_l14_l15-supply =3D <&pm8941_s2>; + vdd_l9_l10_l17_l22-supply =3D <&vreg_boost>; + vdd_l13_l20_l23_l24-supply =3D <&vreg_boost>; + vdd_l21-supply =3D <&vreg_boost>; + + s1 { + regulator-min-microvolt =3D <1300000>; + regulator-max-microvolt =3D <1300000>; + regulator-always-on; + regulator-boot-on; }; =20 - i2c11_pins: i2c11 { - mux { - pins =3D "gpio83", "gpio84"; - function =3D "blsp_i2c11"; + s2 { + regulator-min-microvolt =3D <2150000>; + regulator-max-microvolt =3D <2150000>; + regulator-boot-on; + }; =20 - drive-strength =3D <2>; - bias-disable; - }; + s3 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + regulator-always-on; + regulator-boot-on; + + regulator-system-load =3D <154000>; }; =20 - lcd_backlight_en_pin_a: lcd-backlight-vddio { - pins =3D "gpio69"; - drive-strength =3D <10>; - output-low; - bias-disable; + s4 { + regulator-min-microvolt =3D <5000000>; + regulator-max-microvolt =3D <5000000>; }; =20 - sdhc1_pin_a: sdhc1-pin-active { - clk { - pins =3D "sdc1_clk"; - drive-strength =3D <16>; - bias-disable; - }; + l1 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; =20 - cmd-data { - pins =3D "sdc1_cmd", "sdc1_data"; - drive-strength =3D <10>; - bias-pull-up; - }; + regulator-always-on; + regulator-boot-on; }; =20 - sdhc2_cd_pin_a: sdhc2-cd-pin-active { - pins =3D "gpio62"; - function =3D "gpio"; + l2 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; + }; =20 - drive-strength =3D <2>; - bias-disable; - }; + l3 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; + }; =20 - sdhc2_pin_a: sdhc2-pin-active { - clk { - pins =3D "sdc2_clk"; - drive-strength =3D <6>; - bias-disable; - }; + l4 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; + }; =20 - cmd-data { - pins =3D "sdc2_cmd", "sdc2_data"; - drive-strength =3D <6>; - bias-pull-up; - }; + l5 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; }; =20 - sdhc3_pin_a: sdhc3-pin-active { - clk { - pins =3D "gpio40"; - function =3D "sdc3"; + l6 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; =20 - drive-strength =3D <10>; - bias-disable; - }; + regulator-boot-on; + }; =20 - cmd { - pins =3D "gpio39"; - function =3D "sdc3"; + l7 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; =20 - drive-strength =3D <10>; - bias-pull-up; - }; + regulator-boot-on; + }; =20 - data { - pins =3D "gpio35", "gpio36", "gpio37", "gpio38"; - function =3D "sdc3"; + l8 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - drive-strength =3D <10>; - bias-pull-up; - }; + l9 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; }; =20 - ts_int_pin: synaptics { - pin { - pins =3D "gpio86"; - function =3D "gpio"; + l11 { + regulator-min-microvolt =3D <1300000>; + regulator-max-microvolt =3D <1350000>; + }; =20 - drive-strength =3D <2>; - bias-disable; - input-enable; - }; + l12 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + + regulator-always-on; + regulator-boot-on; }; =20 - bt_host_wake_pin: bt-host-wake { - pins =3D "gpio95"; - function =3D "gpio"; + l13 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; =20 - drive-strength =3D <2>; - bias-disable; - output-low; + regulator-boot-on; }; =20 - bt_dev_wake_pin: bt-dev-wake { - pins =3D "gpio96"; - function =3D "gpio"; + l14 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - drive-strength =3D <2>; - bias-disable; + l15 { + regulator-min-microvolt =3D <2050000>; + regulator-max-microvolt =3D <2050000>; }; - }; =20 - i2c@f9964000 { - status =3D "okay"; + l16 { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <2700000>; + }; =20 - clock-frequency =3D <355000>; - qcom,src-freq =3D <50000000>; + l17 { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <2700000>; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&i2c8_pins>; + l18 { + regulator-min-microvolt =3D <2850000>; + regulator-max-microvolt =3D <2850000>; + }; + + l19 { + regulator-min-microvolt =3D <2850000>; + regulator-max-microvolt =3D <2850000>; + }; =20 - synaptics@2c { - compatible =3D "syna,rmi4-i2c"; - reg =3D <0x2c>; + l20 { + regulator-min-microvolt =3D <2950000>; + regulator-max-microvolt =3D <2950000>; =20 - interrupt-parent =3D <&msmgpio>; - interrupts =3D <86 IRQ_TYPE_EDGE_FALLING>; + regulator-allow-set-load; + regulator-boot-on; + regulator-allow-set-load; + regulator-system-load =3D <500000>; + }; =20 - #address-cells =3D <1>; - #size-cells =3D <0>; + l21 { + regulator-min-microvolt =3D <2950000>; + regulator-max-microvolt =3D <2950000>; =20 - vdd-supply =3D <&pm8941_l22>; - vio-supply =3D <&pm8941_lvs3>; + regulator-boot-on; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&ts_int_pin>; + l22 { + regulator-min-microvolt =3D <3000000>; + regulator-max-microvolt =3D <3000000>; + }; =20 - syna,startup-delay-ms =3D <10>; + l23 { + regulator-min-microvolt =3D <2800000>; + regulator-max-microvolt =3D <2800000>; + }; =20 - rmi-f01@1 { - reg =3D <0x1>; - syna,nosleep =3D <1>; - }; + l24 { + regulator-min-microvolt =3D <3075000>; + regulator-max-microvolt =3D <3075000>; =20 - rmi-f11@11 { - reg =3D <0x11>; - syna,f11-flip-x =3D <1>; - syna,sensor-type =3D <1>; - }; + regulator-boot-on; }; }; +}; + +&sdhci1 { + status =3D "okay"; + + vmmc-supply =3D <&pm8941_l20>; + vqmmc-supply =3D <&pm8941_s3>; + + bus-width =3D <8>; + non-removable; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc1_pin_a>; +}; + +&sdhci2 { + status =3D "okay"; + + max-frequency =3D <100000000>; + non-removable; + vmmc-supply =3D <&vreg_wlan>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc3_pin_a>; + + #address-cells =3D <1>; + #size-cells =3D <0>; + + bcrmf@1 { + compatible =3D "brcm,bcm4339-fmac", "brcm,bcm4329-fmac"; + reg =3D <1>; + + brcm,drive-strength =3D <10>; =20 - i2c@f9967000 { - status =3D "okay"; pinctrl-names =3D "default"; - pinctrl-0 =3D <&i2c11_pins>; - clock-frequency =3D <355000>; - qcom,src-freq =3D <50000000>; - - lp8566_wled: backlight@2c { - compatible =3D "ti,lp8556"; - reg =3D <0x2c>; - power-supply =3D <&vreg_bl_vddio>; - - bl-name =3D "backlight"; - dev-ctrl =3D /bits/ 8 <0x05>; - init-brt =3D /bits/ 8 <0x3f>; - rom_a0h { - rom-addr =3D /bits/ 8 <0xa0>; - rom-val =3D /bits/ 8 <0xff>; - }; - rom_a1h { - rom-addr =3D /bits/ 8 <0xa1>; - rom-val =3D /bits/ 8 <0x3f>; - }; - rom_a2h { - rom-addr =3D /bits/ 8 <0xa2>; - rom-val =3D /bits/ 8 <0x20>; - }; - rom_a3h { - rom-addr =3D /bits/ 8 <0xa3>; - rom-val =3D /bits/ 8 <0x5e>; - }; - rom_a4h { - rom-addr =3D /bits/ 8 <0xa4>; - rom-val =3D /bits/ 8 <0x02>; - }; - rom_a5h { - rom-addr =3D /bits/ 8 <0xa5>; - rom-val =3D /bits/ 8 <0x04>; - }; - rom_a6h { - rom-addr =3D /bits/ 8 <0xa6>; - rom-val =3D /bits/ 8 <0x80>; - }; - rom_a7h { - rom-addr =3D /bits/ 8 <0xa7>; - rom-val =3D /bits/ 8 <0xf7>; - }; - rom_a9h { - rom-addr =3D /bits/ 8 <0xa9>; - rom-val =3D /bits/ 8 <0x80>; - }; - rom_aah { - rom-addr =3D /bits/ 8 <0xaa>; - rom-val =3D /bits/ 8 <0x0f>; - }; - rom_aeh { - rom-addr =3D /bits/ 8 <0xae>; - rom-val =3D /bits/ 8 <0x0f>; - }; - }; + pinctrl-0 =3D <&wlan_sleep_clk_pin>; }; }; =20 +&sdhci3 { + status =3D "okay"; + + bus-width =3D <4>; + + vmmc-supply =3D <&pm8941_l21>; + vqmmc-supply =3D <&pm8941_l13>; + + cd-gpios =3D <&msmgpio 62 GPIO_ACTIVE_LOW>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>; +}; + &spmi_bus { pm8941@0 { charger@1000 { diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts b/arch/a= rm/boot/dts/qcom-msm8974-sony-xperia-honami.dts index a62e5c25b23c..a98aa3e11edf 100644 --- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts +++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts @@ -57,388 +57,382 @@ memory@0 { reg =3D <0 0x40000000>, <0x40000000 0x40000000>; device_type =3D "memory"; }; +}; =20 - smd { - rpm { - rpm_requests { - pm8841-regulators { - s1 { - regulator-min-microvolt =3D <675000>; - regulator-max-microvolt =3D <1050000>; - }; - - s2 { - regulator-min-microvolt =3D <500000>; - regulator-max-microvolt =3D <1050000>; - }; - - s3 { - regulator-min-microvolt =3D <500000>; - regulator-max-microvolt =3D <1050000>; - }; - - s4 { - regulator-min-microvolt =3D <500000>; - regulator-max-microvolt =3D <1050000>; - }; - }; - - pm8941-regulators { - vdd_l1_l3-supply =3D <&pm8941_s1>; - vdd_l2_lvs1_2_3-supply =3D <&pm8941_s3>; - vdd_l4_l11-supply =3D <&pm8941_s1>; - vdd_l5_l7-supply =3D <&pm8941_s2>; - vdd_l6_l12_l14_l15-supply =3D <&pm8941_s2>; - vdd_l9_l10_l17_l22-supply =3D <&vreg_boost>; - vdd_l13_l20_l23_l24-supply =3D <&vreg_boost>; - vdd_l21-supply =3D <&vreg_boost>; - - s1 { - regulator-min-microvolt =3D <1300000>; - regulator-max-microvolt =3D <1300000>; - regulator-always-on; - regulator-boot-on; - }; - - s2 { - regulator-min-microvolt =3D <2150000>; - regulator-max-microvolt =3D <2150000>; - regulator-boot-on; - }; - - s3 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - regulator-always-on; - regulator-boot-on; - }; - - s4 { - regulator-min-microvolt =3D <5000000>; - regulator-max-microvolt =3D <5000000>; - }; - - l1 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - - regulator-always-on; - regulator-boot-on; - }; - - l2 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - }; - - l3 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - }; - - l4 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - }; - - l5 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l6 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-boot-on; - }; - - l7 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-boot-on; - }; - - l8 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l9 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - }; - - l11 { - regulator-min-microvolt =3D <1300000>; - regulator-max-microvolt =3D <1350000>; - }; - - l12 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - - regulator-always-on; - regulator-boot-on; - }; - - l13 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - - regulator-boot-on; - }; - - l14 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - l15 { - regulator-min-microvolt =3D <2050000>; - regulator-max-microvolt =3D <2050000>; - }; - - l16 { - regulator-min-microvolt =3D <2700000>; - regulator-max-microvolt =3D <2700000>; - }; - - l17 { - regulator-min-microvolt =3D <2700000>; - regulator-max-microvolt =3D <2700000>; - }; - - l18 { - regulator-min-microvolt =3D <2850000>; - regulator-max-microvolt =3D <2850000>; - }; - - l19 { - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - }; - - l20 { - regulator-min-microvolt =3D <2950000>; - regulator-max-microvolt =3D <2950000>; - - regulator-allow-set-load; - regulator-boot-on; - regulator-system-load =3D <200000>; - }; - - l21 { - regulator-min-microvolt =3D <2950000>; - regulator-max-microvolt =3D <2950000>; - - regulator-boot-on; - }; - - l22 { - regulator-min-microvolt =3D <3000000>; - regulator-max-microvolt =3D <3000000>; - }; - - l23 { - regulator-min-microvolt =3D <2800000>; - regulator-max-microvolt =3D <2800000>; - }; - - l24 { - regulator-min-microvolt =3D <3075000>; - regulator-max-microvolt =3D <3075000>; - - regulator-boot-on; - }; - }; - }; +&blsp_i2c2 { + status =3D "okay"; + + clock-frequency =3D <355000>; + qcom,src-freq =3D <50000000>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c2_pins>; + + synaptics@2c { + compatible =3D "syna,rmi4-i2c"; + reg =3D <0x2c>; + + interrupts-extended =3D <&msmgpio 61 IRQ_TYPE_EDGE_FALLING>; + + #address-cells =3D <1>; + #size-cells =3D <0>; + + vdd-supply =3D <&pm8941_l22>; + vio-supply =3D <&pm8941_lvs3>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&ts_int_pin>; + + syna,startup-delay-ms =3D <10>; + + rmi4-f01@1 { + reg =3D <0x1>; + syna,nosleep-mode =3D <1>; + }; + + rmi4-f11@11 { + reg =3D <0x11>; + touchscreen-inverted-x; + syna,sensor-type =3D <1>; }; }; }; =20 -&soc { - usb@f9a55000 { - status =3D "okay"; +&blsp1_uart2 { + status =3D "okay"; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&blsp1_uart2_pin_a>; +}; =20 - phys =3D <&usb_hs1_phy>; - phy-select =3D <&tcsr 0xb000 0>; - extcon =3D <&smbb>, <&usb_id>; - vbus-supply =3D <&chg_otg>; +&blsp2_dma { + qcom,controlled-remotely; +}; =20 - hnp-disable; - srp-disable; - adp-disable; +&msmgpio { + blsp1_uart2_pin_a: blsp1-uart2-pin-active { + rx { + pins =3D "gpio5"; + function =3D "blsp_uart2"; =20 - ulpi { - phy@a { - status =3D "okay"; + drive-strength =3D <2>; + bias-pull-up; + }; =20 - v1p8-supply =3D <&pm8941_l6>; - v3p3-supply =3D <&pm8941_l24>; + tx { + pins =3D "gpio4"; + function =3D "blsp_uart2"; =20 - extcon =3D <&smbb>; - qcom,init-seq =3D /bits/ 8 <0x1 0x64>; - }; + drive-strength =3D <4>; + bias-disable; }; }; =20 - sdhci@f9824900 { - status =3D "okay"; + i2c2_pins: i2c2 { + mux { + pins =3D "gpio6", "gpio7"; + function =3D "blsp_i2c2"; =20 - vmmc-supply =3D <&pm8941_l20>; - vqmmc-supply =3D <&pm8941_s3>; + drive-strength =3D <2>; + bias-disable; + }; + }; =20 - bus-width =3D <8>; - non-removable; + sdhc1_pin_a: sdhc1-pin-active { + clk { + pins =3D "sdc1_clk"; + drive-strength =3D <16>; + bias-disable; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc1_pin_a>; + cmd-data { + pins =3D "sdc1_cmd", "sdc1_data"; + drive-strength =3D <10>; + bias-pull-up; + }; }; =20 - sdhci@f98a4900 { - status =3D "okay"; + sdhc2_cd_pin_a: sdhc2-cd-pin-active { + pins =3D "gpio62"; + function =3D "gpio"; =20 - bus-width =3D <4>; + drive-strength =3D <2>; + bias-disable; + }; =20 - vmmc-supply =3D <&pm8941_l21>; - vqmmc-supply =3D <&pm8941_l13>; + sdhc2_pin_a: sdhc2-pin-active { + clk { + pins =3D "sdc2_clk"; + drive-strength =3D <10>; + bias-disable; + }; =20 - cd-gpios =3D <&msmgpio 62 GPIO_ACTIVE_LOW>; + cmd-data { + pins =3D "sdc2_cmd", "sdc2_data"; + drive-strength =3D <6>; + bias-pull-up; + }; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>; + ts_int_pin: touch-int { + pin { + pins =3D "gpio61"; + function =3D "gpio"; + + drive-strength =3D <2>; + bias-disable; + input-enable; + }; }; +}; =20 - serial@f991e000 { - status =3D "okay"; +&otg { + status =3D "okay"; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&blsp1_uart2_pin_a>; + phys =3D <&usb_hs1_phy>; + phy-select =3D <&tcsr 0xb000 0>; + extcon =3D <&smbb>, <&usb_id>; + vbus-supply =3D <&chg_otg>; + + hnp-disable; + srp-disable; + adp-disable; + + ulpi { + phy@a { + status =3D "okay"; + + v1p8-supply =3D <&pm8941_l6>; + v3p3-supply =3D <&pm8941_l24>; + + extcon =3D <&smbb>; + qcom,init-seq =3D /bits/ 8 <0x1 0x64>; + }; }; +}; =20 - i2c@f9924000 { - status =3D "okay"; +&rpm_requests { + pm8841-regulators { + s1 { + regulator-min-microvolt =3D <675000>; + regulator-max-microvolt =3D <1050000>; + }; =20 - clock-frequency =3D <355000>; - qcom,src-freq =3D <50000000>; + s2 { + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1050000>; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&i2c2_pins>; + s3 { + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1050000>; + }; =20 - synaptics@2c { - compatible =3D "syna,rmi4-i2c"; - reg =3D <0x2c>; + s4 { + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1050000>; + }; + }; =20 - interrupts-extended =3D <&msmgpio 61 IRQ_TYPE_EDGE_FALLING>; + pm8941-regulators { + vdd_l1_l3-supply =3D <&pm8941_s1>; + vdd_l2_lvs1_2_3-supply =3D <&pm8941_s3>; + vdd_l4_l11-supply =3D <&pm8941_s1>; + vdd_l5_l7-supply =3D <&pm8941_s2>; + vdd_l6_l12_l14_l15-supply =3D <&pm8941_s2>; + vdd_l9_l10_l17_l22-supply =3D <&vreg_boost>; + vdd_l13_l20_l23_l24-supply =3D <&vreg_boost>; + vdd_l21-supply =3D <&vreg_boost>; + + s1 { + regulator-min-microvolt =3D <1300000>; + regulator-max-microvolt =3D <1300000>; + regulator-always-on; + regulator-boot-on; + }; =20 - #address-cells =3D <1>; - #size-cells =3D <0>; + s2 { + regulator-min-microvolt =3D <2150000>; + regulator-max-microvolt =3D <2150000>; + regulator-boot-on; + }; =20 - vdd-supply =3D <&pm8941_l22>; - vio-supply =3D <&pm8941_lvs3>; + s3 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + regulator-always-on; + regulator-boot-on; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&ts_int_pin>; + s4 { + regulator-min-microvolt =3D <5000000>; + regulator-max-microvolt =3D <5000000>; + }; =20 - syna,startup-delay-ms =3D <10>; + l1 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; =20 - rmi4-f01@1 { - reg =3D <0x1>; - syna,nosleep-mode =3D <1>; - }; + regulator-always-on; + regulator-boot-on; + }; =20 - rmi4-f11@11 { - reg =3D <0x11>; - touchscreen-inverted-x; - syna,sensor-type =3D <1>; - }; + l2 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; }; - }; =20 - pinctrl@fd510000 { - blsp1_uart2_pin_a: blsp1-uart2-pin-active { - rx { - pins =3D "gpio5"; - function =3D "blsp_uart2"; + l3 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; + }; =20 - drive-strength =3D <2>; - bias-pull-up; - }; + l4 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; + }; =20 - tx { - pins =3D "gpio4"; - function =3D "blsp_uart2"; + l5 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - drive-strength =3D <4>; - bias-disable; - }; + l6 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + + regulator-boot-on; }; =20 - i2c2_pins: i2c2 { - mux { - pins =3D "gpio6", "gpio7"; - function =3D "blsp_i2c2"; + l7 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; =20 - drive-strength =3D <2>; - bias-disable; - }; + regulator-boot-on; }; =20 - sdhc1_pin_a: sdhc1-pin-active { - clk { - pins =3D "sdc1_clk"; - drive-strength =3D <16>; - bias-disable; - }; + l8 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - cmd-data { - pins =3D "sdc1_cmd", "sdc1_data"; - drive-strength =3D <10>; - bias-pull-up; - }; + l9 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; }; =20 - sdhc2_cd_pin_a: sdhc2-cd-pin-active { - pins =3D "gpio62"; - function =3D "gpio"; + l11 { + regulator-min-microvolt =3D <1300000>; + regulator-max-microvolt =3D <1350000>; + }; =20 - drive-strength =3D <2>; - bias-disable; - }; + l12 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; =20 - sdhc2_pin_a: sdhc2-pin-active { - clk { - pins =3D "sdc2_clk"; - drive-strength =3D <10>; - bias-disable; - }; + regulator-always-on; + regulator-boot-on; + }; =20 - cmd-data { - pins =3D "sdc2_cmd", "sdc2_data"; - drive-strength =3D <6>; - bias-pull-up; - }; + l13 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; + + regulator-boot-on; }; =20 - ts_int_pin: touch-int { - pin { - pins =3D "gpio61"; - function =3D "gpio"; + l14 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - drive-strength =3D <2>; - bias-disable; - input-enable; - }; + l15 { + regulator-min-microvolt =3D <2050000>; + regulator-max-microvolt =3D <2050000>; + }; + + l16 { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <2700000>; }; - }; =20 - dma-controller@f9944000 { - qcom,controlled-remotely; + l17 { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <2700000>; + }; + + l18 { + regulator-min-microvolt =3D <2850000>; + regulator-max-microvolt =3D <2850000>; + }; + + l19 { + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + }; + + l20 { + regulator-min-microvolt =3D <2950000>; + regulator-max-microvolt =3D <2950000>; + + regulator-allow-set-load; + regulator-boot-on; + regulator-system-load =3D <200000>; + }; + + l21 { + regulator-min-microvolt =3D <2950000>; + regulator-max-microvolt =3D <2950000>; + + regulator-boot-on; + }; + + l22 { + regulator-min-microvolt =3D <3000000>; + regulator-max-microvolt =3D <3000000>; + }; + + l23 { + regulator-min-microvolt =3D <2800000>; + regulator-max-microvolt =3D <2800000>; + }; + + l24 { + regulator-min-microvolt =3D <3075000>; + regulator-max-microvolt =3D <3075000>; + + regulator-boot-on; + }; }; }; =20 +&sdhci1 { + status =3D "okay"; + + vmmc-supply =3D <&pm8941_l20>; + vqmmc-supply =3D <&pm8941_s3>; + + bus-width =3D <8>; + non-removable; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc1_pin_a>; +}; + +&sdhci3 { + status =3D "okay"; + + bus-width =3D <4>; + + vmmc-supply =3D <&pm8941_l21>; + vqmmc-supply =3D <&pm8941_l13>; + + cd-gpios =3D <&msmgpio 62 GPIO_ACTIVE_LOW>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>; +}; + &spmi_bus { pm8941@0 { charger@1000 { diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-m= sm8974.dtsi index 412d94736c35..02b73739b6f3 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -742,7 +742,7 @@ blsp2_uart10: serial@f9960000 { status =3D "disabled"; }; =20 - sdhci@f9824900 { + sdhci1: sdhci@f9824900 { compatible =3D "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0xf9824900 0x11c>, <0xf9824000 0x800>; reg-names =3D "hc_mem", "core_mem"; @@ -756,7 +756,7 @@ sdhci@f9824900 { status =3D "disabled"; }; =20 - sdhci@f9864900 { + sdhci2: sdhci@f9864900 { compatible =3D "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0xf9864900 0x11c>, <0xf9864000 0x800>; reg-names =3D "hc_mem", "core_mem"; @@ -770,7 +770,7 @@ sdhci@f9864900 { status =3D "disabled"; }; =20 - sdhci@f98a4900 { + sdhci3: sdhci@f98a4900 { compatible =3D "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0xf98a4900 0x11c>, <0xf98a4000 0x800>; reg-names =3D "hc_mem", "core_mem"; @@ -835,7 +835,7 @@ rng@f9bff000 { clock-names =3D "core"; }; =20 - remoteproc@fc880000 { + mss_pil: remoteproc@fc880000 { compatible =3D "qcom,msm8974-mss-pil"; reg =3D <0xfc880000 0x100>, <0xfc820000 0x020>; reg-names =3D "qdsp6", "rmb"; @@ -959,7 +959,7 @@ msmgpio: pinctrl@fd510000 { interrupts =3D ; }; =20 - i2c@f9923000 { + blsp_i2c1: i2c@f9923000 { status =3D "disabled"; compatible =3D "qcom,i2c-qup-v2.1.1"; reg =3D <0xf9923000 0x1000>; @@ -970,7 +970,7 @@ i2c@f9923000 { #size-cells =3D <0>; }; =20 - i2c@f9924000 { + blsp_i2c2: i2c@f9924000 { status =3D "disabled"; compatible =3D "qcom,i2c-qup-v2.1.1"; reg =3D <0xf9924000 0x1000>; @@ -1594,7 +1594,7 @@ dsi_phy0: dsi-phy@fd922a00 { }; }; =20 - imem@fe805000 { + imem: imem@fe805000 { status =3D "disabled"; compatible =3D "syscon", "simple-mfd"; reg =3D <0xfe805000 0x1000>; @@ -1614,7 +1614,7 @@ rpm { qcom,ipc =3D <&apcs 8 0>; qcom,smd-edge =3D <15>; =20 - rpm_requests { + rpm_requests: rpm_requests { compatible =3D "qcom,rpm-msm8974"; qcom,smd-channels =3D "rpm_requests"; =20 --=20 2.32.0 From nobody Fri Jun 19 16:08:04 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89567C4332F for ; Fri, 1 Apr 2022 20:11:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350742AbiDAUNE (ORCPT ); Fri, 1 Apr 2022 16:13:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351714AbiDAUMu (ORCPT ); Fri, 1 Apr 2022 16:12:50 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0255521F771 for ; Fri, 1 Apr 2022 13:10:53 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id i27so977363ejd.9 for ; Fri, 01 Apr 2022 13:10:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IQGxa9YyQHssOaxTF+81MuRID8PvCkcvsqC5/ruRgAI=; b=ajcIgZ21mlt1P7xVB3m97uhBbo5eq9fYAbL84nRjPnprks1EJmazXbOpopDpf0XuyL XEnFLk7v9NZCqLt3/z4Zhy5hOsPdYsLc4TIhl8KaBnc5ynF1xhyyvR2EaHoH+JuDQalM +zVUeT4Tdxc+Tn8z5m5xG/XFuyrvXceX1Jp2YXWa9ahN7rZpGFL7kODXiMa7E9o/W3NJ uzBXMLc6vqCgbQT9me/LD8y2TQlyeO9ZxEFdhSlgGiquLcJlVeox4QMCThDlwfUi5J+x eaCIdvdo40ucoE99DXM4HOmI2DD/RvREBnknpJhcIBlKcxs7Ixf1W6lm95DGQTiEvF9O LdLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IQGxa9YyQHssOaxTF+81MuRID8PvCkcvsqC5/ruRgAI=; b=6c5g1EqujOfx9VWCxSR031CfGOureSeuC2QEf1Fd5A4zngTbUDCyL0stJVb8bgex16 566QeBlv5aRet08OC0KiZPRYVb6C58UcnWJeKL1JvliP58CLKb0WH75rpjCLWmkN0U7t guTJRatmT2KLGHEAH09RAwkRHzOwPwF4WcLcfWQpnfpyfv241CJAtZvneCkNcHLrQH9c 56lU3F+QOz+F1hDtvYaArM/cqIEP1h/g3gdX0nrN7KneXA/CkW76Pk01l+Xwiyx//pYc uTPV7DKMLN5hiU7iwyfKcnI7wAPJlgVuXq2iZS5jbKbxcXWTTnTwBHhiaxEx5IC21MAp bsEA== X-Gm-Message-State: AOAM531+e8hxfHDxPD0shovxm5vGozgzc4MFhW0nu6kUbwXAa7eYdjKi vuIBHmBPzwn9WQiQTsiOpZMAMA== X-Google-Smtp-Source: ABdhPJxTegazsyWBxTRPRVL6sJAU+mF+4gQcuAxJyef2+FyKoXIYO8kcy4rB3U3DTP4WBWFTuW6nyw== X-Received: by 2002:a17:907:a40e:b0:6e0:5c84:9ced with SMTP id sg14-20020a170907a40e00b006e05c849cedmr1314966ejc.284.1648843852371; Fri, 01 Apr 2022 13:10:52 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-201-27.adslplus.ch. [188.155.201.27]) by smtp.gmail.com with ESMTPSA id bx5-20020a0564020b4500b00418fca53406sm1509041edb.27.2022.04.01.13.10.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 13:10:51 -0700 (PDT) From: Krzysztof Kozlowski To: Bjorn Andersson , Andy Gross , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , Mathieu Poirier , Kathiravan T , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 07/10] ARM: dts: qcom: do not use underscore in node name Date: Fri, 1 Apr 2022 22:10:32 +0200 Message-Id: <20220401201035.189106-8-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> References: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Align RPM requests node with DT schema by using hyphen instead of underscore. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/qcom-apq8064.dtsi | 8 ++++---- arch/arm/boot/dts/qcom-apq8084.dtsi | 2 +- arch/arm/boot/dts/qcom-msm8974.dtsi | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-a= pq8064.dtsi index a1c8ae516d21..33a4d3441959 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -227,7 +227,7 @@ smem { smd { compatible =3D "qcom,smd"; =20 - modem@0 { + modem-edge { interrupts =3D <0 37 IRQ_TYPE_EDGE_RISING>; =20 qcom,ipc =3D <&l2cc 8 3>; @@ -236,7 +236,7 @@ modem@0 { status =3D "disabled"; }; =20 - q6@1 { + q6-edge { interrupts =3D <0 90 IRQ_TYPE_EDGE_RISING>; =20 qcom,ipc =3D <&l2cc 8 15>; @@ -245,7 +245,7 @@ q6@1 { status =3D "disabled"; }; =20 - dsps@3 { + dsps-edge { interrupts =3D <0 138 IRQ_TYPE_EDGE_RISING>; =20 qcom,ipc =3D <&sps_sic_non_secure 0x4080 0>; @@ -254,7 +254,7 @@ dsps@3 { status =3D "disabled"; }; =20 - riva@6 { + riva-edge { interrupts =3D <0 198 IRQ_TYPE_EDGE_RISING>; =20 qcom,ipc =3D <&l2cc 8 25>; diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-a= pq8084.dtsi index 52240fc7a1a6..da50a1a0197f 100644 --- a/arch/arm/boot/dts/qcom-apq8084.dtsi +++ b/arch/arm/boot/dts/qcom-apq8084.dtsi @@ -470,7 +470,7 @@ rpm { qcom,ipc =3D <&apcs 8 0>; qcom,smd-edge =3D <15>; =20 - rpm_requests { + rpm-requests { compatible =3D "qcom,rpm-apq8084"; qcom,smd-channels =3D "rpm_requests"; =20 diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-m= sm8974.dtsi index 02b73739b6f3..2035be2fb8c4 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -1614,7 +1614,7 @@ rpm { qcom,ipc =3D <&apcs 8 0>; qcom,smd-edge =3D <15>; =20 - rpm_requests: rpm_requests { + rpm_requests: rpm-requests { compatible =3D "qcom,rpm-msm8974"; qcom,smd-channels =3D "rpm_requests"; =20 --=20 2.32.0 From nobody Fri Jun 19 16:08:04 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DE99C433F5 for ; Fri, 1 Apr 2022 20:11:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351861AbiDAUNJ (ORCPT ); Fri, 1 Apr 2022 16:13:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351804AbiDAUMu (ORCPT ); Fri, 1 Apr 2022 16:12:50 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F407E220FD9 for ; Fri, 1 Apr 2022 13:10:56 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id p15so8095722ejc.7 for ; Fri, 01 Apr 2022 13:10:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LiPFOtlWEejbKt8Zxnyre/JEc7vI0iBx3VTQVKu5vkA=; b=l8XgkOE9d91y/CpuZuFaSNO7a2Wcb4OmjfUM51QetJzDzxxPUBLURw5tazfss0wOIa ltbxBuQAxXYJJLfWKQg8Kdw3tiWSkWibp+Msml/Q0dRh43lpxnPukfkvCtUv4wRvuq8Y RlW8Q9wAIMuYfXH2WSKjJvG+D60jInwekxukWfsCtt32haN48OaTL1zDfVY5XZvwHm9E 92Pg4blUECXwXYviTFMqtjNDHTHxTAUi5rXF40LCN5PgzpFxAJ53Rl1rDoh0iD2nikxp OxizZaa4WkUqwzd/RmmoSANIUlZ+Dz6VVY7YaxIU2FJ3XTR/gqTuqCx7WnF8TbeYv32z VB7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LiPFOtlWEejbKt8Zxnyre/JEc7vI0iBx3VTQVKu5vkA=; b=RaPM//8xopqrdiG3U4vcedDLLzCzLkB/z/XWpI3TzGEhc2zIjNlzmf/uF+KDasHm2e MSuOwi+7pR9YPkiPFW5j2jhkx666Fs39SXEL1UkmKv1TAUcBbDtlozS3QncndQm6ssFH +rgOqIykIi/WmISIp3vcNG3+fNp09qt/ovBx7z016J1jBsWUvz9bXGNwavjCr/ireIsJ 7BasdkYD/1T4dyVMtCAndkkSGii/TXb6tXbL51mIZFZr1QlmhCA5U8HE3WXad98dwlyg F+sTjRFi+YeAQ43Hjo33T3ugvn894MA3RzDQr0Zeg1LMvIFfJ5HKGX5GhdKSxAcx/I/z MA0A== X-Gm-Message-State: AOAM533jzs80ilkKsrD2hLHnO2cW/OWW126O0FJyDgu7eaiwnw2SMoqU OqGbh2T0l+mxFViS4nAg8yBMVA== X-Google-Smtp-Source: ABdhPJwKAGgFHHZ2Oh/ZNWxhKXLKprEwYbv1kdEFB9BfDYk6FKpJLSxdVt0vFz+KpzKj9MzlSUVC2Q== X-Received: by 2002:a17:906:1f11:b0:685:d50e:3bf9 with SMTP id w17-20020a1709061f1100b00685d50e3bf9mr1319908ejj.275.1648843855143; Fri, 01 Apr 2022 13:10:55 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-201-27.adslplus.ch. [188.155.201.27]) by smtp.gmail.com with ESMTPSA id bx5-20020a0564020b4500b00418fca53406sm1509041edb.27.2022.04.01.13.10.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 13:10:54 -0700 (PDT) From: Krzysztof Kozlowski To: Bjorn Andersson , Andy Gross , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , Mathieu Poirier , Kathiravan T , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 08/10] dt-bindings: soc: qcom,smd: convert to dtschema Date: Fri, 1 Apr 2022 22:10:33 +0200 Message-Id: <20220401201035.189106-9-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> References: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Convert the Qualcomm Shared Memory Driver bindings to DT Schema. Changes against original bindings: enforce only specific names of child nodes, instead of any names. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- .../regulator/qcom,smd-rpm-regulator.yaml | 2 +- .../bindings/remoteproc/qcom,q6v5.txt | 2 +- .../bindings/remoteproc/qcom,wcnss-pil.txt | 2 +- .../bindings/soc/qcom/qcom,smd-rpm.yaml | 4 +- .../devicetree/bindings/soc/qcom/qcom,smd.txt | 98 ------------- .../bindings/soc/qcom/qcom,smd.yaml | 137 ++++++++++++++++++ 6 files changed, 142 insertions(+), 103 deletions(-) delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml diff --git a/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regul= ator.yaml b/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regula= tor.yaml index f052e03be402..0daad8e3e260 100644 --- a/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.ya= ml +++ b/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.ya= ml @@ -12,7 +12,7 @@ description: resides as a subnode of the SMD. As such, the SMD-RPM regulator requires that the SMD and RPM nodes be present. =20 - Please refer to Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt = for + Please refer to Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml= for information pertaining to the SMD node. =20 Please refer to Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.= yaml diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt b/D= ocumentation/devicetree/bindings/remoteproc/qcom,q6v5.txt index 8f1507052afd..b677900b3aae 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt +++ b/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt @@ -250,7 +250,7 @@ the memory regions used by the Hexagon firmware. Each s= ub-node must contain: =20 The Hexagon node may also have an subnode named either "smd-edge" or "glink-edge" that describes the communication edge, channels and devices -related to the Hexagon. See ../soc/qcom/qcom,smd.txt and +related to the Hexagon. See ../soc/qcom/qcom,smd.yaml and ../soc/qcom/qcom,glink.txt for details on how to describe these. =20 =3D EXAMPLE diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.tx= t b/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt index a83080b8905c..ac423f4c3f1b 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt +++ b/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt @@ -111,7 +111,7 @@ and its resource dependencies. It is described by the f= ollowing properties: =20 The wcnss node can also have an subnode named "smd-edge" that describes th= e SMD edge, channels and devices related to the WCNSS. -See ../soc/qcom/qcom,smd.txt for details on how to describe the SMD edge. +See ../soc/qcom/qcom,smd.yaml for details on how to describe the SMD edge. =20 =3D EXAMPLE The following example describes the resources needed to boot control the W= CNSS, diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml b= /Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml index b32457c2fc0b..bf862a11f721 100644 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml @@ -12,7 +12,7 @@ description: | to vote for state of the system resources, such as clocks, regulators an= d bus frequencies. =20 - The SMD information for the RPM edge should be filled out. See qcom,smd= .txt + The SMD information for the RPM edge should be filled out. See qcom,smd= .yaml for the required edge properties. All SMD related properties will reside within the RPM node itself. =20 @@ -82,7 +82,7 @@ examples: qcom,ipc =3D <&apcs 8 0>; qcom,smd-edge =3D <15>; =20 - rpm_requests { + rpm-requests { compatible =3D "qcom,rpm-msm8974"; qcom,smd-channels =3D "rpm_requests"; =20 diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt b/Docu= mentation/devicetree/bindings/soc/qcom/qcom,smd.txt deleted file mode 100644 index 234ae2256501..000000000000 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt +++ /dev/null @@ -1,98 +0,0 @@ -Qualcomm Shared Memory Driver (SMD) binding - -This binding describes the Qualcomm Shared Memory Driver, a fifo based -communication channel for sending data between the various subsystems in -Qualcomm platforms. - -- compatible: - Usage: required - Value type: - Definition: must be "qcom,smd" - -=3D EDGES - -Each subnode of the SMD node represents a remote subsystem or a remote -processor of some sort - or in SMD language an "edge". The name of the edg= es -are not important. -The edge is described by the following properties: - -- interrupts: - Usage: required - Value type: - Definition: should specify the IRQ used by the remote processor to - signal this processor about communication related updates - -- mboxes: - Usage: required - Value type: - Definition: reference to the associated doorbell in APCS, as described - in mailbox/mailbox.txt - -- qcom,ipc: - Usage: required, unless mboxes is specified - Value type: - Definition: three entries specifying the outgoing ipc bit used for - signaling the remote processor: - - phandle to a syscon node representing the apcs registers - - u32 representing offset to the register within the syscon - - u32 representing the ipc bit within the register - -- qcom,smd-edge: - Usage: required - Value type: - Definition: the identifier of the remote processor in the smd channel - allocation table - -- qcom,remote-pid: - Usage: optional - Value type: - Definition: the identifier for the remote processor as known by the rest - of the system. - -- label: - Usage: optional - Value type: - Definition: name of the edge, used for debugging and identification - purposes. The node name will be used if this is not - present. - -=3D SMD DEVICES - -In turn, subnodes of the "edges" represent devices tied to SMD channels on= that -"edge". The names of the devices are not important. The properties of these -nodes are defined by the individual bindings for the SMD devices - but must -contain the following property: - -- qcom,smd-channels: - Usage: required - Value type: - Definition: a list of channels tied to this device, used for matching - the device to channels - -=3D EXAMPLE - -The following example represents a smd node, with one edge representing the -"rpm" subsystem. For the "rpm" subsystem we have a device tied to the -"rpm_request" channel. - - apcs: syscon@f9011000 { - compatible =3D "syscon"; - reg =3D <0xf9011000 0x1000>; - }; - - smd { - compatible =3D "qcom,smd"; - - rpm { - interrupts =3D <0 168 1>; - qcom,ipc =3D <&apcs 8 0>; - qcom,smd-edge =3D <15>; - - rpm_requests { - compatible =3D "qcom,rpm-msm8974"; - qcom,smd-channels =3D "rpm_requests"; - - ... - }; - }; - }; diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml b/Doc= umentation/devicetree/bindings/soc/qcom/qcom,smd.yaml new file mode 100644 index 000000000000..e6f9ffa1c0ea --- /dev/null +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml @@ -0,0 +1,137 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/qcom/qcom,smd.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Shared Memory Driver + +maintainers: + - Andy Gross + - Bjorn Andersson + - Krzysztof Kozlowski + +description: + The Qualcomm Shared Memory Driver is a FIFO based communication channel = for + sending data between the various subsystems in Qualcomm platforms. + +properties: + compatible: + const: qcom,smd + +patternProperties: + "^.*-edge|rpm$": + type: object + description: + Each subnode of the SMD node represents a remote subsystem or a remo= te + processor of some sort - or in SMD language an "edge". The name of t= he + edges are not important. + + properties: + interrupts: + maxItems: 1 + + label: + $ref: /schemas/types.yaml#/definitions/string + description: + Name of the edge, used for debugging and identification purposes= . The + node name will be used if this is not present. + + mboxes: + maxItems: 1 + description: + Reference to the mailbox representing the outgoing doorbell in A= PCS for + this client. + + qcom,ipc: + $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle to a syscon node representing the APC= S registers + - description: u32 representing offset to the register withi= n the syscon + - description: u32 representing the ipc bit within the regis= ter + description: + Three entries specifying the outgoing ipc bit used for signaling= the + remote processor. + + qcom,smd-edge: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + The identifier of the remote processor in the smd channel alloca= tion + table. + + qcom,remote-pid: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + The identifier for the remote processor as known by the rest of = the + system. + + # Binding for edge subnodes is not complete + patternProperties: + "^rpm-requests$": + type: object + description: + In turn, subnodes of the "edges" represent devices tied to SMD + channels on that "edge". The names of the devices are not + important. The properties of these nodes are defined by the + individual bindings for the SMD devices. + + properties: + qcom,smd-channels: + $ref: /schemas/types.yaml#/definitions/string-array + minItems: 1 + maxItems: 32 + description: + A list of channels tied to this device, used for matching the + device to channels. + + required: + - compatible + - qcom,smd-channels + + additionalProperties: true + + required: + - interrupts + - qcom,smd-edge + + oneOf: + - required: + - mboxes + - required: + - qcom,ipc + + additionalProperties: false + +required: + - compatible + +additionalProperties: false + +examples: + # The following example represents a smd node, with one edge representin= g the + # "rpm" subsystem. For the "rpm" subsystem we have a device tied to the + # "rpm_request" channel. + - | + #include + + shared-memory { + compatible =3D "qcom,smd"; + + rpm { + interrupts =3D ; + qcom,ipc =3D <&apcs 8 0>; + qcom,smd-edge =3D <15>; + + rpm-requests { + compatible =3D "qcom,rpm-msm8974"; + qcom,smd-channels =3D "rpm_requests"; + + clock-controller { + compatible =3D "qcom,rpmcc-msm8974", "qcom,rpmcc"; + #clock-cells =3D <1>; + }; + + }; + }; + }; --=20 2.32.0 From nobody Fri Jun 19 16:08:04 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44270C433F5 for ; Fri, 1 Apr 2022 20:11:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351766AbiDAUNR (ORCPT ); Fri, 1 Apr 2022 16:13:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351830AbiDAUMy (ORCPT ); Fri, 1 Apr 2022 16:12:54 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9256B2228C5 for ; Fri, 1 Apr 2022 13:10:58 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id lr4so8049216ejb.11 for ; Fri, 01 Apr 2022 13:10:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3WbIpF98MWzltj5pHpPewHmcZnvPZ1G6miuRkL5lhvM=; b=h4ZMCbeZbZ15ApsHplBXZOaUReTIfshGysMFKuZp9Hp1V+jLNLTT1gTGKc0Owu7wuQ WFCA5FbmdrHCT+14khiTiGkaRFYpzqhFGRQZC3qn7i4aeQWmPT+FSL+Bk1jjjLTLR127 3gGEc0VGwJPmQHI7VwB/HqUyBhbLM0lp/TJoY/de1rIsiIdRLXYnm9kk2Xe4AZTHKe2G cFO3AbsfBFLawzegGTHl5bOgRlvAI1/1VmLZb6ymVZIq1/IKycNRMQt6Cx1M6BMTyrvE 8vBdgzJodCIqNhvPgD24ZGcqH7u2l3NEs+hv02lt+ccTK4tktRAvFuG6+u3z7HhEOv1y kk9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3WbIpF98MWzltj5pHpPewHmcZnvPZ1G6miuRkL5lhvM=; b=ckBIsMIC+it0pFHWDMt3xHS1VsZp6brFQKDini9llnTx8NTRKmynWlbaoRifbY0pvw +qhQSeqGA2zgzCj4vCsufRm+JFVcS9y0Yt2e3XmLEFmBTVuLLKpOw24/P5JVf5sBtW29 rQAGCMa4JcxgfEYDVakTSM4CZLH/O1/7I9HsQzNhBJuu2uMXeEOtuDCTDQubNTq4raWE GEkAby0YCAmxUpb93U8PhBDpkXbMzsL5vwvXwBBf4P5kxnwPrlK4PZsM30tQ0iSPjWAT APblfi+wY0yB87yA6b32/33RwaZJvap9T5ZHT02MyouKDsUOP3nsT8EkX9Avv03/t4Nw STAw== X-Gm-Message-State: AOAM531dldjR66xV31LPw0aq2NnKRmyVYNYHcmH/5113vWxQGJADyyYp lOkozgEwHOijUUt0ChWVxSzVsg== X-Google-Smtp-Source: ABdhPJy5lzy8T7QZIDqoRD7PyP2aI6bTp/WQoo/mRBvhtJabBLNpQQRDZ5OTpRdDjJO0ZWvLJsJpBw== X-Received: by 2002:a17:907:6286:b0:6da:6e24:5e43 with SMTP id nd6-20020a170907628600b006da6e245e43mr1263842ejc.449.1648843856887; Fri, 01 Apr 2022 13:10:56 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-201-27.adslplus.ch. [188.155.201.27]) by smtp.gmail.com with ESMTPSA id bx5-20020a0564020b4500b00418fca53406sm1509041edb.27.2022.04.01.13.10.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 13:10:56 -0700 (PDT) From: Krzysztof Kozlowski To: Bjorn Andersson , Andy Gross , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , Mathieu Poirier , Kathiravan T , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 09/10] dt-bindings: clock: qcom,rpmcc: convert to dtschema Date: Fri, 1 Apr 2022 22:10:34 +0200 Message-Id: <20220401201035.189106-10-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> References: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert the Qualcomm RPM Clock Controller bindings to DT schema and include it in parent's schema (SMD RPM). Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- .../devicetree/bindings/clock/qcom,rpmcc.txt | 63 ----------------- .../devicetree/bindings/clock/qcom,rpmcc.yaml | 69 +++++++++++++++++++ .../bindings/soc/qcom/qcom,smd-rpm.yaml | 4 ++ 3 files changed, 73 insertions(+), 63 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/qcom,rpmcc.txt create mode 100644 Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml diff --git a/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt b/Docum= entation/devicetree/bindings/clock/qcom,rpmcc.txt deleted file mode 100644 index da295c3c004b..000000000000 --- a/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt +++ /dev/null @@ -1,63 +0,0 @@ -Qualcomm RPM Clock Controller Binding ------------------------------------------------- -The RPM is a dedicated hardware engine for managing the shared -SoC resources in order to keep the lowest power profile. It -communicates with other hardware subsystems via shared memory -and accepts clock requests, aggregates the requests and turns -the clocks on/off or scales them on demand. - -Required properties : -- compatible : shall contain only one of the following. The generic - compatible "qcom,rpmcc" should be also included. - - "qcom,rpmcc-mdm9607", "qcom,rpmcc" - "qcom,rpmcc-msm8660", "qcom,rpmcc" - "qcom,rpmcc-apq8060", "qcom,rpmcc" - "qcom,rpmcc-msm8226", "qcom,rpmcc" - "qcom,rpmcc-msm8916", "qcom,rpmcc" - "qcom,rpmcc-msm8936", "qcom,rpmcc" - "qcom,rpmcc-msm8953", "qcom,rpmcc" - "qcom,rpmcc-msm8974", "qcom,rpmcc" - "qcom,rpmcc-msm8976", "qcom,rpmcc" - "qcom,rpmcc-apq8064", "qcom,rpmcc" - "qcom,rpmcc-ipq806x", "qcom,rpmcc" - "qcom,rpmcc-msm8992",=C2=B7"qcom,rpmcc" - "qcom,rpmcc-msm8994",=C2=B7"qcom,rpmcc" - "qcom,rpmcc-msm8996", "qcom,rpmcc" - "qcom,rpmcc-msm8998", "qcom,rpmcc" - "qcom,rpmcc-qcm2290", "qcom,rpmcc" - "qcom,rpmcc-qcs404", "qcom,rpmcc" - "qcom,rpmcc-sdm660", "qcom,rpmcc" - "qcom,rpmcc-sm6115", "qcom,rpmcc" - "qcom,rpmcc-sm6125", "qcom,rpmcc" - -- #clock-cells : shall contain 1 - -The clock enumerators are defined in -and come in pairs: FOO_CLK followed by FOO_A_CLK. The latter clock -is an "active" clock, which means that the consumer only care that the -clock is available when the apps CPU subsystem is active, i.e. not -suspended or in deep idle. If it is important that the clock keeps running -during system suspend, you need to specify the non-active clock, the one -not containing *_A_* in the enumerator name. - -Example: - smd { - compatible =3D "qcom,smd"; - - rpm { - interrupts =3D <0 168 1>; - qcom,ipc =3D <&apcs 8 0>; - qcom,smd-edge =3D <15>; - - rpm_requests { - compatible =3D "qcom,rpm-msm8916"; - qcom,smd-channels =3D "rpm_requests"; - - rpmcc: clock-controller { - compatible =3D "qcom,rpmcc-msm8916", "qcom,rpmcc"; - #clock-cells =3D <1>; - }; - }; - }; - }; diff --git a/Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml b/Docu= mentation/devicetree/bindings/clock/qcom,rpmcc.yaml new file mode 100644 index 000000000000..6a492b1ebc7c --- /dev/null +++ b/Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml @@ -0,0 +1,69 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/qcom,rpmcc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm RPM Clock Controller + +maintainers: + - Bjorn Andersson + - Krzysztof Kozlowski + +description: | + The clock enumerators are defined in and + come in pairs:: FOO_CLK followed by FOO_A_CLK. The latter clock is + an "active" clock, which means that the consumer only care that the cloc= k is + available when the apps CPU subsystem is active, i.e. not suspended or in + deep idle. If it is important that the clock keeps running during system + suspend, you need to specify the non-active clock, the one not containing + *_A_* in the enumerator name. + +properties: + compatible: + items: + - enum: + - qcom,rpmcc-apq8060 + - qcom,rpmcc-apq8064 + - qcom,rpmcc-ipq806x + - qcom,rpmcc-mdm9607 + - qcom,rpmcc-msm8226 + - qcom,rpmcc-msm8660 + - qcom,rpmcc-msm8916 + - qcom,rpmcc-msm8936 + - qcom,rpmcc-msm8953 + - qcom,rpmcc-msm8974 + - qcom,rpmcc-msm8976 + - qcom,rpmcc-msm8992 + - qcom,rpmcc-msm8994 + - qcom,rpmcc-msm8996 + - qcom,rpmcc-msm8998 + - qcom,rpmcc-qcm2290 + - qcom,rpmcc-qcs404 + - qcom,rpmcc-sdm660 + - qcom,rpmcc-sm6115 + - qcom,rpmcc-sm6125 + - const: qcom,rpmcc + + '#clock-cells': + const: 1 + +required: + - compatible + - '#clock-cells' + +additionalProperties: false + +examples: + - | + rpm { + rpm-requests { + compatible =3D "qcom,rpm-msm8916"; + qcom,smd-channels =3D "rpm_requests"; + + clock-controller { + compatible =3D "qcom,rpmcc-msm8916", "qcom,rpmcc"; + #clock-cells =3D <1>; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml b= /Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml index bf862a11f721..49e9755b3a90 100644 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml @@ -45,6 +45,10 @@ properties: - qcom,rpm-qcm2290 - qcom,rpm-qcs404 =20 + clock-controller: + $ref: /schemas/clock/qcom,rpmcc.yaml# + unevaluatedProperties: false + qcom,smd-channels: $ref: /schemas/types.yaml#/definitions/string-array description: Channel name used for the RPM communication --=20 2.32.0 From nobody Fri Jun 19 16:08:04 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97D3AC433EF for ; Fri, 1 Apr 2022 20:11:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351830AbiDAUNU (ORCPT ); Fri, 1 Apr 2022 16:13:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351838AbiDAUMy (ORCPT ); Fri, 1 Apr 2022 16:12:54 -0400 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 7DFFC2228E0 for ; Fri, 1 Apr 2022 13:10:59 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id h4so4246804edr.3 for ; Fri, 01 Apr 2022 13:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AvfLRaJBW6E1M5nvBx02fvTqKdSpIJZJoIrrhvppE/c=; b=biZjMi8Gi9Wa+XAWZfKljcKy6CGsNOfMCuvMA1MN2UQ2gQ7qRM1zytyuuCisemvT4n eKVC3DRJur0w9NnJtl4JtehrItD1Z9STJe0cKv3h7Y9LFLg+fc/NSDp2+OcZdc3MORUc ArC2Tx3XIBcrbxS2UJjJT/ztOLXwdl536GAcdsgkXGy7JlRxiGNuVlNsB/bxLAQiP6RB SXBUBk7fUgmWbpC1zJkBjFOE0RkbJgdVnAPNFDRL18XYpILCww7uBZgyZTHV/xmFTMYm 5T4I0hQpJ/sRm88tKr/wqceEgF5V02ZBoXGjS7RNcGf3wlIZ9uBWFfafyBVZTjIPUPJO DvXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AvfLRaJBW6E1M5nvBx02fvTqKdSpIJZJoIrrhvppE/c=; b=RaA4aSZ4vSmTnZ/uw6ISHnh5eBPVYCMLedC+sZNFt29Pq5DPjXAExV/9XdC4Npl6LS HRpBkdRjzGVdybfQ+fxKO5QuQFk8zsyyyUYbH5M/N8vHf6po6/E+fG/H9/s2Que15ZwI ps9+3HT0yfJl5IvbMc0AEV3KAZKQgHSPctQQG8ub7K1nHbv0vhY8no4P5r0XUCMYNy3O 21aCyPu0j6N2ZmWrWDDVdEks8ERc+kNmJLmPAJiDWWuuFvR4pPaIw6AYkPlhamKxxTbW XeNYriVJbolHlHVTFtuen1LJnwQMAbwicKtOtR/m5uF4Q2xbvOh9bQm2uzZOaNXWcJvx rK8w== X-Gm-Message-State: AOAM531/QIOC2s+v74Ij04vsdae8tDdOvPVrFhv3/pOURpDY2OgkcFfI bXfY/Jz/zSJCYRyLFwMvl8B42w== X-Google-Smtp-Source: ABdhPJzpUkQ6LrIZFlL2INaIFr88n0WL3JjUr/av2XB8sIX4zOzgm2+AQvyGZeA5W7bXKfcLuNLhBw== X-Received: by 2002:a05:6402:14b:b0:418:d06e:5d38 with SMTP id s11-20020a056402014b00b00418d06e5d38mr22375521edu.90.1648843858064; Fri, 01 Apr 2022 13:10:58 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-201-27.adslplus.ch. [188.155.201.27]) by smtp.gmail.com with ESMTPSA id bx5-20020a0564020b4500b00418fca53406sm1509041edb.27.2022.04.01.13.10.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 13:10:57 -0700 (PDT) From: Krzysztof Kozlowski To: Bjorn Andersson , Andy Gross , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , Mathieu Poirier , Kathiravan T , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 10/10] dt-bindings: clock: qcom,rpmcc: add clocks property Date: Fri, 1 Apr 2022 22:10:35 +0200 Message-Id: <20220401201035.189106-11-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> References: <20220401201035.189106-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The RPM clock controller receive input clock ("xo"). It is modelled on only one chip - MSM8953. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml b/Docu= mentation/devicetree/bindings/clock/qcom,rpmcc.yaml index 6a492b1ebc7c..9d296b89a8d0 100644 --- a/Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml @@ -48,6 +48,12 @@ properties: '#clock-cells': const: 1 =20 + clocks: + maxItems: 1 + + clock-names: + const: xo + required: - compatible - '#clock-cells' --=20 2.32.0