diff mbox

[v2] ARM: omap3: beagleboard-xm: dt: Add ethernet to the device tree

Message ID 1480713097-5931-1-git-send-email-laurent.pinchart@ideasonboard.com
State New, archived
Headers show

Commit Message

Laurent Pinchart Dec. 2, 2016, 9:11 p.m. UTC
The Beagleboard-xM has a LAN9514 USB hub and ethernet controller,
connected to port 2 of the OMAP EHCI controller. The board however has
no EEPROM to store the ethernet MAC address, which is programmed by the
boot loader.

To allow Linux to use the same MAC address as the boot loader (or for
that matter any fixed MAC address), we need a node in the device tree
for the ethernet controller that the boot loader can update at runtime
with a local-mac-address property. Add it, along with an alias for the
ethernet controller to let the boot loader locate it easily.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Changes since v1:

- Renamed usb2 DT node to hub
---
 arch/arm/boot/dts/omap3-beagle-xm.dts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

Comments

Tony Lindgren Jan. 5, 2017, 4:19 p.m. UTC | #1
* Laurent Pinchart <laurent.pinchart@ideasonboard.com> [161202 13:11]:
> The Beagleboard-xM has a LAN9514 USB hub and ethernet controller,
> connected to port 2 of the OMAP EHCI controller. The board however has
> no EEPROM to store the ethernet MAC address, which is programmed by the
> boot loader.
> 
> To allow Linux to use the same MAC address as the boot loader (or for
> that matter any fixed MAC address), we need a node in the device tree
> for the ethernet controller that the boot loader can update at runtime
> with a local-mac-address property. Add it, along with an alias for the
> ethernet controller to let the boot loader locate it easily.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> Changes since v1:
> 
> - Renamed usb2 DT node to hub

