From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 22A4512B176; Tue, 30 Apr 2024 11:01:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714474911; cv=none; b=qQBNuihH/z2tGnj+PqqOWqZNMIpgV06oBXnwAjBGOlVZCS6lTKf4pcqEvXNsx7bU/p8GocSTEEpOxdCE3iPWGiyEq33pEXtDyEh7KvJbEDswlCKAHYq+jgMliverfAue30d2lWGg7aVOG31r2F3b31M0Ue6xBT6pq7g6imFpy3Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714474911; c=relaxed/simple; bh=FK8Ej/IgYBMQMu4ybbPyTqH/S17av5Ld6a8nqGgt1gQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LH2tKB5R9oNZo9UABPMGPZlYR76rGTOO7kUP2S+C0c70b3fENRkrT9VtWJH94scbxJVxlunqaO9JaNGrh5/3Ar/Ik9ZhVcWfEnFoGUdMgVFTYkoZOFQhh+Rqs5WC/VybDAaBKrEPVzOLvteOvHVPJioS7uoZBTIAhR89RENxsjk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WzmIy4mv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="WzmIy4mv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FDFDC4AF1A; Tue, 30 Apr 2024 11:01:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1714474911; bh=FK8Ej/IgYBMQMu4ybbPyTqH/S17av5Ld6a8nqGgt1gQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WzmIy4mv1Hlrll+s/HbPVQVyhstKmmEWVOKy//86Cny/RstWKd4hfSDZs0nHns0Gu yxEWwvDOiWb7aT06OfJZXmNM3dyFIIgn4y6jjwKXXJgbdP+cJSoj0OnI9fBK26XPZs V39d/VAgBwRactF2WvBL1EZ/94ne1TJUKwBF5HPw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Iskander Amara , Quentin Schulz , Heiko Stuebner , Sasha Levin Subject: [PATCH 5.10 072/138] arm64: dts: rockchip: fix alphabetical ordering RK3399 puma Date: Tue, 30 Apr 2024 12:39:17 +0200 Message-ID: <20240430103051.548181280@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430103049.422035273@linuxfoundation.org> References: <20240430103049.422035273@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Iskander Amara [ Upstream commit f0abb4b2c7acf3c3e4130dc3f54cd90cf2ae62bc ] Nodes overridden by their reference should be ordered alphabetically to make it easier to read the DTS. pinctrl node is defined in the wrong location so let's reorder it. Signed-off-by: Iskander Amara Reviewed-by: Quentin Schulz Link: https://lore.kernel.org/r/20240308085243.69903-2-iskander.amara@theobroma-systems.com Signed-off-by: Heiko Stuebner Stable-dep-of: 945a7c857091 ("arm64: dts: rockchip: enable internal pull-up on PCIE_WAKE# for RK3399 Puma") Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi index 95bc7a5f61dd5..aaa042fba1ebf 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -430,15 +430,6 @@ gpio1830-supply = <&vcc_1v8>; }; -&pmu_io_domains { - status = "okay"; - pmu1830-supply = <&vcc_1v8>; -}; - -&pwm2 { - status = "okay"; -}; - &pinctrl { i2c8 { i2c8_xfer_a: i2c8-xfer { @@ -470,6 +461,15 @@ }; }; +&pmu_io_domains { + status = "okay"; + pmu1830-supply = <&vcc_1v8>; +}; + +&pwm2 { + status = "okay"; +}; + &sdhci { /* * Signal integrity isn't great at 200MHz but 100MHz has proven stable -- 2.43.0