Skip to content

Commit 3047b38

Browse files
openedevmmind
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Heiko Stuebner <[email protected]>
1 parent c2f3435 commit 3047b38

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
/dts-v1/;
99
#include "rk3399.dtsi"
1010
#include "rk3399-opp.dtsi"
11-
#include "rk3399pro-vmarc-som.dtsi"
1211
#include <arm/rockchip-radxa-dalang-carrier.dtsi>
12+
#include "rk3399pro-vmarc-som.dtsi"
1313

1414
/ {
1515
model = "Radxa ROCK Pi N10";

arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676

7777
&i2c0 {
7878
clock-frequency = <400000>;
79-
i2c-scl-rising-time-ns = <180>;
8079
i2c-scl-falling-time-ns = <30>;
80+
i2c-scl-rising-time-ns = <180>;
8181
status = "okay";
8282

8383
rk809: pmic@20 {
@@ -323,8 +323,22 @@
323323
&io_domains {
324324
status = "okay";
325325
bt656-supply = <&vcca_1v8>;
326-
sdmmc-supply = <&vccio_sd>;
327326
gpio1830-supply = <&vccio_3v0>;
327+
sdmmc-supply = <&vccio_sd>;
328+
};
329+
330+
&pinctrl {
331+
hym8563 {
332+
hym8563_int: hym8563-int {
333+
rockchip,pins = <4 RK_PD6 0 &pcfg_pull_up>;
334+
};
335+
};
336+
337+
pmic {
338+
pmic_int_l: pmic-int-l {
339+
rockchip,pins = <1 RK_PC2 0 &pcfg_pull_up>;
340+
};
341+
};
328342
};
329343

330344
&pmu_io_domains {
@@ -341,22 +355,7 @@
341355
};
342356

343357
&tsadc {
344-
status = "okay";
345358
rockchip,hw-tshut-mode = <1>;
346359
rockchip,hw-tshut-polarity = <1>;
347-
};
348-
349-
&pinctrl {
350-
hym8563 {
351-
hym8563_int: hym8563-int {
352-
rockchip,pins = <4 RK_PD6 0 &pcfg_pull_up>;
353-
};
354-
};
355-
356-
pmic {
357-
pmic_int_l: pmic-int-l {
358-
rockchip,pins =
359-
<1 RK_PC2 0 &pcfg_pull_up>;
360-
};
361-
};
360+
status = "okay";
362361
};

0 commit comments

Comments
 (0)