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;
From:   Michael Riesch <michael.riesch@wolfvision.net>
To:     devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Cc:     Rob Herring <robh+dt@kernel.org>, Heiko Stuebner <heiko@sntech.de>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Frank Wunderlich <frank-w@public-files.de>,
        Michael Riesch <michael.riesch@wolfvision.net>,
        Sascha Hauer <s.hauer@pengutronix.de>,
        Liang Chen <cl@rock-chips.com>,
        Peter Geis <pgwipeout@gmail.com>,
        Johan Jonker <jbx6244@gmail.com>,
        Simon Xue <xxm@rock-chips.com>,
        Yifeng Zhao <yifeng.zhao@rock-chips.com>,
        Nicolas Frattaroli <frattaroli.nicolas@gmail.com>
Subject: [PATCH v2 1/4] arm64: dts: rockchip: move power domain PD_PIPE to rk356x
Date:   Fri, 25 Feb 2022 14:15:59 +0100
Message-Id: <20220225131602.2283499-2-michael.riesch@wolfvision.net>
In-Reply-To: <20220225131602.2283499-1-michael.riesch@wolfvision.net>
References: <20220225131602.2283499-1-michael.riesch@wolfvision.net>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aCf1uKzj6I8xJxWzsZ5/nAleb+tguvmcXYTCbhMlXofEKrlRUl04jkfW58gr?=
 =?us-ascii?Q?sSpaGxuGG2MkgBU5lySPIHr2Md6PROzWbHr0W5xxASad4JGBwezxES9gQ8XL?=
 =?us-ascii?Q?PI9jqi107wMyslr8I8GBDLKXIS30nQR6lXFZ84YVcB5sT1aHfsVu5k/ExC1V?=
 =?us-ascii?Q?Y436TqbFXn6bXJeCI6A3hp11++R51sMLhci2LYWuqkRWtrh93BBa7RfYpP3P?=
 =?us-ascii?Q?IcLVpJTTdd0pzTHjWDlLCr2SMhx7xm0xe0rlGu1S6SGBCYePQnaVTeZk6aZT?=
 =?us-ascii?Q?/QL0TMVqrK9Pvf4lhdV50XoSPQC/fpbiJWlUoxWfdvRyF6KZLnmGeg+E/gw6?=
 =?us-ascii?Q?sepyrxxQwN94Eu6w8y6ByenXd+tVqt/LuZk53sAWvfdi2HA2dE2wCH4dITBr?=
 =?us-ascii?Q?FLJLiV+t9GVQFWu6M2ZQRsl3SK1C78tnxPx7BcrktzMa8T7QNqeb82vt0ig8?=
 =?us-ascii?Q?RSmE4rv4bBGQO9GWl32NI6GS6vl5owX5msztK+CcZT8Y59uNmlo1KEsv2P1I?=
 =?us-ascii?Q?oZNn8R1Uk2BOImtUtuUmRQnrScY3Chj851v0m4GYBaStyPruAmZZuhdTVDIE?=
 =?us-ascii?Q?XVC9rnK3CS2t48Z9TSDaMqKT28VfMacbDjdeS869xK6ewCFHwposBMqnOxko?=
 =?us-ascii?Q?F/6MU+szWtIg3r1nV1QMguqOxBU6c/hZ9Erkg5dc1oHNF1RUxEF5qnF6CsxF?=
 =?us-ascii?Q?LUYJn06xXXuIhqji8G8FdHIbhvu4RYfcB1hdmu3LHciYIKfb7f5eGUL257wD?=
 =?us-ascii?Q?8TrWFRAvpBZ4aJ2aR1pBBR7iyX0Tp1WQFRf2q3t1CjBJI8t95AuQKhVdQKQO?=
 =?us-ascii?Q?x0ClEnFCpAx7aY5+dPzsbglTf6EFGrkZSrZ8+TJz5dcq2XRC0g/5hHv3kRFr?=
 =?us-ascii?Q?BkC/ZGEy1TMs6aNIrstpPcP5a1J8D/FK8rq7+xZSAPYQ4lRgSqXDl0gyogcF?=
 =?us-ascii?Q?K8yIT94hBZGZzKs22ECPZGkodpK2YoDd/ASoQHHzaJHLNx4T4pLEO3aJGIma?=
 =?us-ascii?Q?ZEbuf8wwsiSXQIFlXN84nO48MNs+TxOIL7LmGw7BT6I3553ThZfQXh3W01Cm?=
 =?us-ascii?Q?e1jFQXEKCQE/oydS0GRt/dRdQiaBDLah/XYbvzq0RfFsMIeZ6EpeMsYIkQZ1?=
 =?us-ascii?Q?q1Rbx+F6CzPX/+I9qEQG4zCQVa+cCulr9fY2K8NEtzD1RFKL19bPsmzAuxne?=
 =?us-ascii?Q?bVKRmtIiLmyW3TJVZA0Vp7ti7xKIPUZtPfBxSzkdKqWXNZXXvxTHgNVKinj8?=
 =?us-ascii?Q?Gtn4PYiSwCdzV3Cy+Les/hpKRin9i9IlX4xp0eQgmwKuEhncMh6YXQOa84xE?=
 =?us-ascii?Q?oUcV3eQA+XAHxiNlDow2tUx7cuhJSYOB9Wm0L+HCKwKG2yxEyT+sd6VS2G0I?=
 =?us-ascii?Q?qfrT5WS7Qn0fLTFyOzWL8lG+ITww7FBRqOOeKjoRv0qVKIavDx2caWJWFD20?=
 =?us-ascii?Q?E6YVgns1zuBEzAJkSAfbJtx1Fg0lzOZUep21QjqT1KwDFIFv4OQHumYixpwK?=
 =?us-ascii?Q?m4cpA103dZLmZglD0od1iPUCIvtGlplHjILtFE4ployyMbbhqLhy6kWgpXMg?=
 =?us-ascii?Q?d3X6nLg2drKYlIPtstgvDlpyDaRlD+xw85dqlpHDFwvfhFUvNOviowPKDguv?=
 =?us-ascii?Q?dHyUIAaNCgV29JSL5wrClExJrPIQ0q+Kx6oVdJZ2JdFR7CAZ9ukzA5VDwFOu?=
 =?us-ascii?Q?kIBbiyOxiep3iH/OfYaAeMql+1L2XVs4teQ/9fW+fDqiYLvx+Y2nxGIFFISH?=
 =?us-ascii?Q?CgXTyzkZIvnZkCQsPw1gXlyXWIyXyxY=3D?=
