* [-next v1] riscv: dts: starfive: visionfive 2: Enable usb0 and fix tdm pins sort order
@ 2023-08-28 11:52 Hal Feng
2023-08-28 11:54 ` Krzysztof Kozlowski
0 siblings, 1 reply; 4+ messages in thread
From: Hal Feng @ 2023-08-28 11:52 UTC (permalink / raw)
To: Conor Dooley, Emil Renner Berthing, Rob Herring,
Krzysztof Kozlowski, Palmer Dabbelt, Paul Walmsley, Albert Ou
Cc: Hal Feng, devicetree, linux-riscv, linux-kernel
usb0 was disabled by mistake when merging, so enable it.
tdm_pins node should be sorted alphabetically.
Fixes: e7c304c0346d ("riscv: dts: starfive: jh7110: add the node and pins configuration for tdm")
Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
---
.../jh7110-starfive-visionfive-2.dtsi | 49 ++++++++++---------
1 file changed, 25 insertions(+), 24 deletions(-)
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 d79f94432b27..382dfb5e64e4 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
@@ -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 {
@@ -513,6 +513,7 @@ &uart0 {
&usb0 {
dr_mode = "peripheral";
+ status = "okay";
};
&U74_1 {
--
2.38.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [-next v1] riscv: dts: starfive: visionfive 2: Enable usb0 and fix tdm pins sort order
2023-08-28 11:52 [-next v1] riscv: dts: starfive: visionfive 2: Enable usb0 and fix tdm pins sort order Hal Feng
@ 2023-08-28 11:54 ` Krzysztof Kozlowski
2023-08-28 12:05 ` Conor Dooley
0 siblings, 1 reply; 4+ messages in thread
From: Krzysztof Kozlowski @ 2023-08-28 11:54 UTC (permalink / raw)
To: Hal Feng, Conor Dooley, Emil Renner Berthing, Rob Herring,
Krzysztof Kozlowski, Palmer Dabbelt, Paul Walmsley, Albert Ou
Cc: devicetree, linux-riscv, linux-kernel
On 28/08/2023 13:52, Hal Feng wrote:
> usb0 was disabled by mistake when merging, so enable it.
> tdm_pins node should be sorted alphabetically.
>
> Fixes: e7c304c0346d ("riscv: dts: starfive: jh7110: add the node and pins configuration for tdm")
> Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
> ---
> .../jh7110-starfive-visionfive-2.dtsi | 49 ++++++++++---------
> 1 file changed, 25 insertions(+), 24 deletions(-)
>
> 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 d79f94432b27..382dfb5e64e4 100644
> --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
> +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
> @@ -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>;
> + };
What is fixed in this hunk? Order of nodes is just a style, not a bug
needing backports.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [-next v1] riscv: dts: starfive: visionfive 2: Enable usb0 and fix tdm pins sort order
2023-08-28 11:54 ` Krzysztof Kozlowski
@ 2023-08-28 12:05 ` Conor Dooley
2023-08-29 1:58 ` Hal Feng
0 siblings, 1 reply; 4+ messages in thread
From: Conor Dooley @ 2023-08-28 12:05 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Hal Feng, Conor Dooley, Emil Renner Berthing, Rob Herring,
Krzysztof Kozlowski, Palmer Dabbelt, Paul Walmsley, Albert Ou,
devicetree, linux-riscv, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2589 bytes --]
On Mon, Aug 28, 2023 at 01:54:53PM +0200, Krzysztof Kozlowski wrote:
> On 28/08/2023 13:52, Hal Feng wrote:
> > usb0 was disabled by mistake when merging, so enable it.
> > tdm_pins node should be sorted alphabetically.
> >
> > Fixes: e7c304c0346d ("riscv: dts: starfive: jh7110: add the node and pins configuration for tdm")
> > Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
> > ---
> > .../jh7110-starfive-visionfive-2.dtsi | 49 ++++++++++---------
> > 1 file changed, 25 insertions(+), 24 deletions(-)
> >
> > 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 d79f94432b27..382dfb5e64e4 100644
> > --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
> > +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
> > @@ -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>;
> > + };
>
>
> What is fixed in this hunk? Order of nodes is just a style, not a bug
> needing backports.
Please split this in two parts, with one for my screwed up conflict
resolution & one for the node ordering.
Thanks,
Conor.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [-next v1] riscv: dts: starfive: visionfive 2: Enable usb0 and fix tdm pins sort order
2023-08-28 12:05 ` Conor Dooley
@ 2023-08-29 1:58 ` Hal Feng
0 siblings, 0 replies; 4+ messages in thread
From: Hal Feng @ 2023-08-29 1:58 UTC (permalink / raw)
To: Conor Dooley, Krzysztof Kozlowski
Cc: Conor Dooley, Emil Renner Berthing, Rob Herring,
Krzysztof Kozlowski, Palmer Dabbelt, Paul Walmsley, Albert Ou,
devicetree, linux-riscv, linux-kernel
On Mon, 28 Aug 2023 13:05:06 +0100, Conor Dooley wrote:
> On Mon, Aug 28, 2023 at 01:54:53PM +0200, Krzysztof Kozlowski wrote:
>> On 28/08/2023 13:52, Hal Feng wrote:
>> > usb0 was disabled by mistake when merging, so enable it.
>> > tdm_pins node should be sorted alphabetically.
>> >
>> > Fixes: e7c304c0346d ("riscv: dts: starfive: jh7110: add the node and pins configuration for tdm")
>> > Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
>> > ---
>> > .../jh7110-starfive-visionfive-2.dtsi | 49 ++++++++++---------
>> > 1 file changed, 25 insertions(+), 24 deletions(-)
>> >
>> > 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 d79f94432b27..382dfb5e64e4 100644
>> > --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
>> > +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
>> > @@ -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>;
>> > + };
>>
>>
>> What is fixed in this hunk? Order of nodes is just a style, not a bug
>> needing backports.
>
> Please split this in two parts, with one for my screwed up conflict
> resolution & one for the node ordering.
OK, I will split this into two patches. Thanks.
Best regards,
Hal
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-08-29 1:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-28 11:52 [-next v1] riscv: dts: starfive: visionfive 2: Enable usb0 and fix tdm pins sort order Hal Feng
2023-08-28 11:54 ` Krzysztof Kozlowski
2023-08-28 12:05 ` Conor Dooley
2023-08-29 1:58 ` Hal Feng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).