From: Hal Feng <hal.feng@starfivetech.com>
To: Conor Dooley <conor.dooley@microchip.com>,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Cc: Conor Dooley <conor+dt@kernel.org>,
Emil Renner Berthing <emil.renner.berthing@canonical.com>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Palmer Dabbelt <palmer@dabbelt.com>,
Paul Walmsley <paul.walmsley@sifive.com>,
Albert Ou <aou@eecs.berkeley.edu>, <devicetree@vger.kernel.org>,
<linux-riscv@lists.infradead.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [-next v1] riscv: dts: starfive: visionfive 2: Enable usb0 and fix tdm pins sort order
Date: Tue, 29 Aug 2023 09:58:21 +0800 [thread overview]
Message-ID: <afac7b40-1bdc-c546-1ba1-2cfba74e6adc@starfivetech.com> (raw)
In-Reply-To: <20230828-hence-unguarded-2020c68246e8@wendy>
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
prev parent reply other threads:[~2023-08-29 1:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=afac7b40-1bdc-c546-1ba1-2cfba74e6adc@starfivetech.com \
--to=hal.feng@starfivetech.com \
--cc=aou@eecs.berkeley.edu \
--cc=conor+dt@kernel.org \
--cc=conor.dooley@microchip.com \
--cc=devicetree@vger.kernel.org \
--cc=emil.renner.berthing@canonical.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).