X-OriginatorOrg: wolfvision.net
X-MS-Exchange-CrossTenant-Network-Message-Id: 9ce1fa9c-d02c-4db9-f81f-08d9f8610107
X-MS-Exchange-CrossTenant-AuthSource: HE1PR0802MB2426.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2022 13:16:16.4795
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: e94ec9da-9183-471e-83b3-51baa8eb804f
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: esdpuyweA8lLFS8tFGrTWYSsqUVicjjXSE+ScoriP/adNgj+nqrlXon2TP71l/T8jTwQ55wgz8HhaAOzCmpF6AlHrHbdiL2rXBVlrlk/t4Y=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6591
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The power domain PD_PIPE was moved to the RK3568 specific dtsi but
is available on the RK3566 as well. Move it back to the shared dtsi.

Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
---
 arch/arm64/boot/dts/rockchip/rk3568.dtsi | 16 ----------------
 arch/arm64/boot/dts/rockchip/rk356x.dtsi | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
index 91a0b798b857..ecc0f3015915 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
@@ -100,19 +100,3 @@ opp-1992000000 {
 		opp-microvolt = <1150000 1150000 1150000>;
 	};
 };
-
-&power {
-	power-domain@RK3568_PD_PIPE {
-		reg = <RK3568_PD_PIPE>;
-		clocks = <&cru PCLK_PIPE>;
-		pm_qos = <&qos_pcie2x1>,
-			 <&qos_pcie3x1>,
-			 <&qos_pcie3x2>,
-			 <&qos_sata0>,
-			 <&qos_sata1>,
-			 <&qos_sata2>,
-			 <&qos_usb3_0>,
-			 <&qos_usb3_1>;
-		#power-domain-cells = <0>;
-	};
-};
diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
index 8b9fae3d348a..742f5adcdf2b 100644
--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
@@ -490,6 +490,20 @@ power-domain@RK3568_PD_RKVENC {
 					 <&qos_rkvenc_wr_m0>;
 				#power-domain-cells = <0>;
 			};
+
+			power-domain@RK3568_PD_PIPE {
+				reg = <RK3568_PD_PIPE>;
+				clocks = <&cru PCLK_PIPE>;
+				pm_qos = <&qos_pcie2x1>,
+					 <&qos_pcie3x1>,
+					 <&qos_pcie3x2>,
+					 <&qos_sata0>,
+					 <&qos_sata1>,
+					 <&qos_sata2>,
+					 <&qos_usb3_0>,
+					 <&qos_usb3_1>;
+				#power-domain-cells = <0>;
+			};
 		};
 	};
 
-- 
2.30.2