From patchwork Wed Oct 17 18:18:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Cochran X-Patchwork-Id: 1607501 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 2E973DFABE for ; Wed, 17 Oct 2012 18:18:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756533Ab2JQSS2 (ORCPT ); Wed, 17 Oct 2012 14:18:28 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:36714 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753846Ab2JQSS1 (ORCPT ); Wed, 17 Oct 2012 14:18:27 -0400 Received: by mail-wi0-f178.google.com with SMTP id hr7so1068542wib.1 for ; Wed, 17 Oct 2012 11:18:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=uQCdQiZEJy9kH9mCgElGmL4ReFF1qAh+zF+Lj8EJEVA=; b=rNuiZvFZMby7gi2TXT+88MunPtdwuH0f9Qmbp7DnF/7s7WuNiKoIPUeEV1ZhkRCE5t A1FIsarP+5lbbrGRQQNVe7e31SsbxU1fgZkNBgy740pF6RZBJLlnzCZYj2FtUDpPCNYP EHpADtsPdJkDuiOqg662IyVx0pRyRhE0abB+PVaGbPnuIQ37VK9ikG34gRl5gGx3zZGz J0bNHEbQ9rnZzTsxcWuC17BlOijPE5YvJ3xnSkdWE76/VOgh+fqvAbBU51Clg+WPFCFf GcqG0B9W9e/n3pC8Jpm2OF6gmlWa1zwld6nTxX3f3geN9w3duXd23gdyGtvZes4Fbz/t segA== Received: by 10.180.79.34 with SMTP id g2mr5755811wix.19.1350497906422; Wed, 17 Oct 2012 11:18:26 -0700 (PDT) Received: from netboy.at.omicron.at (089144206171.atnat0015.highway.a1.net. [89.144.206.171]) by mx.google.com with ESMTPS id ay10sm28901703wib.2.2012.10.17.11.18.21 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Oct 2012 11:18:25 -0700 (PDT) Date: Wed, 17 Oct 2012 20:18:14 +0200 From: Richard Cochran To: =?iso-8859-1?Q?Beno=EEt?= Cousson Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mugunthan V N , tony@atomide.com Subject: Fwd: [PATCH 5/5] arm/dts: am33xx: Add cpsw and mdio module nodes for AM33XX Message-ID: <20121017181813.GB2412@netboy.at.omicron.at> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Benoit, Would you please take this bugfix for 3.7-rc2? The suggestion to mail you came from Toni Lindgren. The context where it came from is here: http://lists.arm.linux.org.uk/lurker/message/20121015.191630.bdae3c50.en.html Thanks, Richard ----- Forwarded message from Richard Cochran ----- Date: Mon, 15 Oct 2012 21:16:35 +0200 From: Richard Cochran To: netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , David Miller , Russell King , Mugunthan V N , Vaibhav Hiremath Subject: [PATCH 5/5] arm/dts: am33xx: Add cpsw and mdio module nodes for AM33XX X-Mailer: git-send-email 1.7.2.5 From: Mugunthan V N Add CPSW and MDIO related device tree data for AM33XX. Also enable them into board/evm dts files by providing respective phy-id. Signed-off-by: Mugunthan V N Signed-off-by: Vaibhav Hiremath --- arch/arm/boot/dts/am335x-bone.dts | 8 ++++++ arch/arm/boot/dts/am335x-evm.dts | 8 ++++++ arch/arm/boot/dts/am33xx.dtsi | 50 +++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts index c634f87..e233cfa 100644 --- a/arch/arm/boot/dts/am335x-bone.dts +++ b/arch/arm/boot/dts/am335x-bone.dts @@ -78,3 +78,11 @@ }; }; }; + +&cpsw_emac0 { + phy_id = "4a101000.mdio:00"; +}; + +&cpsw_emac1 { + phy_id = "4a101000.mdio:01"; +}; diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index 185d632..415c3b3 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -118,3 +118,11 @@ }; }; }; + +&cpsw_emac0 { + phy_id = "4a101000.mdio:00"; +}; + +&cpsw_emac1 { + phy_id = "4a101000.mdio:01"; +}; diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index bb31bff..f6bea04 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -210,5 +210,55 @@ interrupt-parent = <&intc>; interrupts = <91>; }; + + mac: ethernet@4A100000 { + compatible = "ti,cpsw"; + ti,hwmods = "cpgmac0"; + cpdma_channels = <8>; + host_port_no = <0>; + cpdma_reg_ofs = <0x800>; + cpdma_sram_ofs = <0xa00>; + ale_reg_ofs = <0xd00>; + ale_entries = <1024>; + host_port_reg_ofs = <0x108>; + hw_stats_reg_ofs = <0x900>; + bd_ram_ofs = <0x2000>; + bd_ram_size = <0x2000>; + no_bd_ram = <0>; + rx_descs = <64>; + mac_control = <0x20>; + slaves = <2>; + reg = <0x4a100000 0x800 + 0x4a101200 0x100 + 0x4a101000 0x100>; + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&intc>; + /* c0_rx_thresh_pend c0_rx_pend c0_tx_pend c0_misc_pend*/ + interrupts = <40 41 42 43>; + ranges; + cpsw_emac0: slave@0 { + slave_reg_ofs = <0x208>; + sliver_reg_ofs = <0xd80>; + /* Filled in by U-Boot */ + mac-address = [ 00 00 00 00 00 00 ]; + }; + cpsw_emac1: slave@1 { + slave_reg_ofs = <0x308>; + sliver_reg_ofs = <0xdc0>; + /* Filled in by U-Boot */ + mac-address = [ 00 00 00 00 00 00 ]; + }; + + davinci_mdio: mdio@4a101000 { + compatible = "ti,davinci_mdio"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "davinci_mdio"; + bus_freq = <1000000>; + reg = <0x4a101000 0x100>; + }; + + }; }; };