Hi Nicolas, On Fri, Dec 02, 2011 at 06:14:10PM +0100, Nicolas Ferre wrote: > From: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> > > Allow the device tree to provide the mac address and the phy mode. > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> > [[email protected]: change "compatible" node property, doc and DT > hwaddr] > Signed-off-by: Nicolas Ferre <[email protected]> > Cc: Jamie Iles <[email protected]>
Looks nice to me. There's a patch below to add the GEM stuff to the binding too if you want to role that in. Acked-by: Jamie Iles <[email protected]> 8<---- diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt index 7f0b90a..e09e3fb 100644 --- a/Documentation/devicetree/bindings/net/macb.txt +++ b/Documentation/devicetree/bindings/net/macb.txt @@ -1,9 +1,11 @@ -* Cadence MACB Ethernet controller +* Cadence MACB/GEM Ethernet controller Required properties: -- compatible: Should be "cdns,[<chip>-]macb" +- compatible: Should be "cdns,[<chip>-]{macb,gem}" Use "cdns,at91sam9260-macb" Atmel at91sam9260 and at91sam9263 SoCs. Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb" + Use "cnds,pc302-gem" for Picochip picoXcell pc302 and later devices based on + the Cadence GEM, or the generic form "cdns,gem". - reg: Address and length of the register set for the device - interrupts: Should contain macb interrupt - phy-mode: String, operation mode of the PHY interface. diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 103c6e6..89060e6 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -1247,6 +1247,8 @@ static const struct of_device_id macb_dt_ids[] = { { .compatible = "cdns,at32ap7000-macb" }, { .compatible = "cdns,at91sam9260-macb" }, { .compatible = "cdns,macb" }, + { .compatible = "cdns,pc302-gem" }, + { .compatible = "cdns,gem" }, { /* sentinel */ } }; _______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
