riscv: dts: starfive: visionfive 2: Enable usb0
Subsystems (3)
PATCH v2 1/2 riscv: dts: starfive: visionfive 2: Enable usb0
usb0 was disabled by mistake when merging, so enable it.
--- arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +1 -0
@@ -513,6 +513,7 @@ &uart0 { &usb0 { dr_mode = "peripheral"; + status = "okay"; }; &U74_1 {
Signature · 7 lines
2.38.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v2 2/2 riscv: dts: starfive: visionfive 2: Fix uart0 pins sort order
Node uart0_pins should be sorted alphabetically.
--- .../jh7110-starfive-visionfive-2.dtsi | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-)
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +24 -24
@@ -440,30 +440,6 @@ GPOEN_ENABLE, }; }; - uart0_pins: uart0-0 { - tx-pins { - pinmux = <GPIOMUX(5, GPOUT_SYS_UART0_TX, - GPOEN_ENABLE, - GPI_NONE)>; - bias-disable; - drive-strength = <12>; - input-disable; - input-schmitt-disable; - slew-rate = <0>; - }; - - rx-pins { - pinmux = <GPIOMUX(6, GPOUT_LOW, - GPOEN_DISABLE, - GPI_SYS_UART0_RX)>; - bias-disable; /* external pull-up */ - drive-strength = <2>; - input-enable; - input-schmitt-enable; - slew-rate = <0>; - }; - }; - tdm_pins: tdm-0 { tx-pins { pinmux = <GPIOMUX(44, GPOUT_SYS_TDM_TXD,
@@ -497,6 +473,30 @@ GPOEN_DISABLE, input-enable; }; }; + + uart0_pins: uart0-0 { + tx-pins { + pinmux = <GPIOMUX(5, GPOUT_SYS_UART0_TX, + GPOEN_ENABLE, + GPI_NONE)>; + bias-disable; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; + + rx-pins { + pinmux = <GPIOMUX(6, GPOUT_LOW, + GPOEN_DISABLE, + GPI_SYS_UART0_RX)>; + bias-disable; /* external pull-up */ + drive-strength = <2>; + input-enable; + input-schmitt-enable; + slew-rate = <0>; + }; + }; }; &tdm {
Signature · 7 lines
2.38.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Quoted 13 lines · Hal Feng
usb0 was disabled by mistake when merging, so enable it.
Fixes e7c304c0346d ("riscv: dts: starfive: jh7110: add the node and pins configuration for tdm")Signed-off-by Hal Feng <[email protected]>--- arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi | 1 + 1 file changed, 1 insertion(+)arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +0
-0
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi &uart0 { · line 517
Quoted 5 lines
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +1
-0@@ -513,6 +513,7 @@ &uart0 { &usb0 { dr_mode = "peripheral"; + status = "okay"; };
Hi, Conor,
As v6.6-rc1 is already released, would you apply this series in rc2 or the later rc versions?
Best regards,
Hal
Quoted 22 lines · Hal Feng
Quoted 13 lines · Hal Feng
usb0 was disabled by mistake when merging, so enable it.
Fixes e7c304c0346d ("riscv: dts: starfive: jh7110: add the node and pins configuration for tdm")Signed-off-by Hal Feng <[email protected]>--- arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi | 1 + 1 file changed, 1 insertion(+)arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +0
-0arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi &uart0 { · line 517
Quoted 5 lines
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +1
-0@@ -513,6 +513,7 @@ &uart0 { &usb0 { dr_mode = "peripheral"; + status = "okay"; };Hi, Conor,
Quoted 2 lines
As v6.6-rc1 is already released, would you apply this series in rc2 or the later rc versions?
Yes, I was planning on doing a sweep for potential fixes today. There's 3 or 4 I think.
Quoted 23 lines · Conor Dooley
Quoted 22 lines · Hal Feng
Quoted 13 lines · Hal Feng
usb0 was disabled by mistake when merging, so enable it.
Fixes e7c304c0346d ("riscv: dts: starfive: jh7110: add the node and pins configuration for tdm")Signed-off-by Hal Feng <[email protected]>--- arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi | 1 + 1 file changed, 1 insertion(+)arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +0
-0arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi &uart0 { · line 517
Quoted 5 lines
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +1
-0@@ -513,6 +513,7 @@ &uart0 { &usb0 { dr_mode = "peripheral"; + status = "okay"; };Hi, Conor,
Quoted 5 lines
Quoted 2 lines
As v6.6-rc1 is already released, would you apply this series in rc2 or the later rc versions?
Yes, I was planning on doing a sweep for potential fixes today. There's 3 or 4 I think.
I see. Thanks a lot.
Best regards,
Hal
From: Conor Dooley <[email protected]>
Quoted 3 lines · Hal Feng
usb0 was disabled by mistake when merging, so enable it.
Applied to riscv-dt-fixes, thanks!
[1/2] riscv: dts: starfive: visionfive 2: Enable usb0
https://git.kernel.org/conor/c/2f9f488e7b14 [2/2] riscv: dts: starfive: visionfive 2: Fix uart0 pins sort order https://git.kernel.org/conor/c/1558209533f1
I'll try to get these out before the weekend, the other pending patch has been sitting since mid merge window.
Thanks,
Conor.