From patchwork Fri Mar 25 08:48:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Pidancet X-Patchwork-Id: 88353 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 0472EB6FF2 for ; Fri, 25 Mar 2011 19:53:11 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5D92E28195; Fri, 25 Mar 2011 09:52:47 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y1xtiTrBUPEH; Fri, 25 Mar 2011 09:52:47 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E638E281AC; Fri, 25 Mar 2011 09:52:39 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C08EE2817E for ; Fri, 25 Mar 2011 09:52:34 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9c7L51CXXkCe for ; Fri, 25 Mar 2011 09:52:32 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-iy0-f172.google.com (mail-iy0-f172.google.com [209.85.210.172]) by theia.denx.de (Postfix) with ESMTPS id 9299428189 for ; Fri, 25 Mar 2011 09:52:24 +0100 (CET) Received: by mail-iy0-f172.google.com with SMTP id 19so292514iye.3 for ; Fri, 25 Mar 2011 01:52:24 -0700 (PDT) Received: by 10.231.3.73 with SMTP id 9mr507724ibm.194.1301043144248; Fri, 25 Mar 2011 01:52:24 -0700 (PDT) Received: from localhost.localdomain (c-24-7-126-118.hsd1.ca.comcast.net [24.7.126.118]) by mx.google.com with ESMTPS id gy41sm527864ibb.5.2011.03.25.01.52.23 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 Mar 2011 01:52:23 -0700 (PDT) From: julian.pidancet@citrix.com To: u-boot@lists.denx.de Date: Fri, 25 Mar 2011 08:48:57 +0000 Message-Id: X-Mailer: git-send-email 1.7.4.1 In-Reply-To: References: Cc: Julian Pidancet , tanmay.upadhyay@einfochips.com Subject: [U-Boot] [PATCH v2 4/4] Add support for the Ultimate variant of the OpenRD board X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Julian Pidancet This patch adds proper initialization code for the two PHYs present on the board. Signed-off-by: Julian Pidancet create mode 100644 include/configs/openrd_ultimate.h diff --git a/MAKEALL b/MAKEALL index ddf4a70..4b6da98 100755 --- a/MAKEALL +++ b/MAKEALL @@ -362,6 +362,7 @@ LIST_ARM9=" \ omap730p2 \ openrd_base \ openrd_client \ + openrd_ultimate \ rd6281a \ sbc2410x \ scb9328 \ diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c index fded3f0..d1b2554 100644 --- a/board/Marvell/openrd/openrd.c +++ b/board/Marvell/openrd/openrd.c @@ -147,7 +147,7 @@ void mv_phy_init(char *name) /* reset the phy */ miiphy_reset(name, devadr); - printf("88E1116 Initialized on %s\n", name); + printf(PHY_NO" Initialized on %s\n", name); } void reset_phy(void) @@ -162,6 +162,8 @@ void reset_phy(void) /* configure and initialize both PHY's */ mv_phy_init("egiga1"); +#elif (MACH_TYPE_OPENRD == MACH_TYPE_OPENRD_ULTIMATE) + mv_phy_init("egiga1"); #endif } #endif /* CONFIG_RESET_PHY_R */ diff --git a/boards.cfg b/boards.cfg index 5f5d2bf..513aa04 100644 --- a/boards.cfg +++ b/boards.cfg @@ -98,6 +98,7 @@ guruplug arm arm926ejs - Marvell mv88f6281gtw_ge arm arm926ejs - Marvell kirkwood openrd_base arm arm926ejs openrd Marvell kirkwood openrd_client arm arm926ejs openrd Marvell kirkwood +openrd_ultimate arm arm926ejs openrd Marvell kirkwood rd6281a arm arm926ejs - Marvell kirkwood sheevaplug arm arm926ejs - Marvell kirkwood dockstar arm arm926ejs - Seagate kirkwood diff --git a/include/configs/openrd_ultimate.h b/include/configs/openrd_ultimate.h new file mode 100644 index 0000000..b616d6a --- /dev/null +++ b/include/configs/openrd_ultimate.h @@ -0,0 +1,44 @@ +/* + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#ifndef _CONFIG_OPENRD_ULTIMATE_H +#define _CONFIG_OPENRD_ULTIMATE_H + +#include + +/* + * Version number information + */ +#define CONFIG_IDENT_STRING "\nOpenRD-Ultimate" + +/* Machine type */ +#define MACH_TYPE_OPENRD MACH_TYPE_OPENRD_ULTIMATE + +/* + * Ethernet Driver configuration + */ +#ifdef CONFIG_CMD_NET +/* enable both ports */ +#define CONFIG_MVGBE_PORTS {1, 1} +#define CONFIG_PHY_BASE_ADR 0x0 +#define PHY_NO "88E1121" +#endif /* CONFIG_CMD_NET */ + +#endif /* _CONFIG_OPENRD_ULTIMATE_H */