summaryrefslogtreecommitdiff
path: root/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
diff options
context:
space:
mode:
authorJagan Teki <jagan@amarulasolutions.com>2020-07-15 11:34:13 +0300
committerHeiko Stuebner <heiko@sntech.de>2020-07-18 18:06:12 +0300
commit3047b384a74090f09b994298eb5c40986275233a (patch)
tree1c47f9381a9a7184652cd25fd6185385758fa1a3 /arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
parentc2f343510d99ab53b46bdfeb184cb48f622e6943 (diff)
downloadlinux-3047b384a74090f09b994298eb5c40986275233a.tar.xz
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>
Diffstat (limited to 'arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi')
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi35
1 files changed, 17 insertions, 18 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
index e11538171e67..121a430d6a70 100644
--- 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";
};