From patchwork Fri Mar 15 20:58:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 228181 X-Patchwork-Delegate: trini@ti.com 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 7D4EA2C00A3 for ; Sat, 16 Mar 2013 07:57:50 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A9FC74A15E; Fri, 15 Mar 2013 21:57: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 TQLvM2O7wUVQ; Fri, 15 Mar 2013 21:57:47 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DE7214A15F; Fri, 15 Mar 2013 21:57:28 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4734C4A14D for ; Fri, 15 Mar 2013 21:57:25 +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 5uJ69bQsDHpM for ; Fri, 15 Mar 2013 21:57:24 +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-ia0-f182.google.com (mail-ia0-f182.google.com [209.85.210.182]) by theia.denx.de (Postfix) with ESMTPS id 2508E4A141 for ; Fri, 15 Mar 2013 21:57:22 +0100 (CET) Received: by mail-ia0-f182.google.com with SMTP id b35so3586256iac.41 for ; Fri, 15 Mar 2013 13:57:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=mZoML1MJQmc2cS0PacO6XNaP/F4asUZnDhVVfDcQPro=; b=H3EQzJNT8IuFCvZQN2VI21vGfvaO8aP/9pjb2TST1hIITca/LjvwTfvxEawv1k9bfS jG4nQjB/aykPeKp3cDtedDgW9apoFo1E2YS0z7JYKbXMK+qunPHGQg5zpykYFlX9ov/6 JNlYibN3hW73gS0MO09jkYAm6V27RDccjjTz/o8/+0aWgOkLQEORG5zbLLN3qj4v6vsK pc69Ktsmr+MTFV/Q3H+GBlr6OCuMuAWlYT6V5kMJuM2aUyBHt5fLLNXh4wQkyLf93TtW GqWvFQEmRF0bWngz1vjeW7k53eQ4haa9vKsLMoFnmpkgUBX919P4Cj7T5sHR01hytYc/ kd2g== X-Received: by 10.50.46.133 with SMTP id v5mr24026351igm.94.1363381041235; Fri, 15 Mar 2013 13:57:21 -0700 (PDT) Received: from beef.ohporter.com (cpe-98-27-254-98.neo.res.rr.com. [98.27.254.98]) by mx.google.com with ESMTPS id xc3sm70595igb.10.2013.03.15.13.57.19 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Mar 2013 13:57:20 -0700 (PDT) From: Matt Porter To: U-Boot Mailing List Date: Fri, 15 Mar 2013 16:58:18 -0400 Message-Id: <1363381100-6364-3-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1363381100-6364-1-git-send-email-mporter@ti.com> References: <1363381100-6364-1-git-send-email-mporter@ti.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 2/4] cpsw: add support for TI814x slave_regs differences X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 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 TI814x's version 1 CPSW has a different slave_regs layout. Add support for the differing registers. Signed-off-by: Matt Porter Reviewed-by: Tom Rini --- drivers/net/cpsw.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c index f5c5b9a..34c9fdd 100644 --- a/drivers/net/cpsw.c +++ b/drivers/net/cpsw.c @@ -109,7 +109,13 @@ struct cpsw_slave_regs { u32 flow_thresh; u32 port_vlan; u32 tx_pri_map; +#ifdef CONFIG_AM33XX u32 gap_thresh; +#elif defined(CONFIG_TI814X) + u32 ts_ctl; + u32 ts_seq_ltype; + u32 ts_vlan; +#endif u32 sa_lo; u32 sa_hi; };