Skip to content

Commit a48867b

Browse files
committed
Merge tag 'riscv-dt-for-v6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into soc/dt
~RISC-V~ StarFive Devicetrees for v6.14 Not so much RISC-V, but rather StarFive, this time around as there are only two changes: the Milk-V Mars and Pine64 Star64 boards get their usb0 interfaces moved from peripheral to host mode. Signed-off-by: Conor Dooley <conor.dooley@microchip.com> * tag 'riscv-dt-for-v6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux: riscv: dts: starfive: jh7110-milkv-mars: enable usb0 host function riscv: dts: starfive: jh7110-pine64-star64: enable usb0 host function Link: https://lore.kernel.org/r/20250113-kennel-outplayed-21a52a654c36@spud Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents dec61b8 + 708d55d commit a48867b

File tree

2 files changed

+34
-2
lines changed

2 files changed

+34
-2
lines changed

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,23 @@
5353
status = "okay";
5454
};
5555

56+
&sysgpio {
57+
usb0_pins: usb0-0 {
58+
vbus-pins {
59+
pinmux = <GPIOMUX(25, GPOUT_SYS_USB_DRIVE_VBUS,
60+
GPOEN_ENABLE,
61+
GPI_NONE)>;
62+
bias-disable;
63+
input-disable;
64+
input-schmitt-disable;
65+
slew-rate = <0>;
66+
};
67+
};
68+
};
69+
5670
&usb0 {
57-
dr_mode = "peripheral";
71+
dr_mode = "host";
72+
pinctrl-names = "default";
73+
pinctrl-0 = <&usb0_pins>;
5874
status = "okay";
5975
};

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,23 @@
8080
status = "okay";
8181
};
8282

83+
&sysgpio {
84+
usb0_pins: usb0-0 {
85+
vbus-pins {
86+
pinmux = <GPIOMUX(25, GPOUT_SYS_USB_DRIVE_VBUS,
87+
GPOEN_ENABLE,
88+
GPI_NONE)>;
89+
bias-disable;
90+
input-disable;
91+
input-schmitt-disable;
92+
slew-rate = <0>;
93+
};
94+
};
95+
};
96+
8397
&usb0 {
84-
dr_mode = "peripheral";
98+
dr_mode = "host";
99+
pinctrl-names = "default";
100+
pinctrl-0 = <&usb0_pins>;
85101
status = "okay";
86102
};

0 commit comments

Comments
 (0)