From patchwork Wed Mar 20 15:38:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 229419 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 0E9192C00AA for ; Thu, 21 Mar 2013 02:38:08 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 96ECD4A050; Wed, 20 Mar 2013 16:37:45 +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 l-aujqymHAcF; Wed, 20 Mar 2013 16:37:45 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D6DEC4A051; Wed, 20 Mar 2013 16:37:23 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1431C4A03B for ; Wed, 20 Mar 2013 16:37:07 +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 86nXZkjeLtbk for ; Wed, 20 Mar 2013 16:37:05 +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-f175.google.com (mail-ia0-f175.google.com [209.85.210.175]) by theia.denx.de (Postfix) with ESMTPS id 285634A02D for ; Wed, 20 Mar 2013 16:37:02 +0100 (CET) Received: by mail-ia0-f175.google.com with SMTP id y26so1492413iab.20 for ; Wed, 20 Mar 2013 08:36:58 -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=LdGO7dYtq8N/4/OucxC8dxuKjWvpW7NYFlaa7dmXKrc=; b=ueqHKPHAzUD4WP+MrSMXmj0rrNURY6e+gMI1pbqg95kZSrXIngxrG8pDX7Uq9+lwnH Oc4G3osd7JYOU4nupK4Seh2hyIWXBxaidlaDhKPS3nAIpSbH1sr2MQaNUfmhRSfk7O9B yogmTTGtRXiydSsyxJDWuaxAzaljKh5PP7J4MZRhmtLo4HQ32+tgPmdZm5bgB9tzvXhU xPaDiYBocg6p08I/j3j8Z5SWrsL1mnSVqUCQ9Gwx3ctSTpL+jyb2eCF+ANsS0cWaEQhv t6oBEQm32UbxCsy1C6cAzRsSofeSRPGMwcEASnKE8RpSz6JMudd0EnEHl9LXEPFoWux9 DgjQ== X-Received: by 10.42.91.209 with SMTP id q17mr13896736icm.50.1363793818127; Wed, 20 Mar 2013 08:36:58 -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 wn10sm5513244igb.2.2013.03.20.08.36.57 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 20 Mar 2013 08:36:57 -0700 (PDT) From: Matt Porter To: U-Boot Mailing List Date: Wed, 20 Mar 2013 11:38:12 -0400 Message-Id: <1363793894-1400-3-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1363793894-1400-1-git-send-email-mporter@ti.com> References: <1363793894-1400-1-git-send-email-mporter@ti.com> Cc: Tom Rini Subject: [U-Boot] [PATCH v2 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 --- v2: no changes --- 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; };