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 CB80417592; Tue, 30 Apr 2024 11:26:20 +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=1714476380; cv=none; b=XrNcpY/n/lIg45Nl7yYpuKWF47Vk2RIQPB/1cglJp8gYHWEhjODjH0SfPPrNERcXK4s1TPtFK/OKU0WJghTEY11IEA6ay3ZfK9SBMmSGV9731GvUuhGHJldoM3xINM8Dl4ML8/EupKUSuZYLaETNKGOc4isXXHHmxG5nfTtdaxo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714476380; c=relaxed/simple; bh=gP7autKI2LiO1SYbdG52b7EA4URLW6inhQOtg/WOZgE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eqgG9FPdmssdq4Zm+Q86JulyQeBXqL6kaQCsUP+bWPqr0EzsQunv1Zzat4uddts7NG/1A8MUUCZcb4BKHOWPCu+A/aREKlnagHGXAIWUWfBtcO5Nk0+AzM2U6i0JB8TqVhDYnvGR2OF5Cmht8pea302JtPblTUrDDpaPIlQte/4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=y2y7arw+; 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="y2y7arw+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45A25C2BBFC; Tue, 30 Apr 2024 11:26:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1714476380; bh=gP7autKI2LiO1SYbdG52b7EA4URLW6inhQOtg/WOZgE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y2y7arw+VZDpLGrEz8KQj5gffg63MzcrUD+/wbRDNaxCiS4Xl1eh+1yTp6jA+sckc fS4HZH2kf1lp7RI4OtIbCtgYJtrOsftJihXUUPh4xJ64mJ+AX2Faj969fziAJ7puYB PNVAczztAbNab2/fqGM8gK80Wg+uZsg1IIgvUg1Q= 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 6.1 007/110] arm64: dts: rockchip: fix alphabetical ordering RK3399 puma Date: Tue, 30 Apr 2024 12:39:36 +0200 Message-ID: <20240430103047.786162553@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430103047.561802595@linuxfoundation.org> References: <20240430103047.561802595@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 6.1-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 fee2cc035613c..a060419bca901 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -401,15 +401,6 @@ gpio1830-supply = <&vcc_1v8>; }; -&pmu_io_domains { - status = "okay"; - pmu1830-supply = <&vcc_1v8>; -}; - -&pwm2 { - status = "okay"; -}; - &pinctrl { i2c8 { i2c8_xfer_a: i2c8-xfer { @@ -448,6 +439,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