From patchwork Mon Dec 27 22:43:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Rodriguez X-Patchwork-Id: 435251 Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBRMjNrG018234 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 27 Dec 2010 22:45:46 GMT Received: from dlep33.itg.ti.com ([157.170.170.112]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id oBRMhQ1g020104 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 27 Dec 2010 16:43:27 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id oBRMhQVT026815; Mon, 27 Dec 2010 16:43:26 -0600 (CST) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 3B75380627; Mon, 27 Dec 2010 16:43:25 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp51.itg.ti.com (dflp51.itg.ti.com [128.247.22.94]) by linux.omap.com (Postfix) with ESMTP id C57F98062B for ; Mon, 27 Dec 2010 16:43:22 -0600 (CST) Received: from medina.ext.ti.com (localhost [127.0.0.1]) by dflp51.itg.ti.com (8.13.7/8.13.7) with ESMTP id oBRMhMkQ005913 for ; Mon, 27 Dec 2010 16:43:22 -0600 (CST) Received: from psmtp.com (na3sys009amx210.postini.com [74.125.149.50]) by medina.ext.ti.com (8.13.7/8.13.7) with SMTP id oBRMhLJc019634 for ; Mon, 27 Dec 2010 16:43:21 -0600 Received: from source ([74.125.83.173]) by na3sys009amx210.postini.com ([74.125.148.10]) with SMTP; Mon, 27 Dec 2010 16:43:22 CST Received: by pvh11 with SMTP id 11so2552093pvh.4 for ; Mon, 27 Dec 2010 14:43:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=HW/qnfCKNrqc0b5NuCbaxWQ1y6OjoWtZI0KpptuZi1E=; b=F3dS/oGyd1e4JtCmTMaR50Oo39E84xwDudTuydG4U0VJYDh+/qxhx7FK/becNoMjUg jg3lhkSb6y/6JcPes7femgH8yVWzMi0r7LahcRztJMJlLFIGpH3evz8j8o0ANTK6u8aE W9NFFrcG52F2ojBx54PLzToVjpIgSiFGoAy5s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=wgKt/Q0+GwAT1K2x5dSuNfKKdeXzzR8qIVOr6prFgBCaT9cPkPy00gmHaWE1BqJ879 bXQTduV4BaTCHPj9P6W214oUySXSBqVei3z22aKlwnmni+EUixF5aocO+KntthQBpu2q 35tHHbsttpCqCrNear8JwhOB7uCfS+CM6QUS0= Received: by 10.142.234.18 with SMTP id g18mr10558778wfh.285.1293489801382; Mon, 27 Dec 2010 14:43:21 -0800 (PST) Received: from localhost.localdomain ([189.138.143.93]) by mx.google.com with ESMTPS id f5sm18305417wfg.14.2010.12.27.14.43.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 27 Dec 2010 14:43:20 -0800 (PST) From: To: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH v11 1/6] davinci: EMAC support for Omapl138-Hawkboard Date: Mon, 27 Dec 2010 16:43:08 -0600 Message-Id: <1293489793-23312-2-git-send-email-vm.rod25@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1293489793-23312-1-git-send-email-vm.rod25@gmail.com> References: <1293489793-23312-1-git-send-email-vm.rod25@gmail.com> X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:43.35482/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-settings: 2 (0.5000:0.0750) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [db-null] Cc: Russell King , linux-arm-kernel@lists.infradead.org X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 27 Dec 2010 22:46:03 +0000 (UTC) diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 0b8dbdb..75b3fe2 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -19,6 +19,47 @@ #include #include +#include + +#define HAWKBOARD_PHY_ID "0:07" + +static short omapl138_hawk_mii_pins[] __initdata = { + DA850_MII_TXEN, DA850_MII_TXCLK, DA850_MII_COL, DA850_MII_TXD_3, + DA850_MII_TXD_2, DA850_MII_TXD_1, DA850_MII_TXD_0, DA850_MII_RXER, + DA850_MII_CRS, DA850_MII_RXCLK, DA850_MII_RXDV, DA850_MII_RXD_3, + DA850_MII_RXD_2, DA850_MII_RXD_1, DA850_MII_RXD_0, DA850_MDIO_CLK, + DA850_MDIO_D, + -1 +}; + +static __init void omapl138_hawk_config_emac(void) +{ + void __iomem *cfgchip3 = DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP3_REG); + int ret; + u32 val; + struct davinci_soc_info *soc_info = &davinci_soc_info; + + val = __raw_readl(cfgchip3); + val &= ~BIT(8); + ret = davinci_cfg_reg_list(omapl138_hawk_mii_pins); + if (ret) { + pr_warning("%s: cpgmac/mii mux setup failed: %d\n", + __func__, ret); + return; + } + + /* configure the CFGCHIP3 register for MII */ + __raw_writel(val, cfgchip3); + pr_info("EMAC: MII PHY configured\n"); + + soc_info->emac_pdata->phy_id = HAWKBOARD_PHY_ID; + + ret = da8xx_register_emac(); + if (ret) + pr_warning("%s: emac registration failed: %d\n", + __func__, ret); +} + static struct davinci_uart_config omapl138_hawk_uart_config __initdata = { .enabled_uarts = 0x7, @@ -30,6 +71,8 @@ static __init void omapl138_hawk_init(void) davinci_serial_init(&omapl138_hawk_uart_config); + omapl138_hawk_config_emac(); + ret = da8xx_register_watchdog(); if (ret) pr_warning("omapl138_hawk_init: "