riscv: dts: starfive: jh7110-common: move usb0 config to board dts

The JH7110 USB0 can operate as a dual-role USB device.  Different
boards can have different configuration.

For all current boards this device operates in peripheral mode, but
on a new board this operates in host mode.  This property will no
longer be common, so define the "dr_mode" property in the board files
rather than in the common DTSI file.

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>

diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
index 9e77f79ec162163e11562fc66ecc5836da8b6a77..87ea81e9fed4f48e18687f75ab10f37f559546f7 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
@@ -637,11 +637,6 @@
        status = "okay";
 };
 
-&usb0 {
-       dr_mode = "peripheral";
-       status = "okay";
-};
-
 &U74_1 {
        cpu-supply = <&vdd_cpu>;
 };

diff --git a/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts b/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts
index 66ad3eb2fd6654ed6f0397992d41aa6ce2e3250d..0d248b671d4bbecfb3a028e6830e3fb336a4c83a 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts
@@ -52,3 +52,8 @@
 &spi0 {
        status = "okay";
 };
+
+&usb0 {
+       dr_mode = "peripheral";
+       status = "okay";
+};

diff --git a/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts b/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts
index dbc8612b84646ed05e100ea6d97d26b847e362f5..d5180c67ac5526851a6ae44e61cccbb94fd6acda 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts
@@ -80,3 +80,8 @@
 &spi0 {
        status = "okay";
 };
+
+&usb0 {
+       dr_mode = "peripheral";
+       status = "okay";
+};

diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
index ef93a394bb2f1fa0980bf4d798b9849ed339b33f..5f14afb2c24dcf342433140068e86fa9bd52db40 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
@@ -60,3 +60,8 @@
 &spi0 {
        status = "okay";
 };
+
+&usb0 {
+       dr_mode = "peripheral";
+       status = "okay";
+};