diff mbox series

[2/2] riscv: dts: microchip: Add ethernet0 to the aliases node

Message ID 20210702014319.1265766-2-bmeng.cn@gmail.com (mailing list archive)
State New, archived
Headers show
Series [1/2] riscv: dts: microchip: Use 'local-mac-address' for emac1 | expand

Commit Message

Bin Meng July 2, 2021, 1:43 a.m. UTC
From: Bin Meng <bin.meng@windriver.com>

U-Boot expects this alias to be in place in order to fix up the mac
address of the ethernet node.

Note on the Icicle Kit board, currently only emac1 is enabled so it
becomes the 'ethernet0'.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
---

 arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Conor Dooley July 9, 2021, 10:06 a.m. UTC | #1
On 02/07/2021 02:43, Bin Meng wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> From: Bin Meng <bin.meng@windriver.com>
>
> U-Boot expects this alias to be in place in order to fix up the mac
> address of the ethernet node.
>
> Note on the Icicle Kit board, currently only emac1 is enabled so it
> becomes the 'ethernet0'.
>
> Signed-off-by: Bin Meng <bin.meng@windriver.com>
> ---
>
>   arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> index a9c558366d61..16cc6573107b 100644
> --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> @@ -9,6 +9,10 @@ / {
>          model = "Microchip MPFS Icicle Kit";
>          compatible = "microchip,mpfs-icicle-kit";
>
> +       aliases {
> +               ethernet0 = &emac1;
> +       };
> +
>          chosen {
>          };

Sure.
Reviewed-by: conor dooley<conor.dooley@microchip.com>

> --
> 2.25.1
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
Geert Uytterhoeven July 16, 2021, 9:23 a.m. UTC | #2
Hi Bing,

On Fri, Jul 2, 2021 at 3:44 AM Bin Meng <bmeng.cn@gmail.com> wrote:
> From: Bin Meng <bin.meng@windriver.com>
>
> U-Boot expects this alias to be in place in order to fix up the mac
> address of the ethernet node.
>
> Note on the Icicle Kit board, currently only emac1 is enabled so it
> becomes the 'ethernet0'.
>
> Signed-off-by: Bin Meng <bin.meng@windriver.com>

Thanks for your patch!

> --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> @@ -9,6 +9,10 @@ / {
>         model = "Microchip MPFS Icicle Kit";
>         compatible = "microchip,mpfs-icicle-kit";
>
> +       aliases {
> +               ethernet0 = &emac1;
> +       };
> +
>         chosen {
>         };

This should be added to the board DTS (microchip-mpfs-icicle-kit.dts)
instead.

Gr{oetje,eeting}s,

                        Geert
Bin Meng July 16, 2021, 10:14 a.m. UTC | #3
Hi Geert,

On Fri, Jul 16, 2021 at 5:23 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> Hi Bing,
>
> On Fri, Jul 2, 2021 at 3:44 AM Bin Meng <bmeng.cn@gmail.com> wrote:
> > From: Bin Meng <bin.meng@windriver.com>
> >
> > U-Boot expects this alias to be in place in order to fix up the mac
> > address of the ethernet node.
> >
> > Note on the Icicle Kit board, currently only emac1 is enabled so it
> > becomes the 'ethernet0'.
> >
> > Signed-off-by: Bin Meng <bin.meng@windriver.com>
>
> Thanks for your patch!

Thanks for the review!

>
> > --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> > +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> > @@ -9,6 +9,10 @@ / {
> >         model = "Microchip MPFS Icicle Kit";
> >         compatible = "microchip,mpfs-icicle-kit";
> >
> > +       aliases {
> > +               ethernet0 = &emac1;
> > +       };
> > +
> >         chosen {
> >         };
>
> This should be added to the board DTS (microchip-mpfs-icicle-kit.dts)
> instead.

I was wondering the same thing before doing this, but when I checked
all other DTS in arch/riscv/boot I found the aliases node is put in
the SoC dtsi file instead of the board on so I think that's the
convention.

Regards,
Bin
Geert Uytterhoeven July 16, 2021, 11:34 a.m. UTC | #4
Hi Bin,

On Fri, Jul 16, 2021 at 12:14 PM Bin Meng <bmeng.cn@gmail.com> wrote:
> On Fri, Jul 16, 2021 at 5:23 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> > On Fri, Jul 2, 2021 at 3:44 AM Bin Meng <bmeng.cn@gmail.com> wrote:
> > > --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> > > +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> > > @@ -9,6 +9,10 @@ / {
> > >         model = "Microchip MPFS Icicle Kit";
> > >         compatible = "microchip,mpfs-icicle-kit";
> > >
> > > +       aliases {
> > > +               ethernet0 = &emac1;
> > > +       };
> > > +
> > >         chosen {
> > >         };
> >
> > This should be added to the board DTS (microchip-mpfs-icicle-kit.dts)
> > instead.
>
> I was wondering the same thing before doing this, but when I checked
> all other DTS in arch/riscv/boot I found the aliases node is put in
> the SoC dtsi file instead of the board on so I think that's the
> convention.

The numbering of the aliases is supposed to match the labels on the
board, hence it is board-specific, not SoC-specific.

Gr{oetje,eeting}s,

                        Geert
Palmer Dabbelt Aug. 4, 2021, 3:55 a.m. UTC | #5
On Fri, 16 Jul 2021 04:34:02 PDT (-0700), geert@linux-m68k.org wrote:
> Hi Bin,
>
> On Fri, Jul 16, 2021 at 12:14 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>> On Fri, Jul 16, 2021 at 5:23 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>> > On Fri, Jul 2, 2021 at 3:44 AM Bin Meng <bmeng.cn@gmail.com> wrote:
>> > > --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
>> > > +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
>> > > @@ -9,6 +9,10 @@ / {
>> > >         model = "Microchip MPFS Icicle Kit";
>> > >         compatible = "microchip,mpfs-icicle-kit";
>> > >
>> > > +       aliases {
>> > > +               ethernet0 = &emac1;
>> > > +       };
>> > > +
>> > >         chosen {
>> > >         };
>> >
>> > This should be added to the board DTS (microchip-mpfs-icicle-kit.dts)
>> > instead.
>>
>> I was wondering the same thing before doing this, but when I checked
>> all other DTS in arch/riscv/boot I found the aliases node is put in
>> the SoC dtsi file instead of the board on so I think that's the
>> convention.
>
> The numbering of the aliases is supposed to match the labels on the
> board, hence it is board-specific, not SoC-specific.
>
> Gr{oetje,eeting}s,
>
>                         Geert

I don't see a v2 of this.
Bin Meng Aug. 4, 2021, 3:55 a.m. UTC | #6
On Wed, Aug 4, 2021 at 11:55 AM Palmer Dabbelt <palmer@dabbelt.com> wrote:
>
> On Fri, 16 Jul 2021 04:34:02 PDT (-0700), geert@linux-m68k.org wrote:
> > Hi Bin,
> >
> > On Fri, Jul 16, 2021 at 12:14 PM Bin Meng <bmeng.cn@gmail.com> wrote:
> >> On Fri, Jul 16, 2021 at 5:23 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> >> > On Fri, Jul 2, 2021 at 3:44 AM Bin Meng <bmeng.cn@gmail.com> wrote:
> >> > > --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> >> > > +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> >> > > @@ -9,6 +9,10 @@ / {
> >> > >         model = "Microchip MPFS Icicle Kit";
> >> > >         compatible = "microchip,mpfs-icicle-kit";
> >> > >
> >> > > +       aliases {
> >> > > +               ethernet0 = &emac1;
> >> > > +       };
> >> > > +
> >> > >         chosen {
> >> > >         };
> >> >
> >> > This should be added to the board DTS (microchip-mpfs-icicle-kit.dts)
> >> > instead.
> >>
> >> I was wondering the same thing before doing this, but when I checked
> >> all other DTS in arch/riscv/boot I found the aliases node is put in
> >> the SoC dtsi file instead of the board on so I think that's the
> >> convention.
> >
> > The numbering of the aliases is supposed to match the labels on the
> > board, hence it is board-specific, not SoC-specific.
> >
> > Gr{oetje,eeting}s,
> >
> >                         Geert
>
> I don't see a v2 of this.

Will send v2 soon.

Regards,
Bin
Palmer Dabbelt Aug. 4, 2021, 4:18 a.m. UTC | #7
On Tue, 03 Aug 2021 20:55:56 PDT (-0700), bmeng.cn@gmail.com wrote:
> On Wed, Aug 4, 2021 at 11:55 AM Palmer Dabbelt <palmer@dabbelt.com> wrote:
>>
>> On Fri, 16 Jul 2021 04:34:02 PDT (-0700), geert@linux-m68k.org wrote:
>> > Hi Bin,
>> >
>> > On Fri, Jul 16, 2021 at 12:14 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>> >> On Fri, Jul 16, 2021 at 5:23 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>> >> > On Fri, Jul 2, 2021 at 3:44 AM Bin Meng <bmeng.cn@gmail.com> wrote:
>> >> > > --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
>> >> > > +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
>> >> > > @@ -9,6 +9,10 @@ / {
>> >> > >         model = "Microchip MPFS Icicle Kit";
>> >> > >         compatible = "microchip,mpfs-icicle-kit";
>> >> > >
>> >> > > +       aliases {
>> >> > > +               ethernet0 = &emac1;
>> >> > > +       };
>> >> > > +
>> >> > >         chosen {
>> >> > >         };
>> >> >
>> >> > This should be added to the board DTS (microchip-mpfs-icicle-kit.dts)
>> >> > instead.
>> >>
>> >> I was wondering the same thing before doing this, but when I checked
>> >> all other DTS in arch/riscv/boot I found the aliases node is put in
>> >> the SoC dtsi file instead of the board on so I think that's the
>> >> convention.
>> >
>> > The numbering of the aliases is supposed to match the labels on the
>> > board, hence it is board-specific, not SoC-specific.
>> >
>> > Gr{oetje,eeting}s,
>> >
>> >                         Geert
>>
>> I don't see a v2 of this.
>
> Will send v2 soon.

Thanks.  I'm assuming you're going to send both patches.
diff mbox series

Patch

diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
index a9c558366d61..16cc6573107b 100644
--- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
+++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
@@ -9,6 +9,10 @@  / {
 	model = "Microchip MPFS Icicle Kit";
 	compatible = "microchip,mpfs-icicle-kit";
 
+	aliases {
+		ethernet0 = &emac1;
+	};
+
 	chosen {
 	};