From patchwork Tue Jun 27 19:45:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 113575 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8437410vqr; Tue, 27 Jun 2023 12:57:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7rMACiJjBORZ/546UyG4zYpTU6zEjHOSAfYbSxDUz1HFS1A8YSnIsMdG6NP59Q+8lKL3Oq X-Received: by 2002:a17:90a:a385:b0:262:ff09:360e with SMTP id x5-20020a17090aa38500b00262ff09360emr3966566pjp.30.1687895865447; Tue, 27 Jun 2023 12:57:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687895865; cv=none; d=google.com; s=arc-20160816; b=WsL/67bkaDcWzLZmrgT5SlWHv4aE/smkl4SoWL6Sg8HCibHSTVDAFQrSOZt2ZPr47s M1iOOVsqJqOg9BGXCXfuLIM8QjOuwH6Pejn659gVrS3JLGUxZDAERJn8K0AIvNFMQ4G4 KZL8uhVzggw/I8Bk6NJgKM5lKS5erelj6v7fmdZKdMsy5UtCs3ZiGoElRj1G/UJBKt5O NU2fVSJR8Hby/xkhIFQi0sG6d2JYNPS2mAVsDwsrHgImpEXbEA5gVuBjFH6+N4NXKH87 EnkxF51MeMtpVAbxyTEzUwoYNxAgFLCYWsupZYQP9IzQKa40icWuHBlGACLH1a/EsWyk atTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=Pfx1WlY6BJI0tFojCpMtl2HaXVgePuJyg2TguDIl7VE=; fh=rSFdVjeHOpLchEnZwQw2X9nJEgNS/Y9JNZLx42s16JY=; b=l5WydAj7zaf+JS3TjBfcFQL5t2u70OrKFx3yOIAURJtjqpiNBPmDsy6d9iv6aR11um CIrDWyVkiUwC9/V6gFvjv+JFPpCA3U6Dezinb2UpdBINpSma/A/gegnpHM+kEmr2LUIv t5glgftWqfXiilsDhF/xkfat6zjP7YTf68k3r9qVFDj1Qp46Jqa++NASmVnRVn8cswkv MwsNNaNlBvz3YOXY7eRD/EzhP/Z65Pnu6FzOzeTbsUPxRSn+rUYaeWcwY3EslfUZdd1g rUjFof7tLiT608Sjd9yBnOo9jU4/w9bZ4tTUq3S6LujTMJe0vMhyR4u19qhNIbGzAqtD 6CWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@z3ntu.xyz header.s=z3ntu header.b=Xl2w2IQC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=z3ntu.xyz Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x14-20020a17090a788e00b0025ee198e6f7si9599247pjk.168.2023.06.27.12.57.31; Tue, 27 Jun 2023 12:57:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@z3ntu.xyz header.s=z3ntu header.b=Xl2w2IQC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=z3ntu.xyz Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230229AbjF0Ts2 (ORCPT + 99 others); Tue, 27 Jun 2023 15:48:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229501AbjF0Ts0 (ORCPT ); Tue, 27 Jun 2023 15:48:26 -0400 Received: from mail.z3ntu.xyz (mail.z3ntu.xyz [128.199.32.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A7272117; Tue, 27 Jun 2023 12:48:25 -0700 (PDT) Received: from [192.168.178.23] (unknown [62.108.10.64]) by mail.z3ntu.xyz (Postfix) with ESMTPSA id AF2E0CEF9D; Tue, 27 Jun 2023 19:48:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=z3ntu.xyz; s=z3ntu; t=1687895303; bh=1AST4vmGqyyopRw6fBbBcWsj4mGraI5Kmepr9XtYR34=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=Xl2w2IQCXE3n2+E7jNfwwpcMalxBPB2ETIL9kqaJq9Xau2/77piaYPNfXmblt4Ghu omsseP2hj0PSQ0MoRUvEgKfyIYYS/PWHFMrJOdbUFdgWM6N6hJ54sLtxStQnaiae4P M9zcXYrmhQ15RT/u8gRXoBByelnwegKYAJ7xDyFM= From: Luca Weiss Date: Tue, 27 Jun 2023 21:45:13 +0200 Subject: [PATCH 1/2] ARM: dts: qcom: msm8974: replace incorrect indentation in interconnect MIME-Version: 1.0 Message-Id: <20230627-msm8974-sort-v1-1-75c5800a2e09@z3ntu.xyz> References: <20230627-msm8974-sort-v1-0-75c5800a2e09@z3ntu.xyz> In-Reply-To: <20230627-msm8974-sort-v1-0-75c5800a2e09@z3ntu.xyz> To: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2259; i=luca@z3ntu.xyz; h=from:subject:message-id; bh=1AST4vmGqyyopRw6fBbBcWsj4mGraI5Kmepr9XtYR34=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBkmz0FKLpt4w2A7o84Wh00hpYk1v8DNlfzVBQgZ dcjfnMkhpKJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZJs9BQAKCRBy2EO4nU3X Vg6HEACsSA5saxlRVR/qaSzvsjBGkbdscH54SGld5lsyA2aSG/qYC8qvlsL4U69Hc4J0vVurijX vKQ4/jKYXvc+vLaAryS6ShL7aEkhhDG4Lg9OE2JJNF3RNKHYJabSeRSb3x7DlvnnJrCZpZwDN+3 5cGFrQ4TMzRzBDeQ185/VPh7OLRrv8CA2c5Y9BUe7+HuHx1jQTJicyCWqv5XEdCFLvt+FDJMnZc H9NNRS7evXvyEoyBc2JwQf6Gc2IUrNZH//HIXT8jNBdel9sk8A8dqGghrKHuxwa9iZ0uEofvipu 3B7mR6f1vhCKfGZtsXOZ8C2bvIRlgVE5p5ZuvR1dxwebmz2S6sCGs5lEl4bEmZ4CiUWM3vAFxHs wMnUOZ52XMPrcGEksFdlokgtChdAyBa2dOzjPqI5VMbNnyEkZXU/ZrrYfezMtSrOnF6EEYTFQvL xStQlmwAV77vcBVbnG4NiL2dy3s9NbUJFOlje1S89lMvocUnXlyKav8EDJsNZMVPPVYSX9n+o2t 9VgfYYVTWuadZe05ozITWa5G71Xhj0fH7K1lLn3M3Jj5DEtjUcKhdjcFTAKG8VOqwoB1/1FHVvS ywdZ1ShLKt3umBxzYz9a83vcdtXhawEYdh993qQOERHq0GKPRfGsQ2WsE219m7w/K1j5wTFbrgA 5emc7nT37OWs2vQ== X-Developer-Key: i=luca@z3ntu.xyz; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769887095289259916?= X-GMAIL-MSGID: =?utf-8?q?1769887095289259916?= The clocks definition in the interconnect nodes should use tabs (+ 1 space) for indentation instead of 9 spaces. Fix that. Signed-off-by: Luca Weiss Reviewed-by: Konrad Dybcio --- arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi index aeca504918a0..c6475837eda3 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi @@ -1075,7 +1075,7 @@ bimc: interconnect@fc380000 { #interconnect-cells = <1>; clock-names = "bus", "bus_a"; clocks = <&rpmcc RPM_SMD_BIMC_CLK>, - <&rpmcc RPM_SMD_BIMC_A_CLK>; + <&rpmcc RPM_SMD_BIMC_A_CLK>; }; snoc: interconnect@fc460000 { @@ -1084,7 +1084,7 @@ snoc: interconnect@fc460000 { #interconnect-cells = <1>; clock-names = "bus", "bus_a"; clocks = <&rpmcc RPM_SMD_SNOC_CLK>, - <&rpmcc RPM_SMD_SNOC_A_CLK>; + <&rpmcc RPM_SMD_SNOC_A_CLK>; }; pnoc: interconnect@fc468000 { @@ -1093,7 +1093,7 @@ pnoc: interconnect@fc468000 { #interconnect-cells = <1>; clock-names = "bus", "bus_a"; clocks = <&rpmcc RPM_SMD_PNOC_CLK>, - <&rpmcc RPM_SMD_PNOC_A_CLK>; + <&rpmcc RPM_SMD_PNOC_A_CLK>; }; ocmemnoc: interconnect@fc470000 { @@ -1102,7 +1102,7 @@ ocmemnoc: interconnect@fc470000 { #interconnect-cells = <1>; clock-names = "bus", "bus_a"; clocks = <&rpmcc RPM_SMD_OCMEMGX_CLK>, - <&rpmcc RPM_SMD_OCMEMGX_A_CLK>; + <&rpmcc RPM_SMD_OCMEMGX_A_CLK>; }; mmssnoc: interconnect@fc478000 { @@ -1111,7 +1111,7 @@ mmssnoc: interconnect@fc478000 { #interconnect-cells = <1>; clock-names = "bus", "bus_a"; clocks = <&mmcc MMSS_S0_AXI_CLK>, - <&mmcc MMSS_S0_AXI_CLK>; + <&mmcc MMSS_S0_AXI_CLK>; }; cnoc: interconnect@fc480000 { @@ -1120,7 +1120,7 @@ cnoc: interconnect@fc480000 { #interconnect-cells = <1>; clock-names = "bus", "bus_a"; clocks = <&rpmcc RPM_SMD_CNOC_CLK>, - <&rpmcc RPM_SMD_CNOC_A_CLK>; + <&rpmcc RPM_SMD_CNOC_A_CLK>; }; tsens: thermal-sensor@fc4a9000 { From patchwork Tue Jun 27 19:45:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 113580 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8444680vqr; Tue, 27 Jun 2023 13:10:46 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ50Vr1i9hILl/taTHTa0lpAWvslZLoEzUVEKYy66cOidIRxi3jgQ2j0cN4Qz3aEfZdLWurA X-Received: by 2002:a50:ee0c:0:b0:51d:8aaf:5adc with SMTP id g12-20020a50ee0c000000b0051d8aaf5adcmr6259698eds.14.1687896645620; Tue, 27 Jun 2023 13:10:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687896645; cv=none; d=google.com; s=arc-20160816; b=Y4vfhz6tI0SzWZwD7m21PO6xws47/kj58gart0EQICMZKxi4WbiFy9ZLfoiZ0bLPtj jjLEM867WorPtS6nz+2ouVHYFamytjKILYMWBeb5g80ud109YTgmd+UtLLGmi3FJnS81 dYypYv0+ZZFFgV6bSWWvAMNdr9zvmDUWue7gQZXnxvGfkOZjZdE/3aOBfna+nnOz7hmh wMQlBbTIPv6aV3RWV4+ziwi71uMCbogsZHGQeMYzZMnRlnWcWg71j8lZPd+rkWFsKoSY OlrfOcwq3pr0/xmMDmwufWpTdJs3hWXsA7b9f2Mg7z4tk466I3NIhhBzLbcTEAXrPV4x 4d+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=FSxVc5rQJFmjJhClzplmO9ImamYPtoh4uSHt0T6JuI0=; fh=rSFdVjeHOpLchEnZwQw2X9nJEgNS/Y9JNZLx42s16JY=; b=0txga4MiRsTeexfuqWIYEjriSZBA9KgsNLJMxU5iGbZMM1zcKBX7EOMMXSYUacCsMH s8ZNlP3z6RK2VERdQYrBORwpoB95M1hDmHAqauZWshlp9FNdEO2x4Fj7Ip/XKucC+tbF WcTqPApKyu1ZIC7tk8MCV5iyCJKYhgVOQooS9RcWQr1AclDOSiCh37Bh87kRazEMFfs0 1gblq1BXetCGI2XjjcKtSf0wtq1fI0Ovj5JdI1lo1m/u+O+BFtFDgvNOZA6FVq8L5mfO mx4m9XEk6MiJyZkEiVETmdHHMkBpLFQG9ba4hLZDg1YKI893G1hTTFj8OvOZRSSYp+AZ 3Shw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@z3ntu.xyz header.s=z3ntu header.b=B+b5IhTc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=z3ntu.xyz Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i13-20020aa7c70d000000b0051891d5b194si4022edq.258.2023.06.27.13.10.22; Tue, 27 Jun 2023 13:10:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@z3ntu.xyz header.s=z3ntu header.b=B+b5IhTc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=z3ntu.xyz Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230298AbjF0Tsb (ORCPT + 99 others); Tue, 27 Jun 2023 15:48:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229629AbjF0Ts1 (ORCPT ); Tue, 27 Jun 2023 15:48:27 -0400 Received: from mail.z3ntu.xyz (mail.z3ntu.xyz [128.199.32.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A844211B; Tue, 27 Jun 2023 12:48:25 -0700 (PDT) Received: from [192.168.178.23] (unknown [62.108.10.64]) by mail.z3ntu.xyz (Postfix) with ESMTPSA id D98BECF06B; Tue, 27 Jun 2023 19:48:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=z3ntu.xyz; s=z3ntu; t=1687895304; bh=Ostm2zHdZH0p0v7HIjFDUvWXEiT1vgOfotYTinqxDnw=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=B+b5IhTcYygGMLNTFsywGQjZZ0YDUk7IjNbx8+juZ9rasFtoT9z5kDLhEk+f8tXeR ill+oKJGKLGI6nSR4Y/8c9vgbcNex/rJg9fFQyU1MaOn1pLrNCwELT0B5HJgwLHLjf Zom4BTTg/OAsANg8sdBr9/rArMmHcIK/MkWOCKlM= From: Luca Weiss Date: Tue, 27 Jun 2023 21:45:14 +0200 Subject: [PATCH 2/2] ARM: dts: qcom: msm8974: sort nodes by reg MIME-Version: 1.0 Message-Id: <20230627-msm8974-sort-v1-2-75c5800a2e09@z3ntu.xyz> References: <20230627-msm8974-sort-v1-0-75c5800a2e09@z3ntu.xyz> In-Reply-To: <20230627-msm8974-sort-v1-0-75c5800a2e09@z3ntu.xyz> To: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3881; i=luca@z3ntu.xyz; h=from:subject:message-id; bh=Ostm2zHdZH0p0v7HIjFDUvWXEiT1vgOfotYTinqxDnw=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBkmz0Gpfckjdpe/rIxKeevcCjMq5DlXGxgt6/rs 3FE7qWpb32JAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZJs9BgAKCRBy2EO4nU3X VhwNEACXCkY47XIvxXRMm1VWznKs0RPhZhNFjexeVtHakes6QfH/GAym4bRDY9KDA0+lJqSa9hX w30Q+K1sedj9pMZnUNMe+xNIgr0gZ8lGrGPRYJ1Qr9gQVXvtQpJw7KFGUM1SohDffvLCcORBzPo Fslh/HbhKZjwCo9GiUW3hdpON9Gd4pORQFnV28yEKiKt+/zIbF6dBbmrc4iWZJdfuaKye0uc+Sc qu5tQ0oflPImZY3LWRPu6mJK/JfRtyzJtUHIVqL0Wtcubj1iRZFn62z3uiCBMM8yK1DcuJcbYVC pD5Evx92yqu+BHjhl2F7eNefwuJ0JEalGzZQ4PscJIZ4yP9i59S/yw8sxJMVeyu2LlZpfIjcgNF y8hW4SMHYaoBINoEM+/UGh13Z/xfWxj0ud/vbWLYz+aaSHwDrkJ2QHnMS4OjQ+t91NULSdLtSWC +x8JaVfwjfWtTJQPFNM+jdXP+P05m15apKEe8FYYrbjTTd3jj6cwXKPE3T9o7/zvsQXmeAPwLJd zexmJqpCgnWORoA2i51C39bgmnfRpbQiCHjRuAB+Sq+hEWcSUgV6F27FaLg0mJLVtsHvbrqAOUm 3BnKzKmrr7gPvYFA/fwdnOE0n8N9x/YLnG5aeRZ04Qtw86Milm+l5GXqVjjdMe6Ao5nDzN3Sj3w valxtLZgMIs5KBw== X-Developer-Key: i=luca@z3ntu.xyz; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769887912912187650?= X-GMAIL-MSGID: =?utf-8?q?1769887912912187650?= Some nodes weren't sorted by reg, so fix that now. Now all nodes inside /soc should be sorted correctly. Signed-off-by: Luca Weiss Reviewed-by: Konrad Dybcio --- arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 70 ++++++++++++++++---------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi index c6475837eda3..9aa8f9a273a8 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi @@ -334,6 +334,12 @@ apcs: syscon@f9011000 { reg = <0xf9011000 0x1000>; }; + saw_l2: power-controller@f9012000 { + compatible = "qcom,saw2"; + reg = <0xf9012000 0x1000>; + regulator; + }; + timer@f9020000 { #address-cells = <1>; #size-cells = <1>; @@ -393,52 +399,46 @@ frame@f9028000 { }; }; - saw0: power-controller@f9089000 { - compatible = "qcom,msm8974-saw2-v2.1-cpu", "qcom,saw2"; - reg = <0xf9089000 0x1000>, <0xf9009000 0x1000>; - }; - - saw1: power-controller@f9099000 { - compatible = "qcom,msm8974-saw2-v2.1-cpu", "qcom,saw2"; - reg = <0xf9099000 0x1000>, <0xf9009000 0x1000>; - }; - - saw2: power-controller@f90a9000 { - compatible = "qcom,msm8974-saw2-v2.1-cpu", "qcom,saw2"; - reg = <0xf90a9000 0x1000>, <0xf9009000 0x1000>; - }; - - saw3: power-controller@f90b9000 { - compatible = "qcom,msm8974-saw2-v2.1-cpu", "qcom,saw2"; - reg = <0xf90b9000 0x1000>, <0xf9009000 0x1000>; - }; - - saw_l2: power-controller@f9012000 { - compatible = "qcom,saw2"; - reg = <0xf9012000 0x1000>; - regulator; - }; - acc0: power-manager@f9088000 { compatible = "qcom,kpss-acc-v2"; reg = <0xf9088000 0x1000>, <0xf9008000 0x1000>; }; + saw0: power-controller@f9089000 { + compatible = "qcom,msm8974-saw2-v2.1-cpu", "qcom,saw2"; + reg = <0xf9089000 0x1000>, <0xf9009000 0x1000>; + }; + acc1: power-manager@f9098000 { compatible = "qcom,kpss-acc-v2"; reg = <0xf9098000 0x1000>, <0xf9008000 0x1000>; }; + saw1: power-controller@f9099000 { + compatible = "qcom,msm8974-saw2-v2.1-cpu", "qcom,saw2"; + reg = <0xf9099000 0x1000>, <0xf9009000 0x1000>; + }; + acc2: power-manager@f90a8000 { compatible = "qcom,kpss-acc-v2"; reg = <0xf90a8000 0x1000>, <0xf9008000 0x1000>; }; + saw2: power-controller@f90a9000 { + compatible = "qcom,msm8974-saw2-v2.1-cpu", "qcom,saw2"; + reg = <0xf90a9000 0x1000>, <0xf9009000 0x1000>; + }; + acc3: power-manager@f90b8000 { compatible = "qcom,kpss-acc-v2"; reg = <0xf90b8000 0x1000>, <0xf9008000 0x1000>; }; + saw3: power-controller@f90b9000 { + compatible = "qcom,msm8974-saw2-v2.1-cpu", "qcom,saw2"; + reg = <0xf90b9000 0x1000>, <0xf9009000 0x1000>; + }; + sdhc_1: mmc@f9824900 { compatible = "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4"; reg = <0xf9824900 0x11c>, <0xf9824000 0x800>; @@ -1051,6 +1051,15 @@ kpss_out: endpoint { }; }; + bimc: interconnect@fc380000 { + reg = <0xfc380000 0x6a000>; + compatible = "qcom,msm8974-bimc"; + #interconnect-cells = <1>; + clock-names = "bus", "bus_a"; + clocks = <&rpmcc RPM_SMD_BIMC_CLK>, + <&rpmcc RPM_SMD_BIMC_A_CLK>; + }; + gcc: clock-controller@fc400000 { compatible = "qcom,gcc-msm8974"; #clock-cells = <1>; @@ -1069,15 +1078,6 @@ rpm_msg_ram: sram@fc428000 { reg = <0xfc428000 0x4000>; }; - bimc: interconnect@fc380000 { - reg = <0xfc380000 0x6a000>; - compatible = "qcom,msm8974-bimc"; - #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_BIMC_CLK>, - <&rpmcc RPM_SMD_BIMC_A_CLK>; - }; - snoc: interconnect@fc460000 { reg = <0xfc460000 0x4000>; compatible = "qcom,msm8974-snoc";