Message ID | 1585878187-8131-4-git-send-email-hayashi.kunihiko@socionext.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | 94a8c115cc5ed8e7afff3bcda243210276a33927 |
Headers | show |
Series | Add devicetree features and fixes for UniPhier SoCs | expand |
On Fri, Apr 3, 2020 at 10:43 AM Kunihiko Hayashi <hayashi.kunihiko@socionext.com> wrote: > > Add an 'aliases' property for ethernet device. > > U-boot performs a fix-up of the MAC address and will overwrite the values U-boot -> U-Boot > from the Linux devicetree for aliased ethernet device. The MAC address can > be inherited from u-boot by adding aliases of ethernet devices. u-boot -> U-Boot I fixed up those, applied the series. > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > --- > arch/arm/boot/dts/uniphier-ld6b-ref.dts | 1 + > arch/arm/boot/dts/uniphier-pro4-ace.dts | 1 + > arch/arm/boot/dts/uniphier-pro4-ref.dts | 1 + > arch/arm/boot/dts/uniphier-pro4-sanji.dts | 1 + > arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 1 + > arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 1 + > 6 files changed, 6 insertions(+) > > diff --git a/arch/arm/boot/dts/uniphier-ld6b-ref.dts b/arch/arm/boot/dts/uniphier-ld6b-ref.dts > index 60994b6..079cadc 100644 > --- a/arch/arm/boot/dts/uniphier-ld6b-ref.dts > +++ b/arch/arm/boot/dts/uniphier-ld6b-ref.dts > @@ -29,6 +29,7 @@ > i2c4 = &i2c4; > i2c5 = &i2c5; > i2c6 = &i2c6; > + ethernet0 = ð > }; > > memory@80000000 { > diff --git a/arch/arm/boot/dts/uniphier-pro4-ace.dts b/arch/arm/boot/dts/uniphier-pro4-ace.dts > index 92cc48d..64246fa 100644 > --- a/arch/arm/boot/dts/uniphier-pro4-ace.dts > +++ b/arch/arm/boot/dts/uniphier-pro4-ace.dts > @@ -26,6 +26,7 @@ > i2c3 = &i2c3; > i2c5 = &i2c5; > i2c6 = &i2c6; > + ethernet0 = ð > }; > > memory@80000000 { > diff --git a/arch/arm/boot/dts/uniphier-pro4-ref.dts b/arch/arm/boot/dts/uniphier-pro4-ref.dts > index 854f2eb..181442c 100644 > --- a/arch/arm/boot/dts/uniphier-pro4-ref.dts > +++ b/arch/arm/boot/dts/uniphier-pro4-ref.dts > @@ -29,6 +29,7 @@ > i2c3 = &i2c3; > i2c5 = &i2c5; > i2c6 = &i2c6; > + ethernet0 = ð > }; > > memory@80000000 { > diff --git a/arch/arm/boot/dts/uniphier-pro4-sanji.dts b/arch/arm/boot/dts/uniphier-pro4-sanji.dts > index dda1a2f..5396556 100644 > --- a/arch/arm/boot/dts/uniphier-pro4-sanji.dts > +++ b/arch/arm/boot/dts/uniphier-pro4-sanji.dts > @@ -25,6 +25,7 @@ > i2c3 = &i2c3; > i2c5 = &i2c5; > i2c6 = &i2c6; > + ethernet0 = ð > }; > > memory@80000000 { > diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts > index e27fd4f..8e9ac57 100644 > --- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts > +++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts > @@ -26,6 +26,7 @@ > i2c4 = &i2c4; > i2c5 = &i2c5; > i2c6 = &i2c6; > + ethernet0 = ð > }; > > memory@80000000 { > diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts > index 23fe42b..8eacc7b 100644 > --- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts > +++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts > @@ -24,6 +24,7 @@ > i2c4 = &i2c4; > i2c5 = &i2c5; > i2c6 = &i2c6; > + ethernet0 = ð > }; > > memory@80000000 { > -- > 2.7.4 >
diff --git a/arch/arm/boot/dts/uniphier-ld6b-ref.dts b/arch/arm/boot/dts/uniphier-ld6b-ref.dts index 60994b6..079cadc 100644 --- a/arch/arm/boot/dts/uniphier-ld6b-ref.dts +++ b/arch/arm/boot/dts/uniphier-ld6b-ref.dts @@ -29,6 +29,7 @@ i2c4 = &i2c4; i2c5 = &i2c5; i2c6 = &i2c6; + ethernet0 = ð }; memory@80000000 { diff --git a/arch/arm/boot/dts/uniphier-pro4-ace.dts b/arch/arm/boot/dts/uniphier-pro4-ace.dts index 92cc48d..64246fa 100644 --- a/arch/arm/boot/dts/uniphier-pro4-ace.dts +++ b/arch/arm/boot/dts/uniphier-pro4-ace.dts @@ -26,6 +26,7 @@ i2c3 = &i2c3; i2c5 = &i2c5; i2c6 = &i2c6; + ethernet0 = ð }; memory@80000000 { diff --git a/arch/arm/boot/dts/uniphier-pro4-ref.dts b/arch/arm/boot/dts/uniphier-pro4-ref.dts index 854f2eb..181442c 100644 --- a/arch/arm/boot/dts/uniphier-pro4-ref.dts +++ b/arch/arm/boot/dts/uniphier-pro4-ref.dts @@ -29,6 +29,7 @@ i2c3 = &i2c3; i2c5 = &i2c5; i2c6 = &i2c6; + ethernet0 = ð }; memory@80000000 { diff --git a/arch/arm/boot/dts/uniphier-pro4-sanji.dts b/arch/arm/boot/dts/uniphier-pro4-sanji.dts index dda1a2f..5396556 100644 --- a/arch/arm/boot/dts/uniphier-pro4-sanji.dts +++ b/arch/arm/boot/dts/uniphier-pro4-sanji.dts @@ -25,6 +25,7 @@ i2c3 = &i2c3; i2c5 = &i2c5; i2c6 = &i2c6; + ethernet0 = ð }; memory@80000000 { diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts index e27fd4f..8e9ac57 100644 --- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts +++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts @@ -26,6 +26,7 @@ i2c4 = &i2c4; i2c5 = &i2c5; i2c6 = &i2c6; + ethernet0 = ð }; memory@80000000 { diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts index 23fe42b..8eacc7b 100644 --- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts +++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts @@ -24,6 +24,7 @@ i2c4 = &i2c4; i2c5 = &i2c5; i2c6 = &i2c6; + ethernet0 = ð }; memory@80000000 {
Add an 'aliases' property for ethernet device. U-boot performs a fix-up of the MAC address and will overwrite the values from the Linux devicetree for aliased ethernet device. The MAC address can be inherited from u-boot by adding aliases of ethernet devices. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> --- arch/arm/boot/dts/uniphier-ld6b-ref.dts | 1 + arch/arm/boot/dts/uniphier-pro4-ace.dts | 1 + arch/arm/boot/dts/uniphier-pro4-ref.dts | 1 + arch/arm/boot/dts/uniphier-pro4-sanji.dts | 1 + arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 1 + arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 1 + 6 files changed, 6 insertions(+)