From patchwork Tue Aug 7 14:34:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Molton X-Patchwork-Id: 175647 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EF5082C0079 for ; Wed, 8 Aug 2012 00:35:20 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755056Ab2HGOfL (ORCPT ); Tue, 7 Aug 2012 10:35:11 -0400 Received: from ducie-dc1.codethink.co.uk ([37.128.190.40]:50824 "EHLO ducie-dc1.codethink.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754751Ab2HGOfJ (ORCPT ); Tue, 7 Aug 2012 10:35:09 -0400 Received: from snark.dyn.ducie.codethink.co.uk (snark.dyn.ducie.codethink.co.uk [192.168.24.147]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTPA id 0D6AC460B96; Tue, 7 Aug 2012 15:35:07 +0100 (BST) From: Ian Molton To: linux-arm-kernel@lists.infradead.org Cc: andrew@lunn.ch, thomas.petazzoni@free-electrons.com, ben.dooks@codethink.co.uk, arnd@arndb.de, netdev@vger.kernel.org Subject: [PATCH v3 5/7] csb1724: Enable device tree based mv643xx ethernet support. Date: Tue, 7 Aug 2012 15:34:50 +0100 Message-Id: <1344350092-24050-6-git-send-email-ian.molton@codethink.co.uk> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344350092-24050-1-git-send-email-ian.molton@codethink.co.uk> References: <1344350092-24050-1-git-send-email-ian.molton@codethink.co.uk> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch enables mv643xx based ethernet built into the SoM on the csb1724, via flattened device tree. Signed-off-by: Ian Molton --- arch/arm/boot/dts/kirkwood-csb1724.dts | 19 ++++++++++++++++++ arch/arm/boot/dts/kirkwood.dtsi | 33 ++++++++++++++++++++++++++++++++ arch/arm/mach-kirkwood/board-csb1724.c | 1 + 3 files changed, 53 insertions(+) diff --git a/arch/arm/boot/dts/kirkwood-csb1724.dts b/arch/arm/boot/dts/kirkwood-csb1724.dts index 44dfe9a..f43f8dd 100644 --- a/arch/arm/boot/dts/kirkwood-csb1724.dts +++ b/arch/arm/boot/dts/kirkwood-csb1724.dts @@ -25,6 +25,25 @@ nr-ports = <2>; status = "ok"; }; + + smi0: mdio@72000 { + status = "ok"; + }; + + smi1: mdio@76000 { + status = "ok"; + }; + + egiga0 { + phy_addr = <0>; + status = "ok"; + }; + + egiga1 { + phy_addr = <1>; + status = "ok"; + }; + }; }; diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index cef9616..f5f1f92 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi @@ -76,6 +76,39 @@ status = "okay"; }; + smi0: mdio@72000 { + compatible = "marvell,mdio-mv643xx"; + reg = <0x72000 0x4000>; + interrupts = <46>; + tx_csum_limit = <1600>; + status = "disabled"; + }; + + egiga0 { + compatible = "marvell,mv643xx-eth"; + reg = <0x72000 0x4000>; + mdio = <&smi0>; + interrupts = <11>; + status = "disabled"; + }; + + smi1: mdio@76000 { + compatible = "marvell,mdio-mv643xx"; + reg = <0x76000 0x4000>; + interrupts = <47>; + shared_smi = <&smi0>; + tx_csum_limit = <1600>; + status = "disabled"; + }; + + egiga1 { + compatible = "marvell,mv643xx-eth"; + reg = <0x76000 0x4000>; + mdio = <&smi1>; + interrupts = <15>; + status = "disabled"; + }; + sata@80000 { compatible = "marvell,orion-sata"; reg = <0x80000 0x5000>; diff --git a/arch/arm/mach-kirkwood/board-csb1724.c b/arch/arm/mach-kirkwood/board-csb1724.c index 979112d..9c58b92 100644 --- a/arch/arm/mach-kirkwood/board-csb1724.c +++ b/arch/arm/mach-kirkwood/board-csb1724.c @@ -13,6 +13,7 @@ #include #include +#include "common.h" #include "mpp.h" static unsigned int csb1724_mpp_config[] __initdata = {