Unverified Commit a48867bc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'riscv-dt-for-v6.14' of... 

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: default avatarConor 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: default avatarArnd Bergmann <arnd@arndb.de>
parents dec61b88 708d55db

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

+17 −1
Original line number Diff line number Diff line
@@ -53,7 +53,23 @@ &spi0 { 
	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";

};

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

+17 −1
Original line number Diff line number Diff line
@@ -80,7 +80,23 @@ &spi0 { 
	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";

};