Skip to content

Commit 5a5001d

Browse files
docularxuConchuOD
authored andcommitted
riscv: dts: starfive: jh7110-common: revised device node
Earlier this year a new DTSI file was created to define common properties for the StarFive VisionFive 2 and Milk-V Mars boards, both of which use the StarFive JH7110 SoC. The Pine64 Star64 board has also been added since that time. Some of the nodes defined in "jh7110-common.dtsi" are enabled in that file because all of the boards including it "want" them enabled. An upcoming patch enables another JH7110 board, but for that board not all of these common nodes should be enabled. Prepare for supporting the new board by avoiding enabling these nodes in "jh7110-common.dtsi", and enable them instead in these files: jh7110-milkv-mars.dts jh7110-pine64-star64.dts jh7110-starfive-visionfive-2.dtsi Signed-off-by: Alex Elder <elder@riscstar.com> Signed-off-by: Guodong Xu <guodong@riscstar.com> Reviewed-by: Emil Renner Berthing <emil.renner.berthing@canonical.com> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
1 parent 7cf3e9b commit 5a5001d

4 files changed

Lines changed: 54 additions & 5 deletions

File tree

arch/riscv/boot/dts/starfive/jh7110-common.dtsi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@
176176
&gmac0 {
177177
phy-handle = <&phy0>;
178178
phy-mode = "rgmii-id";
179-
status = "okay";
180179

181180
mdio {
182181
#address-cells = <1>;
@@ -196,7 +195,6 @@
196195
i2c-scl-falling-time-ns = <510>;
197196
pinctrl-names = "default";
198197
pinctrl-0 = <&i2c0_pins>;
199-
status = "okay";
200198
};
201199

202200
&i2c2 {
@@ -311,7 +309,6 @@
311309
&pwmdac {
312310
pinctrl-names = "default";
313311
pinctrl-0 = <&pwmdac_pins>;
314-
status = "okay";
315312
};
316313

317314
&qspi {
@@ -350,13 +347,11 @@
350347
&pwm {
351348
pinctrl-names = "default";
352349
pinctrl-0 = <&pwm_pins>;
353-
status = "okay";
354350
};
355351

356352
&spi0 {
357353
pinctrl-names = "default";
358354
pinctrl-0 = <&spi0_pins>;
359-
status = "okay";
360355

361356
spi_dev0: spi@0 {
362357
compatible = "rohm,dh2228fv";

arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
starfive,tx-use-rgmii-clk;
1616
assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>;
1717
assigned-clock-parents = <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>;
18+
status = "okay";
19+
};
20+
21+
&i2c0 {
22+
status = "okay";
1823
};
1924

2025
&pcie0 {
@@ -35,3 +40,15 @@
3540
rx-internal-delay-ps = <1500>;
3641
tx-internal-delay-ps = <1500>;
3742
};
43+
44+
&pwm {
45+
status = "okay";
46+
};
47+
48+
&pwmdac {
49+
status = "okay";
50+
};
51+
52+
&spi0 {
53+
status = "okay";
54+
};

arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
starfive,tx-use-rgmii-clk;
1919
assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>;
2020
assigned-clock-parents = <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>;
21+
status = "okay";
2122
};
2223

2324
&gmac1 {
@@ -39,6 +40,10 @@
3940
};
4041
};
4142

43+
&i2c0 {
44+
status = "okay";
45+
};
46+
4247
&pcie1 {
4348
status = "okay";
4449
};
@@ -63,3 +68,15 @@
6368
motorcomm,tx-clk-10-inverted;
6469
motorcomm,tx-clk-100-inverted;
6570
};
71+
72+
&pwm {
73+
status = "okay";
74+
};
75+
76+
&pwmdac {
77+
status = "okay";
78+
};
79+
80+
&spi0 {
81+
status = "okay";
82+
};

arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
};
1414
};
1515

16+
&gmac0 {
17+
status = "okay";
18+
};
19+
1620
&gmac1 {
1721
phy-handle = <&phy1>;
1822
phy-mode = "rgmii-id";
@@ -29,6 +33,10 @@
2933
};
3034
};
3135

36+
&i2c0 {
37+
status = "okay";
38+
};
39+
3240
&mmc0 {
3341
non-removable;
3442
};
@@ -40,3 +48,15 @@
4048
&pcie1 {
4149
status = "okay";
4250
};
51+
52+
&pwm {
53+
status = "okay";
54+
};
55+
56+
&pwmdac {
57+
status = "okay";
58+
};
59+
60+
&spi0 {
61+
status = "okay";
62+
};

0 commit comments

Comments
 (0)