From patchwork Fri Aug 23 12:08:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mack X-Patchwork-Id: 2848801 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8690F9F2F4 for ; Fri, 23 Aug 2013 12:52:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 808AE2027D for ; Fri, 23 Aug 2013 12:52:55 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 40E972022A for ; Fri, 23 Aug 2013 12:52:54 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VCqD8-0003uq-IL; Fri, 23 Aug 2013 12:11:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VCqCO-0001Tr-Gj; Fri, 23 Aug 2013 12:10:40 +0000 Received: from svenfoo.org ([82.94.215.22] helo=mail.zonque.de) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VCqBb-0001O7-Iz for linux-arm-kernel@lists.infradead.org; Fri, 23 Aug 2013 12:09:52 +0000 Received: from localhost (localhost [127.0.0.1]) by mail.zonque.de (Postfix) with ESMTP id 61F57C1601; Fri, 23 Aug 2013 14:09:04 +0200 (CEST) Received: from mail.zonque.de ([127.0.0.1]) by localhost (rambrand.bugwerft.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zm7P755eziSU; Fri, 23 Aug 2013 14:09:04 +0200 (CEST) Received: from tamtam.fritz.box (p5DDC680F.dip0.t-ipconnect.de [93.220.104.15]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.zonque.de (Postfix) with ESMTPSA id 94EF8C1608; Fri, 23 Aug 2013 14:09:03 +0200 (CEST) From: Daniel Mack To: netdev@vger.kernel.org Subject: [PATCH v3 5/5] ARM: dts: am33xx: adopt to cpsw changes Date: Fri, 23 Aug 2013 14:08:55 +0200 Message-Id: <1377259735-20337-6-git-send-email-zonque@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1377259735-20337-1-git-send-email-zonque@gmail.com> References: <1377259735-20337-1-git-send-email-zonque@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130823_080951_777676_34E437C1 X-CRM114-Status: GOOD ( 11.43 ) X-Spam-Score: -0.3 (/) Cc: mugunthanvnm@ti.com, sergei.shtylyov@cogentembedded.com, d-gerlach@ti.com, nsekhar@ti.com, vaibhav.bedia@ti.com, Daniel Mack , devicetree@vger.kernel.org, bcousson@baylibre.com, ujhelyi.m@gmail.com, linux-omap@vger.kernel.org, davem@davemloft.net, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This third memory region just denotes one single register in the CONTROL module block. The driver uses that in order to set the correct physical ethernet interface modes. Also update the compatible string to make use of the am335x specific features of the cpsw driver. Signed-off-by: Daniel Mack --- arch/arm/boot/dts/am33xx.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index a785b95..c7b41ae 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -446,7 +446,7 @@ }; mac: ethernet@4a100000 { - compatible = "ti,cpsw"; + compatible = "ti,am3352-cpsw", "ti,cpsw"; ti,hwmods = "cpgmac0"; cpdma_channels = <8>; ale_entries = <1024>; @@ -459,7 +459,8 @@ cpts_clock_mult = <0x80000000>; cpts_clock_shift = <29>; reg = <0x4a100000 0x800 - 0x4a101200 0x100>; + 0x4a101200 0x100 + 0x44e10650 0x4>; #address-cells = <1>; #size-cells = <1>; interrupt-parent = <&intc>;