Skip to content

Commit 8113e1d

Browse files
committed
Merge tag 'riscv-dt-for-v6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into soc/dt
RISC-V Misc Devicetrees for v6.17 StarFive: Sort properties on the MilkV Mars and add the power status LED to all jh7110 boards. AMD: Add 64-bit Microblaze V cpu compatible. Signed-off-by: Conor Dooley <[email protected]> * tag 'riscv-dt-for-v6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux: dt-bindings: riscv: cpus: Add AMD MicroBlaze V 64bit compatible riscv: dts: starfive: jh7110-common: add status power led node riscv: dts: starfive: jh7110-milkv-mars sort properties Link: https://lore.kernel.org/r/20250723-postage-skylight-597377b5f8e4@spud Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 4ec93a8 + 28fa0dc commit 8113e1d

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

Documentation/devicetree/bindings/riscv/cpus.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ properties:
4545
- items:
4646
- enum:
4747
- amd,mbv32
48+
- amd,mbv64
4849
- andestech,ax45mp
4950
- canaan,k210
5051
- sifive,bullet0

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "jh7110.dtsi"
99
#include "jh7110-pinfunc.h"
1010
#include <dt-bindings/gpio/gpio.h>
11+
#include <dt-bindings/leds/common.h>
1112
#include <dt-bindings/pinctrl/starfive,jh7110-pinctrl.h>
1213

1314
/ {
@@ -38,6 +39,14 @@
3839
priority = <224>;
3940
};
4041

42+
leds {
43+
compatible = "gpio-leds";
44+
45+
led_status_power: led-0 {
46+
gpios = <&aongpio 3 GPIO_ACTIVE_HIGH>;
47+
};
48+
};
49+
4150
pwmdac_codec: audio-codec {
4251
compatible = "linux,spdif-dit";
4352
#sound-dai-cells = <0>;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
};
1313

1414
&gmac0 {
15-
starfive,tx-use-rgmii-clk;
1615
assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>;
1716
assigned-clock-parents = <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>;
17+
starfive,tx-use-rgmii-clk;
1818
status = "okay";
1919
};
2020

@@ -31,14 +31,14 @@
3131
};
3232

3333
&phy0 {
34-
motorcomm,tx-clk-adj-enabled;
34+
rx-internal-delay-ps = <1500>;
35+
tx-internal-delay-ps = <1500>;
36+
motorcomm,rx-clk-drv-microamp = <3970>;
37+
motorcomm,rx-data-drv-microamp = <2910>;
3538
motorcomm,tx-clk-10-inverted;
3639
motorcomm,tx-clk-100-inverted;
3740
motorcomm,tx-clk-1000-inverted;
38-
motorcomm,rx-clk-drv-microamp = <3970>;
39-
motorcomm,rx-data-drv-microamp = <2910>;
40-
rx-internal-delay-ps = <1500>;
41-
tx-internal-delay-ps = <1500>;
41+
motorcomm,tx-clk-adj-enabled;
4242
};
4343

4444
&pwm {

0 commit comments

Comments
 (0)