Skip to content

Commit

Permalink
Merge tag 'riscv-dt-for-v6.14' of https://git.kernel.org/pub/scm/linu…
Browse files Browse the repository at this point in the history
…x/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>
  • Loading branch information
Arnd Bergmann committed Jan 16, 2025
2 parents dec61b8 + 708d55d commit a48867b
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 2 deletions.
18 changes: 17 additions & 1 deletion arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,23 @@
status = "okay";
};

&sysgpio {
usb0_pins: usb0-0 {
vbus-pins {
pinmux = <GPIOMUX(25, GPOUT_SYS_USB_DRIVE_VBUS,
GPOEN_ENABLE,
GPI_NONE)>;
bias-disable;
input-disable;
input-schmitt-disable;
slew-rate = <0>;
};
};
};

&usb0 {
dr_mode = "peripheral";
dr_mode = "host";
pinctrl-names = "default";
pinctrl-0 = <&usb0_pins>;
status = "okay";
};
18 changes: 17 additions & 1 deletion arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,23 @@
status = "okay";
};

&sysgpio {
usb0_pins: usb0-0 {
vbus-pins {
pinmux = <GPIOMUX(25, GPOUT_SYS_USB_DRIVE_VBUS,
GPOEN_ENABLE,
GPI_NONE)>;
bias-disable;
input-disable;
input-schmitt-disable;
slew-rate = <0>;
};
};
};

&usb0 {
dr_mode = "peripheral";
dr_mode = "host";
pinctrl-names = "default";
pinctrl-0 = <&usb0_pins>;
status = "okay";
};

0 comments on commit a48867b

Please sign in to comment.