From patchwork Sat Mar 15 13:07:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Pargmann X-Patchwork-Id: 3837221 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C34FCBF540 for ; Sat, 15 Mar 2014 13:09:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DC9D42018E for ; Sat, 15 Mar 2014 13:09:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E32F5200E9 for ; Sat, 15 Mar 2014 13:09:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756570AbaCONJE (ORCPT ); Sat, 15 Mar 2014 09:09:04 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:44265 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756560AbaCONJC (ORCPT ); Sat, 15 Mar 2014 09:09:02 -0400 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:a236:9fff:fe00:814]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WOoKU-0004Ja-9S; Sat, 15 Mar 2014 14:08:46 +0100 Received: from mpa by dude.hi.pengutronix.de with local (Exim 4.82) (envelope-from ) id 1WOoKT-00039q-BD; Sat, 15 Mar 2014 14:08:45 +0100 From: Markus Pargmann To: "David S. Miller" Cc: =?UTF-8?q?Beno=C3=AEt=20Cousson?= , linux-omap@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de, Markus Pargmann Subject: [PATCH v2 5/5] arm: dts: am33xx, Add device node for cpsw-ctrl-macid Date: Sat, 15 Mar 2014 14:07:44 +0100 Message-Id: <1394888864-11007-6-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1394888864-11007-1-git-send-email-mpa@pengutronix.de> References: <1394888864-11007-1-git-send-email-mpa@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:a236:9fff:fe00:814 X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-omap@vger.kernel.org Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 {