devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Markus Pargmann <mpa@pengutronix.de>
To: "David S. Miller" <davem@davemloft.net>
Cc: "Benoît Cousson" <bcousson@baylibre.com>,
	linux-omap@vger.kernel.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de,
	"Markus Pargmann" <mpa@pengutronix.de>
Subject: [PATCH v2 5/5] arm: dts: am33xx, Add device node for cpsw-ctrl-macid
Date: Sat, 15 Mar 2014 14:07:44 +0100	[thread overview]
Message-ID: <1394888864-11007-6-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1394888864-11007-1-git-send-email-mpa@pengutronix.de>

Add cpsw-ctrl-macid to the am33xx dtsi file. It does not change the
behaviour of boards with a provided mac-address, so it is safe to add it
for all boards with this CPU.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 arch/arm/boot/dts/am33xx.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 6d95d3d..5aff257 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -690,11 +690,13 @@
 			cpsw_emac0: slave@4a100200 {
 				/* Filled in by U-Boot */
 				mac-address = [ 00 00 00 00 00 00 ];
+				ti,mac-address-ctrl = <&cpsw_ctrl_macid 0>;
 			};
 
 			cpsw_emac1: slave@4a100300 {
 				/* Filled in by U-Boot */
 				mac-address = [ 00 00 00 00 00 00 ];
+				ti,mac-address-ctrl = <&cpsw_ctrl_macid 1>;
 			};
 
 			phy_sel: cpsw-phy-sel@44e10650 {
@@ -702,6 +704,13 @@
 				reg= <0x44e10650 0x4>;
 				reg-names = "gmii-sel";
 			};
+
+			cpsw_ctrl_macid: cpsw-ctrl-macid@44e10630 {
+				compatible = "ti,am3352-cpsw-ctrl-macid";
+				#ti,mac-address-ctrl-cells = <1>;
+				reg = <0x44e10630 0x10>;
+				reg-names = "ctrl-macid";
+			};
 		};
 
 		ocmcram: ocmcram@40300000 {
-- 
1.9.0


      parent reply	other threads:[~2014-03-15 13:07 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-15 13:07 [PATCH v2 0/5] net: cpsw: Support for am335x chip MACIDs Markus Pargmann
2014-03-15 13:07 ` [PATCH v2 1/5] net: cpsw: document mac-address being optional Markus Pargmann
2014-03-15 13:07 ` [PATCH v2 2/5] net: cpsw: make cpsw.h self-contained Markus Pargmann
2014-03-15 13:07 ` [PATCH v2 3/5] net: cpsw: Add control-module macid driver Markus Pargmann
2014-03-17  9:05   ` Uwe Kleine-König
2014-03-18  8:06     ` Markus Pargmann
2014-03-17 17:11   ` Tony Lindgren
2014-03-18  8:04     ` Markus Pargmann
2014-03-15 13:07 ` [PATCH v2 4/5] net: cpsw: Use cpsw-ctrl-macid driver Markus Pargmann
2014-03-15 13:07 ` Markus Pargmann [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=1394888864-11007-6-git-send-email-mpa@pengutronix.de \
    --to=mpa@pengutronix.de \
    --cc=bcousson@baylibre.com \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --cc=kernel@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.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).