Applying this finally into omap-for-v4.11/dt. Will post my related
patches using the hub naming shortly.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rob Herring Jan. 5, 2017, 4:27 p.m. UTC | #2
On Fri, Dec 2, 2016 at 3:11 PM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> The Beagleboard-xM has a LAN9514 USB hub and ethernet controller,
> connected to port 2 of the OMAP EHCI controller. The board however has
> no EEPROM to store the ethernet MAC address, which is programmed by the
> boot loader.
>
> To allow Linux to use the same MAC address as the boot loader (or for
> that matter any fixed MAC address), we need a node in the device tree
> for the ethernet controller that the boot loader can update at runtime
> with a local-mac-address property. Add it, along with an alias for the
> ethernet controller to let the boot loader locate it easily.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> Changes since v1:
>
> - Renamed usb2 DT node to hub
> ---
>  arch/arm/boot/dts/omap3-beagle-xm.dts | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
>
> diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
> index 85e297ed0ea1..673cee2234b2 100644
> --- a/arch/arm/boot/dts/omap3-beagle-xm.dts
> +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
> @@ -27,6 +27,7 @@
>         aliases {
>                 display0 = &dvi0;
>                 display1 = &tv0;
> +               ethernet = &ethernet;

Sorry, just noticed this, but this should be dropped. It's not used
nor do we want an alias here.

Rob

P.S. The display ones are questionable, too. Only OMAP has them and
per platform alias names is not something we want.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren Jan. 5, 2017, 4:39 p.m. UTC | #3
* Rob Herring <robh@kernel.org> [170105 08:28]:
> On Fri, Dec 2, 2016 at 3:11 PM, Laurent Pinchart
> <laurent.pinchart@ideasonboard.com> wrote:
> > The Beagleboard-xM has a LAN9514 USB hub and ethernet controller,
> > connected to port 2 of the OMAP EHCI controller. The board however has
> > no EEPROM to store the ethernet MAC address, which is programmed by the
> > boot loader.
> >
> > To allow Linux to use the same MAC address as the boot loader (or for
> > that matter any fixed MAC address), we need a node in the device tree
> > for the ethernet controller that the boot loader can update at runtime
> > with a local-mac-address property. Add it, along with an alias for the
> > ethernet controller to let the boot loader locate it easily.
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> > Changes since v1:
> >
> > - Renamed usb2 DT node to hub
> > ---
> >  arch/arm/boot/dts/omap3-beagle-xm.dts | 16 ++++++++++++++++
> >  1 file changed, 16 insertions(+)
> >
> > diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
> > index 85e297ed0ea1..673cee2234b2 100644
> > --- a/arch/arm/boot/dts/omap3-beagle-xm.dts
> > +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
> > @@ -27,6 +27,7 @@
> >         aliases {
> >                 display0 = &dvi0;
> >                 display1 = &tv0;
> > +               ethernet = &ethernet;
> 
> Sorry, just noticed this, but this should be dropped. It's not used
> nor do we want an alias here.

OK, will update locally as I have not pushed out yet.

> P.S. The display ones are questionable, too. Only OMAP has them and
> per platform alias names is not something we want.

OK. What about the mmc ones? Otherwise the MMC devices keep moving
around depending on the kernel version..

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Laurent Pinchart Jan. 5, 2017, 4:48 p.m. UTC | #4
Hello,

On Thursday 05 Jan 2017 08:39:29 Tony Lindgren wrote:
> * Rob Herring <robh@kernel.org> [170105 08:28]:
> > On Fri, Dec 2, 2016 at 3:11 PM, Laurent Pinchart wrote:
> >> The Beagleboard-xM has a LAN9514 USB hub and ethernet controller,
> >> connected to port 2 of the OMAP EHCI controller. The board however has
> >> no EEPROM to store the ethernet MAC address, which is programmed by the
> >> boot loader.
> >> 
> >> To allow Linux to use the same MAC address as the boot loader (or for
> >> that matter any fixed MAC address), we need a node in the device tree
> >> for the ethernet controller that the boot loader can update at runtime
> >> with a local-mac-address property. Add it, along with an alias for the
> >> ethernet controller to let the boot loader locate it easily.
> >> 
> >> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> >> ---
> >> Changes since v1:
> >> 
> >> - Renamed usb2 DT node to hub
> >> ---
> >> 
> >>  arch/arm/boot/dts/omap3-beagle-xm.dts | 16 ++++++++++++++++
> >>  1 file changed, 16 insertions(+)
> >> 
> >> diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts
> >> b/arch/arm/boot/dts/omap3-beagle-xm.dts index
> >> 85e297ed0ea1..673cee2234b2 100644
> >> --- a/arch/arm/boot/dts/omap3-beagle-xm.dts
> >> +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
> >> @@ -27,6 +27,7 @@
> >>         aliases {
> >>                 display0 = &dvi0;
> >>                 display1 = &tv0;
> >> +               ethernet = &ethernet;
> > 
> > Sorry, just noticed this, but this should be dropped. It's not used
> > nor do we want an alias here.
> 
> OK, will update locally as I have not pushed out yet.

The ethernet alias is used by U-Boot to locate the ethernet controller and 
update the MAC address.

> > P.S. The display ones are questionable, too. Only OMAP has them and
> > per platform alias names is not something we want.
> 
> OK. What about the mmc ones? Otherwise the MMC devices keep moving
> around depending on the kernel version..
Tony Lindgren Jan. 5, 2017, 4:51 p.m. UTC | #5
* Laurent Pinchart <laurent.pinchart@ideasonboard.com> [170105 08:49]:
> On Thursday 05 Jan 2017 08:39:29 Tony Lindgren wrote:
> > * Rob Herring <robh@kernel.org> [170105 08:28]:
> > > On Fri, Dec 2, 2016 at 3:11 PM, Laurent Pinchart wrote:
> > >> The Beagleboard-xM has a LAN9514 USB hub and ethernet controller,
> > >> connected to port 2 of the OMAP EHCI controller. The board however has
> > >> no EEPROM to store the ethernet MAC address, which is programmed by the
> > >> boot loader.
> > >> 
> > >> To allow Linux to use the same MAC address as the boot loader (or for
> > >> that matter any fixed MAC address), we need a node in the device tree
> > >> for the ethernet controller that the boot loader can update at runtime
> > >> with a local-mac-address property. Add it, along with an alias for the
> > >> ethernet controller to let the boot loader locate it easily.
> > >> 
> > >> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > >> ---
> > >> Changes since v1:
> > >> 
> > >> - Renamed usb2 DT node to hub
> > >> ---
> > >> 
> > >>  arch/arm/boot/dts/omap3-beagle-xm.dts | 16 ++++++++++++++++
> > >>  1 file changed, 16 insertions(+)
> > >> 
> > >> diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts
> > >> b/arch/arm/boot/dts/omap3-beagle-xm.dts index
> > >> 85e297ed0ea1..673cee2234b2 100644
> > >> --- a/arch/arm/boot/dts/omap3-beagle-xm.dts
> > >> +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
> > >> @@ -27,6 +27,7 @@
> > >>         aliases {
> > >>                 display0 = &dvi0;
> > >>                 display1 = &tv0;
> > >> +               ethernet = &ethernet;
> > > 
> > > Sorry, just noticed this, but this should be dropped. It's not used
> > > nor do we want an alias here.
> > 
> > OK, will update locally as I have not pushed out yet.
> 
> The ethernet alias is used by U-Boot to locate the ethernet controller and 
> update the MAC address.

OK let's wait a bit on this one then.

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rob Herring Jan. 5, 2017, 6:50 p.m. UTC | #6
On Thu, Jan 5, 2017 at 10:48 AM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> Hello,
>
> On Thursday 05 Jan 2017 08:39:29 Tony Lindgren wrote:
>> * Rob Herring <robh@kernel.org> [170105 08:28]:
>> > On Fri, Dec 2, 2016 at 3:11 PM, Laurent Pinchart wrote:
>> >> The Beagleboard-xM has a LAN9514 USB hub and ethernet controller,
>> >> connected to port 2 of the OMAP EHCI controller. The board however has
>> >> no EEPROM to store the ethernet MAC address, which is programmed by the
>> >> boot loader.
>> >>
>> >> To allow Linux to use the same MAC address as the boot loader (or for
>> >> that matter any fixed MAC address), we need a node in the device tree
>> >> for the ethernet controller that the boot loader can update at runtime
>> >> with a local-mac-address property. Add it, along with an alias for the
>> >> ethernet controller to let the boot loader locate it easily.
>> >>
>> >> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>> >> ---
>> >> Changes since v1:
>> >>
>> >> - Renamed usb2 DT node to hub
>> >> ---
>> >>
>> >>  arch/arm/boot/dts/omap3-beagle-xm.dts | 16 ++++++++++++++++
>> >>  1 file changed, 16 insertions(+)
>> >>
>> >> diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts
>> >> b/arch/arm/boot/dts/omap3-beagle-xm.dts index
>> >> 85e297ed0ea1..673cee2234b2 100644
>> >> --- a/arch/arm/boot/dts/omap3-beagle-xm.dts
>> >> +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
>> >> @@ -27,6 +27,7 @@
>> >>         aliases {
>> >>                 display0 = &dvi0;
>> >>                 display1 = &tv0;
>> >> +               ethernet = &ethernet;
>> >
>> > Sorry, just noticed this, but this should be dropped. It's not used
>> > nor do we want an alias here.
>>
>> OK, will update locally as I have not pushed out yet.
>
> The ethernet alias is used by U-Boot to locate the ethernet controller and
> update the MAC address.

Okay. Though with only only one, I don't see why that is hard to find.
Anyway, this is the least of u-boot's DT abuses.

>> > P.S. The display ones are questionable, too. Only OMAP has them and
>> > per platform alias names is not something we want.
>>
>> OK. What about the mmc ones? Otherwise the MMC devices keep moving
>> around depending on the kernel version..

This is a solved problem. Consistent dev numbering is not a feature of
the kernel and MMC is not special.

Rob
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren Jan. 6, 2017, 4:49 p.m. UTC | #7
* Rob Herring <robh@kernel.org> [170105 10:51]:
> On Thu, Jan 5, 2017 at 10:48 AM, Laurent Pinchart
> <laurent.pinchart@ideasonboard.com> wrote:
> > Hello,
> >
> > On Thursday 05 Jan 2017 08:39:29 Tony Lindgren wrote:
> >> * Rob Herring <robh@kernel.org> [170105 08:28]:
> >> > On Fri, Dec 2, 2016 at 3:11 PM, Laurent Pinchart wrote:
> >> >> The Beagleboard-xM has a LAN9514 USB hub and ethernet controller,
> >> >> connected to port 2 of the OMAP EHCI controller. The board however has
> >> >> no EEPROM to store the ethernet MAC address, which is programmed by the
> >> >> boot loader.
> >> >>
> >> >> To allow Linux to use the same MAC address as the boot loader (or for
> >> >> that matter any fixed MAC address), we need a node in the device tree
> >> >> for the ethernet controller that the boot loader can update at runtime
> >> >> with a local-mac-address property. Add it, along with an alias for the
> >> >> ethernet controller to let the boot loader locate it easily.
> >> >>
> >> >> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> >> >> ---
> >> >> Changes since v1:
> >> >>
> >> >> - Renamed usb2 DT node to hub
> >> >> ---
> >> >>
> >> >>  arch/arm/boot/dts/omap3-beagle-xm.dts | 16 ++++++++++++++++
> >> >>  1 file changed, 16 insertions(+)
> >> >>
> >> >> diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts
> >> >> b/arch/arm/boot/dts/omap3-beagle-xm.dts index
> >> >> 85e297ed0ea1..673cee2234b2 100644
> >> >> --- a/arch/arm/boot/dts/omap3-beagle-xm.dts
> >> >> +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
> >> >> @@ -27,6 +27,7 @@
> >> >>         aliases {
> >> >>                 display0 = &dvi0;
> >> >>                 display1 = &tv0;
> >> >> +               ethernet = &ethernet;
> >> >
> >> > Sorry, just noticed this, but this should be dropped. It's not used
> >> > nor do we want an alias here.
> >>
> >> OK, will update locally as I have not pushed out yet.
> >
> > The ethernet alias is used by U-Boot to locate the ethernet controller and
> > update the MAC address.
> 
> Okay. Though with only only one, I don't see why that is hard to find.
> Anyway, this is the least of u-boot's DT abuses.

Applying Laurent's original patch then into omap-for-v4.11/dt.

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index 85e297ed0ea1..673cee2234b2 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -27,6 +27,7 @@ 
 	aliases {
 		display0 = &dvi0;
 		display1 = &tv0;
+		ethernet = &ethernet;
 	};
 
 	leds {
@@ -348,6 +349,21 @@ 
 
 &usbhsehci {
 	phys = <0 &hsusb2_phy>;
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	hub@2 {
+		compatible = "usb424,9514";
+		reg = <2>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		ethernet: usbether@1 {
+			compatible = "usb424,ec00";
+			reg = <1>;
+		};
+	};
 };
 
 &vaux2 {