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 AF7958801; Tue, 30 Apr 2024 11:17:09 +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=1714475829; cv=none; b=loZp6rYcRg+dj8GxSG9xm7G8T6zQHkMxT9z9F+5kJqLZRcNK/IVY871Jy7G68vcoDSbgVbqFGx4DsvmWoB71nxwKcyl+1oZ5jJaYeXjAXxljbK81hTbYsUFlf7vRJYH7gbFjCwpAf6EhwO0PCQ3J2dQWfzzBpxx8y5j8lLCWsT8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714475829; c=relaxed/simple; bh=1A2kJVogdP7VM0kShtqP0COOzdak/8t1apKvSqMuYV0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IKIPt0e38s3Ukd/BzkE+2I21SW/MjfYJbczoFSwm/9NCyd/VAeT1POqgOc/GPijYcEEbksbgg861xhQEInBc+fiTcONCub0yYl3x1gFP8qk6frVvWpPUoJssEn6A5Q8LazmZweTISud4Jm+BqvAIuq4u4IpkQkRum4OJ4jxqHPE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LMhb9HM2; 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="LMhb9HM2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1830CC2BBFC; Tue, 30 Apr 2024 11:17:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1714475829; bh=1A2kJVogdP7VM0kShtqP0COOzdak/8t1apKvSqMuYV0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LMhb9HM2IbpTCf2O3kbAhHmUN/71n5wyED3KvuXTT1wADKbHTu+CTc9i2AMgk0vbf zZE3EmkUV1brksn6D/NhLbUvjjuZezU0EhUeqFjhR7ZZBkng9yErCfb611qq5PTc9o PfRfHUJnWVZtAE3Ac7dV8+RC//651vc1MJA4Dyw0= 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.15 06/80] arm64: dts: rockchip: fix alphabetical ordering RK3399 puma Date: Tue, 30 Apr 2024 12:39:38 +0200 Message-ID: <20240430103043.595197284@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430103043.397234724@linuxfoundation.org> References: <20240430103043.397234724@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-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 d9859fa4a7499..14d343aae53f4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -390,15 +390,6 @@ gpio1830-supply = <&vcc_1v8>; }; -&pmu_io_domains { - status = "okay"; - pmu1830-supply = <&vcc_1v8>; -}; - -&pwm2 { - status = "okay"; -}; - &pinctrl { i2c8 { i2c8_xfer_a: i2c8-xfer { @@ -437,6 +428,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