From patchwork Tue Dec 13 18:13:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 9472965 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3DB21607EE for ; Tue, 13 Dec 2016 18:17:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 010C6285FD for ; Tue, 13 Dec 2016 18:17:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E8DFC2864C; Tue, 13 Dec 2016 18:17:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BC32C285FD for ; Tue, 13 Dec 2016 18:17:33 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cGrcJ-0002gX-E6; Tue, 13 Dec 2016 18:15:55 +0000 Received: from mail-pf0-x230.google.com ([2607:f8b0:400e:c00::230]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cGrax-0000m6-KI for linux-arm-kernel@lists.infradead.org; Tue, 13 Dec 2016 18:14:33 +0000 Received: by mail-pf0-x230.google.com with SMTP id c4so19503593pfb.1 for ; Tue, 13 Dec 2016 10:14:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bfBTTMxkzLfNs/eSvkMu2kbeZz+MLo2w66lCyaRREAc=; b=e9jx5CXroF25xtCi1crFY+bAkVCbBPYE08/Gs6TeMy9sYkVjt4zq3RodBzsUodvH10 SV/dag1UgAldN51MuaQh2Bd6hBQDVCL8PEFwGMa4Q+sb4bVFegt0JtGWTGR8Rcf+RlAG Z02+5xNvahGRWLHWUWlRRV4LLYJQWFCMl+KtQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bfBTTMxkzLfNs/eSvkMu2kbeZz+MLo2w66lCyaRREAc=; b=HmFf5mst6R37m+rcNN5B6BEu92k2+ruzqFzwIXieP+SpGUMAxraMVfVaQgvvMJi4SK 3puv77r8S2IwI96ltiB4Crw/bLmbPvnGsYlGahfpYWF4HOhG8p20Rad5FH2qG2MCCTKX +AkwSUQihwfZQ0iTC7XuDF46UgfayHmvREs0/a1LrXxvqofTDScUz7CWvkKHiw+8ivvl TYxLQBMZP1Y6jPXZayvJdGIkziN+gGZMKqKejQ+1x4KNLu2RK2tWePpqZGqni3GkYkZf mLKpVGJXiStXADUVfI4y02FoDqpNRYvPjyCSngBuAva+lEALsv5Gi/2AQcAopGJdecgj TYRg== X-Gm-Message-State: AKaTC02d5yE70PyYFbRnfi/RTyOm6q8Gy7RZaGwBo2KRqgVV0nccOovXIFoYsNNMG3TSAiQ9 X-Received: by 10.99.124.20 with SMTP id x20mr143251535pgc.142.1481652850532; Tue, 13 Dec 2016 10:14:10 -0800 (PST) Received: from venom.rtp.broadcom.com ([216.31.219.19]) by smtp.gmail.com with ESMTPSA id y189sm81552101pfy.32.2016.12.13.10.14.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Dec 2016 10:14:09 -0800 (PST) From: Jon Mason To: Rob Herring , Mark Rutland , Florian Fainelli Subject: [PATCH 5/7] ARM: dts: NSP: Add and enable amac2 Date: Tue, 13 Dec 2016 13:13:49 -0500 Message-Id: <1481652831-2744-6-git-send-email-jon.mason@broadcom.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481652831-2744-1-git-send-email-jon.mason@broadcom.com> References: <1481652831-2744-1-git-send-email-jon.mason@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161213_101431_917955_EB089336 X-CRM114-Status: GOOD ( 11.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add and enable the third AMAC ethernet interface in the device trees for the platforms where it is present. Also, enable amac1 on some of the platforms where that was missing. Signed-off-by: Jon Mason --- arch/arm/boot/dts/bcm-nsp.dtsi | 9 +++++++++ arch/arm/boot/dts/bcm958622hr.dts | 8 ++++++++ arch/arm/boot/dts/bcm958623hr.dts | 8 ++++++++ arch/arm/boot/dts/bcm958625hr.dts | 8 ++++++++ arch/arm/boot/dts/bcm958625k.dts | 4 ++++ arch/arm/boot/dts/bcm988312hr.dts | 8 ++++++++ 6 files changed, 45 insertions(+) diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index 9cd77ab..ecffc16 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -227,6 +227,15 @@ status = "disabled"; }; + amac2: ethernet@24000 { + compatible = "brcm,nsp-amac"; + reg = <0x024000 0x1000>, + <0x112000 0x1000>; + reg-names = "amac_base", "idm_base"; + interrupts = ; + status = "disabled"; + }; + nand: nand@26000 { compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; reg = <0x026000 0x600>, diff --git a/arch/arm/boot/dts/bcm958622hr.dts b/arch/arm/boot/dts/bcm958622hr.dts index 18b8ffb..477c486 100644 --- a/arch/arm/boot/dts/bcm958622hr.dts +++ b/arch/arm/boot/dts/bcm958622hr.dts @@ -65,6 +65,14 @@ status = "okay"; }; +&amac1 { + status = "okay"; +}; + +&amac2 { + status = "okay"; +}; + &nand { nandcs@0 { compatible = "brcm,nandcs"; diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts index 61499ae..c0a499d 100644 --- a/arch/arm/boot/dts/bcm958623hr.dts +++ b/arch/arm/boot/dts/bcm958623hr.dts @@ -65,6 +65,14 @@ status = "okay"; }; +&amac1 { + status = "okay"; +}; + +&amac2 { + status = "okay"; +}; + &nand { nandcs@0 { compatible = "brcm,nandcs"; diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts index 94cce23..f7eb585 100644 --- a/arch/arm/boot/dts/bcm958625hr.dts +++ b/arch/arm/boot/dts/bcm958625hr.dts @@ -63,6 +63,14 @@ status = "okay"; }; +&amac1 { + status = "okay"; +}; + +&amac2 { + status = "okay"; +}; + &nand { nandcs@0 { compatible = "brcm,nandcs"; diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts index 7aa86c7..6e994f2 100644 --- a/arch/arm/boot/dts/bcm958625k.dts +++ b/arch/arm/boot/dts/bcm958625k.dts @@ -61,6 +61,10 @@ status = "okay"; }; +&amac2 { + status = "okay"; +}; + &nand { nandcs@0 { compatible = "brcm,nandcs"; diff --git a/arch/arm/boot/dts/bcm988312hr.dts b/arch/arm/boot/dts/bcm988312hr.dts index c324c9f..16666324 100644 --- a/arch/arm/boot/dts/bcm988312hr.dts +++ b/arch/arm/boot/dts/bcm988312hr.dts @@ -65,6 +65,14 @@ status = "okay"; }; +&amac1 { + status = "okay"; +}; + +&amac2 { + status = "okay"; +}; + &nand { nandcs@0 { compatible = "brcm,nandcs";