From patchwork Tue Jan 17 18:22:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 9521677 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 9539E601C3 for ; Tue, 17 Jan 2017 18:24:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9984028507 for ; Tue, 17 Jan 2017 18:24:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E11B28560; Tue, 17 Jan 2017 18:24:26 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4948C28507 for ; Tue, 17 Jan 2017 18:24:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cTYQi-0006KS-Qb; Tue, 17 Jan 2017 18:24:24 +0000 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cTYPa-0004Ga-0G for linux-arm-kernel@lists.infradead.org; Tue, 17 Jan 2017 18:23:16 +0000 Received: by mail-pg0-x241.google.com with SMTP id 204so8597087pge.2 for ; Tue, 17 Jan 2017 10:22:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MSbTfPspzV4wfQ/PiBNlbbhfaamd8JuwDn6JkBAze7o=; b=IWJyoLae2Cbi/yhnAXkKUq0j9dEcJX8WvwapesqtC8kRKolsmeVjSZ56JKLqWclApz DopCKH4w2MGqLojkQzPFv7YYVtdvNrx3WA43u/tYEy4Q4pRqxZ+liVTsJJJ8EgCBrRcG friaMpkkomNm3mDc/xelT646z+XIWHuDFv/c+ah0+WY6QMKMA8Kg7Ajpp0O/t9aoeZN3 yq1FMm1lylOLn42BDCgruUdYIB80z0ZIGG3qTaepxg/JZ8MEWHh4eLSle24S6e7NL8fz ebgZMblKUc3FRWIMwMi8TSR5sgZ/lRxe9NGszry+3NO35H6SHFzsuWVoUpHATdh1vi8w l3Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MSbTfPspzV4wfQ/PiBNlbbhfaamd8JuwDn6JkBAze7o=; b=EHKu9VxbqdXg5QL5O5dDj5V3JFrvebeiHkoZVivnpIu6sIzxYB6NtAO+rG1FmUJUNo A6s70Gg3HdTTUM9EYqO6cFMloe6kfOt/rjDt/3HHQPwxyYgFfQRGgHwdkH5UzUjujK1x C3oHgFJiNAvWp73A3eBZfd4k5PzTjLJOzomzWejRxhxOjBDwxSvy7pRHvuagHaZuupmA P53ebCbKGCvgXHRpwBJjT4mmMqF1xBldv2LQHlH8w2XtH4NgU5xkR33sFWGcJVuD+hAD XGqicmrpBpt4ZLc7MUXFh4LonD/+a00QOtoTmL9uIhCP+SrSJYoaDfa0ahiPZZCZSddI eSlA== X-Gm-Message-State: AIkVDXJfte3B3hRHTjWe8N9TCBMttNzOm3QjY+SdO4vPBIDvtqD5wPsH9KdQVn8W7YLbKA== X-Received: by 10.99.109.206 with SMTP id i197mr46891246pgc.4.1484677373182; Tue, 17 Jan 2017 10:22:53 -0800 (PST) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id w65sm57415995pfw.9.2017.01.17.10.22.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jan 2017 10:22:51 -0800 (PST) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 8/8] ARM: dts: kirkwood-rd88f6281: Utilize new DSA binding Date: Tue, 17 Jan 2017 10:22:24 -0800 Message-Id: <20170117182224.32212-9-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170117182224.32212-1-f.fainelli@gmail.com> References: <20170117182224.32212-1-f.fainelli@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170117_102314_126345_045C4F3F X-CRM114-Status: GOOD ( 12.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Andrew Lunn , Florian Fainelli , Jason Cooper , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , vivien.didelot@savoirfairelinux.com, Russell King , open list , Rob Herring , Gregory Clement , Sebastian Hesselbarth 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 Utilize the new DSA binding, introduced with commit 8c5ad1d6179d ("net: dsa: Document new binding"). The legacy binding node is kept included, but is marked disabled. Signed-off-by: Florian Fainelli Reviewed-by: Andrew Lunn --- arch/arm/boot/dts/kirkwood-rd88f6281-a.dts | 9 +++--- arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts | 11 ++++++++ arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 44 +++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts b/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts index 6f771a99cb02..9ec5a65561e9 100644 --- a/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts +++ b/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts @@ -19,11 +19,6 @@ model = "Marvell RD88f6281 Reference design, with A0 or higher SoC"; compatible = "marvell,rd88f6281-a", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood"; - dsa { - switch@0 { - reg = <10 0>; /* MDIO address 10, switch 0 in tree */ - }; - }; }; &mdio { @@ -34,6 +29,10 @@ }; }; +&switch { + reg = <10>; +}; + ð1 { status = "okay"; diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts b/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts index 1a797381d3d4..6a4a65ec7944 100644 --- a/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts +++ b/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts @@ -33,3 +33,14 @@ ð1 { status = "disabled"; }; + +&switch { + reg = <0>; + + ports { + port@4 { + reg = <4>; + label = "wan"; + }; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi index d5aacf137e40..91f5da5dae5f 100644 --- a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi +++ b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi @@ -54,6 +54,8 @@ }; dsa { + status = "disabled"; + compatible = "marvell,dsa"; #address-cells = <2>; #size-cells = <0>; @@ -115,6 +117,48 @@ &mdio { status = "okay"; + + switch: switch@0 { + compatible = "marvell,mv88e6085"; + #address-cells = <1>; + #size-cells = <0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + label = "lan1"; + }; + + port@1 { + reg = <1>; + label = "lan2"; + }; + + port@2 { + reg = <2>; + label = "lan3"; + }; + + port@3 { + reg = <3>; + label = "lan4"; + }; + + port@5 { + reg = <5>; + label = "cpu"; + ethernet = <ð0port>; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + }; + }; }; ð0 {