From patchwork Tue Jun 10 18:44:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 31697 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 32D9E20675 for ; Tue, 10 Jun 2014 18:45:44 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id uz6sf15478659obc.0 for ; Tue, 10 Jun 2014 11:45:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=y2PU1vf9y0PcqQn7ZjDrXTrGJ1lEcgUqV4BumLA+iWg=; b=lhS8A6Aa9hceY7SaWNkzTR9b8yrAyFLFiH5MgKKv15iuSm9sE2plVOBvg3k4zaOR8J fomfJosfuVVBp7TmZM9XaLg9p9kC+GwCmLAZDnneKgLCF0qhMMoWQWlo1JYQW1GB4y1l fIm6lEaLXz4tYQ8X2gejUHxP7rQVoQfNPzFVj3+7n8sQHaiDt3ugo3VW0F9BedFUu/uM lhKhfyyFyWXyfJsSa33RO4TcAK6/3xHSA4Oha20axaIgkWYgQxsmKuMSCQT8MlVAmQq4 QrwhiPs/IPlcPmO8OvSdbaTeK2RlDGWUUbLzkz4/UYZb3f5J+V41PxowLkGBXpe1jKP0 ZYlA== X-Gm-Message-State: ALoCoQnumOk/OAY4IjtQuZDDwlLKUPUOv1lcrZfF/8J2hWPJMDnTCdLI0IM7/8mW2lJbMCCnQIPo X-Received: by 10.182.128.166 with SMTP id np6mr896673obb.16.1402425943835; Tue, 10 Jun 2014 11:45:43 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.37.230 with SMTP id r93ls441108qgr.10.gmail; Tue, 10 Jun 2014 11:45:43 -0700 (PDT) X-Received: by 10.58.1.9 with SMTP id 9mr10394413vei.14.1402425943652; Tue, 10 Jun 2014 11:45:43 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id er10si6195830vdc.28.2014.06.10.11.45.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Jun 2014 11:45:43 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.181 as permitted sender) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id db11so3225449veb.40 for ; Tue, 10 Jun 2014 11:45:43 -0700 (PDT) X-Received: by 10.220.162.196 with SMTP id w4mr2696793vcx.58.1402425943573; Tue, 10 Jun 2014 11:45:43 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp247075vcb; Tue, 10 Jun 2014 11:45:43 -0700 (PDT) X-Received: by 10.180.103.228 with SMTP id fz4mr40943421wib.4.1402425942591; Tue, 10 Jun 2014 11:45:42 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id e17si18200680wiw.21.2014.06.10.11.45.41 for ; Tue, 10 Jun 2014 11:45:42 -0700 (PDT) Received-SPF: none (google.com: u-boot-bounces@lists.denx.de does not designate permitted sender hosts) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 84B524A04C; Tue, 10 Jun 2014 20:45:28 +0200 (CEST) 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 i8Wa8cOWjbWa; Tue, 10 Jun 2014 20:45:28 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 179A64B576; Tue, 10 Jun 2014 20:44:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9E5464A048 for ; Tue, 10 Jun 2014 20:44:49 +0200 (CEST) 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 gXd6+Adp4fmq for ; Tue, 10 Jun 2014 20:44:46 +0200 (CEST) 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 devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by theia.denx.de (Postfix) with ESMTPS id 4E5DC4A033 for ; Tue, 10 Jun 2014 20:44:40 +0200 (CEST) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s5AIicW1007107 for ; Tue, 10 Jun 2014 13:44:38 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5AIicY0009466 for ; Tue, 10 Jun 2014 13:44:38 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Tue, 10 Jun 2014 13:44:38 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5AIibDI007417; Tue, 10 Jun 2014 13:44:38 -0500 From: Felipe Balbi To: Tom Rini Date: Tue, 10 Jun 2014 13:44:16 -0500 Message-ID: <1402425857-11891-5-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.0.0.rc1 In-Reply-To: <1402425857-11891-1-git-send-email-balbi@ti.com> References: <1402425857-11891-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 Cc: Schuyler Patton , Felipe@theia.denx.de, u-boot@lists.denx.de, Steven Kipisz , "\\\"Franklin Cooper Jr.\\\"" Subject: [U-Boot] [PATCH 4/5] board: ti: am43xx: add AM437x SK PHY Address X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: balbi@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 pass correct PHY Address when running on SK so that we have working ethernet with this board too. Signed-off-by: Felipe Balbi --- board/ti/am43xx/board.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index b184c20..054a452 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -227,16 +227,16 @@ static const struct emif_regs ddr3_sk_emif_regs_400Mhz = { .read_idle_ctrl = 0x00050000, .zq_config = 0x50074be4, .temp_alert_config = 0x0, - .emif_ddr_phy_ctlr_1 = 0x0e084007, + .emif_ddr_phy_ctlr_1 = 0x0e084008, .emif_ddr_ext_phy_ctrl_1 = 0x08020080, - .emif_ddr_ext_phy_ctrl_2 = 0x00700070, - .emif_ddr_ext_phy_ctrl_3 = 0x00700070, - .emif_ddr_ext_phy_ctrl_4 = 0x00700070, - .emif_ddr_ext_phy_ctrl_5 = 0x00700070, + .emif_ddr_ext_phy_ctrl_2 = 0x89, + .emif_ddr_ext_phy_ctrl_3 = 0x90, + .emif_ddr_ext_phy_ctrl_4 = 0x8e, + .emif_ddr_ext_phy_ctrl_5 = 0x8d, .emif_rd_wr_lvl_rmp_win = 0x0, - .emif_rd_wr_lvl_rmp_ctl = 0x0, - .emif_rd_wr_lvl_ctl = 0x0, - .emif_rd_wr_exec_thresh = 0x00000405 + .emif_rd_wr_lvl_rmp_ctl = 0x00000000, + .emif_rd_wr_lvl_ctl = 0x00000000, + .emif_rd_wr_exec_thresh = 0x00000000, }; const u32 ext_phy_ctrl_const_base_ddr3[] = { @@ -594,6 +594,11 @@ int board_eth_init(bd_t *bis) writel(RMII_MODE_ENABLE | RMII_CHIPCKL_ENABLE, &cdev->miisel); cpsw_slaves[0].phy_if = PHY_INTERFACE_MODE_RMII; cpsw_slaves[0].phy_addr = 16; + } else if (board_is_sk()) { + writel(RGMII_MODE_ENABLE, &cdev->miisel); + cpsw_slaves[0].phy_if = PHY_INTERFACE_MODE_RGMII; + cpsw_slaves[0].phy_addr = 4; + cpsw_slaves[1].phy_addr = 5; } else { writel(RGMII_MODE_ENABLE, &cdev->miisel); cpsw_slaves[0].phy_if = PHY_INTERFACE_MODE_RGMII;