Skip to content

Commit c2f3435

Browse files
openedevmmind
authored andcommitted
ARM: dts: rockchip: dalang-carrier: Move i2c nodes into SOM
I2C nodes and associated slave devices defined in Carrier board are specific to rk3399pro vmrac SOM. So, move them into SOM dtsi. Signed-off-by: Jagan Teki <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Heiko Stuebner <[email protected]>
1 parent fb082df commit c2f3435

File tree

2 files changed

+29
-32
lines changed

2 files changed

+29
-32
lines changed

arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,6 @@
1717
status = "okay";
1818
};
1919

20-
&i2c1 {
21-
status = "okay";
22-
i2c-scl-rising-time-ns = <140>;
23-
i2c-scl-falling-time-ns = <30>;
24-
};
25-
26-
&i2c2 {
27-
status = "okay";
28-
clock-frequency = <400000>;
29-
30-
hym8563: hym8563@51 {
31-
compatible = "haoyu,hym8563";
32-
reg = <0x51>;
33-
#clock-cells = <0>;
34-
clock-frequency = <32768>;
35-
clock-output-names = "hym8563";
36-
pinctrl-names = "default";
37-
pinctrl-0 = <&hym8563_int>;
38-
interrupt-parent = <&gpio4>;
39-
interrupts = <30 IRQ_TYPE_LEVEL_LOW>;
40-
};
41-
};
42-
4320
&pwm0 {
4421
status = "okay";
4522
};
@@ -70,12 +47,3 @@
7047
&uart2 {
7148
status = "okay";
7249
};
73-
74-
&pinctrl {
75-
hym8563 {
76-
hym8563_int: hym8563-int {
77-
rockchip,pins =
78-
<4 RK_PD6 0 &pcfg_pull_up>;
79-
};
80-
};
81-
};

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,29 @@
297297
};
298298
};
299299

300+
&i2c1 {
301+
i2c-scl-falling-time-ns = <30>;
302+
i2c-scl-rising-time-ns = <140>;
303+
status = "okay";
304+
};
305+
306+
&i2c2 {
307+
clock-frequency = <400000>;
308+
status = "okay";
309+
310+
hym8563: hym8563@51 {
311+
compatible = "haoyu,hym8563";
312+
reg = <0x51>;
313+
#clock-cells = <0>;
314+
clock-frequency = <32768>;
315+
clock-output-names = "hym8563";
316+
pinctrl-names = "default";
317+
pinctrl-0 = <&hym8563_int>;
318+
interrupt-parent = <&gpio4>;
319+
interrupts = <RK_PD6 IRQ_TYPE_LEVEL_LOW>;
320+
};
321+
};
322+
300323
&io_domains {
301324
status = "okay";
302325
bt656-supply = <&vcca_1v8>;
@@ -324,6 +347,12 @@
324347
};
325348

326349
&pinctrl {
350+
hym8563 {
351+
hym8563_int: hym8563-int {
352+
rockchip,pins = <4 RK_PD6 0 &pcfg_pull_up>;
353+
};
354+
};
355+
327356
pmic {
328357
pmic_int_l: pmic-int-l {
329358
rockchip,pins =

0 commit comments

Comments
 (0)