arm64: dts: rk3399pro: vmarc-som: Fix sorting nodes, properties

Fix node, properties sorting on RockPI N10 board dts(i) files.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Link: https://lore.kernel.org/r/20200715083418.112003-3-jagan@amarulasolutions.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts
index a1783e7f769a34e3f73c49d9152adac80e04d005..539f4005386d2b9bc1141a6fd5d0e67667115b94 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts
@@ -8,8 +8,8 @@
 /dts-v1/;
 #include "rk3399.dtsi"
 #include "rk3399-opp.dtsi"
-#include "rk3399pro-vmarc-som.dtsi"
 #include <arm/rockchip-radxa-dalang-carrier.dtsi>
+#include "rk3399pro-vmarc-som.dtsi"
 
 / {
        model = "Radxa ROCK Pi N10";

diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
index e11538171e67a86148342150700874d89d9c00e5..121a430d6a7009b20a0bf054d05fc8d9e5f9449f 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
@@ -76,8 +76,8 @@
 
 &i2c0 {
        clock-frequency = <400000>;
-       i2c-scl-rising-time-ns = <180>;
        i2c-scl-falling-time-ns = <30>;
+       i2c-scl-rising-time-ns = <180>;
        status = "okay";
 
        rk809: pmic@20 {
@@ -323,8 +323,22 @@
 &io_domains {
        status = "okay";
        bt656-supply = <&vcca_1v8>;
-       sdmmc-supply = <&vccio_sd>;
        gpio1830-supply = <&vccio_3v0>;
+       sdmmc-supply = <&vccio_sd>;
+};
+
+&pinctrl {
+       hym8563 {
+               hym8563_int: hym8563-int {
+                       rockchip,pins = <4 RK_PD6 0 &pcfg_pull_up>;
+               };
+       };
+
+       pmic {
+               pmic_int_l: pmic-int-l {
+                       rockchip,pins = <1 RK_PC2 0 &pcfg_pull_up>;
+               };
+       };
 };
 
 &pmu_io_domains {
@@ -341,22 +355,7 @@
 };
 
 &tsadc {
-       status = "okay";
        rockchip,hw-tshut-mode = <1>;
        rockchip,hw-tshut-polarity = <1>;
-};
-
-&pinctrl {
-       hym8563 {
-               hym8563_int: hym8563-int {
-                       rockchip,pins = <4 RK_PD6 0 &pcfg_pull_up>;
-               };
-       };
-
-       pmic {
-               pmic_int_l: pmic-int-l {
-                       rockchip,pins =
-                               <1 RK_PC2 0 &pcfg_pull_up>;
-               };
-       };
+       status = "okay";
 };