From patchwork Thu Feb 22 22:38:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivek Unune X-Patchwork-Id: 10236551 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 7A344602DC for ; Thu, 22 Feb 2018 22:42:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 71E2229025 for ; Thu, 22 Feb 2018 22:42:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6674129028; Thu, 22 Feb 2018 22:42:08 +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=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BC93729025 for ; Thu, 22 Feb 2018 22:42:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=3cDtzIElJj3U8sm6PauFJs4kC8pXZ95W2C96TgxGbDs=; b=ih0RKvo+cI48r4 4Sgo5kBUUuKyaRwcHjlFZ6arKK1odrmh8kZnstE7ySJn07xHXgqm7BiF1OgEr7tFAvLkdmRB6tOfF BLI2/fsUDfMD1zCLDJJrkvIr/Ar6GStyQ3Y5KBIxOy99oudc+Gr2ARtn1TcKtchIoA4sw9jYlylOl t8TLbs0OurkbT1SGaOJzsSV5Cjc1i5vBtOVTTeY0KPqnCfqBVZCNpCCcxs65/nHbtv43x+knYeCuj PyJ/pA7dDEqe1TYd16ofXMfYVz3O60oBotGBicts5tD0zl1JBQuYOEnPi+n2NTd94qBvextqXVGSp Qx//aa/XyBK1iPm7b6jQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eozYs-0000xQ-SN; Thu, 22 Feb 2018 22:41:58 +0000 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eozYm-0000uF-Nb for linux-arm-kernel@lists.infradead.org; Thu, 22 Feb 2018 22:41:54 +0000 Received: by mail-qk0-x243.google.com with SMTP id b130so8583717qkg.9 for ; Thu, 22 Feb 2018 14:41:41 -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:mime-version :content-transfer-encoding; bh=G2u8pn09is00xzAavreM8zl3ER9FjBMFqgmmkfKND18=; b=KEcyuSDjkISiGyw7GumYX7NH9yE5oi5xrteVBbqsKqvMwy2Vix3Ih+TAoREkUZop0g E0EUuLjNSSnlISr6DxUJWPuxRKSIQVviC5EYBi4yM9poTvFl+jVTS3EjPyfQIf6lXFtc uMYYhh1tpu5QC2Yw2ssevwu8DSNq2i4wVI9TrBSFzIjLTCIbGkWzz/bugH5bPqr1bnQN 7FxXvh9AX9hZKoTeqRIBJDIjX41SoQlIa2ZYmIaNg3B6ZGBvQd2/2ktjnx5qwBS3w1HY UXauyxy33r8ZOUjK3ku9AQfRbhJIQVpRaNBLKHJSqKy++8xOrevZbuCjJ/eH3J1Vo4HZ cfJg== 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:mime-version :content-transfer-encoding; bh=G2u8pn09is00xzAavreM8zl3ER9FjBMFqgmmkfKND18=; b=tjxKDDQCIkwdPGILmZjvHGvNIxFzDv4G8uqsdFrgnSBZtZy2nhKUGxJuctIoITn7eb 8IumPulxZ+OrsY/Iod7pZ47829hpgk9teM6J9mx4MRwynVMxQ/hIUI61Dn77b1WsgL52 NxcMsOiBLy0DlcTFtZ85f/noCrvX7IM/cMRZ1zZRj/SMlQ+rNmXA7vKiG+TtMX93eap6 WOJzKVsY+CRssi/Hjryxqy/Su7cPNxUx6v2Ewe520s0sZcGsqCgBCmHKUj+tE9uuKmjv DwoBSLloMJOHxe46OizwmEp7tWXx+sV9PA5zAQJMfJIPw87KSU/ueHq93wCA/+Gg3avG jPIQ== X-Gm-Message-State: APf1xPAoiSZszcuAEQfADggDn+A3VmWLcnt3+TcP4yaGHo0AYczIUII8 csMC0qa1EL7dgh7CvFEwZ2M= X-Google-Smtp-Source: AH8x2240EnjI10bOUT5pNggaZDrjZnkAOtnaZYmqp89ZmHweq5cSfusji2Dx9DrYjFirUUh6qC9wkQ== X-Received: by 10.55.204.71 with SMTP id r68mr13504450qki.356.1519339300823; Thu, 22 Feb 2018 14:41:40 -0800 (PST) Received: from localhost.localdomain (ool-44c001ed.dyn.optonline.net. [68.192.1.237]) by smtp.googlemail.com with ESMTPSA id n19sm790623qtk.56.2018.02.22.14.41.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Feb 2018 14:41:40 -0800 (PST) From: Vivek Unune To: Subject: [v2] ARM: dts: BCM5301X: Add support for Linksys EA9500 Date: Thu, 22 Feb 2018 17:38:44 -0500 Message-Id: <20180222223844.98527-1-npcomplete13@gmail.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180222_144152_789539_8E8F9C97 X-CRM114-Status: GOOD ( 17.86 ) 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 , devicetree@vger.kernel.org, Jon Mason , Hauke Mehrtens , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Russell King , linux-kernel@vger.kernel.org, Rob Herring , bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, Vivek Unune 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 Hardware Info ------------- Processor - Broadcom BCM4709C0KFEBG dual-core @ 1.4 GHz Switch - BCM53012 in BCM4709C0KFEBG & external BCM53125 DDR3 RAM - 256 MB Flash - 128 MB (Toshiba TC58BVG0S3HTA00) 2.4GHz - BCM4366 4×4 2.4/5G single chip 802.11ac SoC Power Amp - Skyworks SE2623L 2.4 GHz power amp (x4) 5GHz x 2 - BCM4366 4×4 2.4/5G single chip 802.11ac SoC Power Amp - PLX Technology PEX8603 3-lane, 3-port PCIe switch Ports - 8 Ports, 1 WAN Ports Antennas - 8 Antennas Serial Port - @J6 [GND,TX,RX] (VCC NC) 115200 8n1 Tested with DSA driver and Kernel 4.14 Note: "make sure that port 0 of the internal switch is not accidentally configured back to untagged since that would cause problem when terminating the VLAN tag on the SW side." - Florian Fainelli [1] So, I had to run following bridge command: bridge vlan add vid 1 dev extsw pvid tagged Changes in v2: - Properly define mdio mux, internal mdio, external mdio, mii bus - Now we define usb3 phy as a mdio node connected to internal mdio Thanks to work done by Rafał Miłecki on the usb3 phy mdio driver - Define external SW as a mdio-mii node connected to external mdio [1] https://www.spinics.net/lists/arm-kernel/msg590992.html Signed-off-by: Vivek Unune --- arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 239 +++++++++++++++++++++++- arch/arm/boot/dts/bcm47094.dtsi | 6 +- arch/arm/boot/dts/bcm5301x.dtsi | 55 +++++- 3 files changed, 288 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts index b6750f7..5f53207 100644 --- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts +++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts @@ -7,7 +7,7 @@ /dts-v1/; #include "bcm47094.dtsi" -#include "bcm5301x-nand-cs0-bch8.dtsi" +#include "bcm5301x-nand-cs0-bch1.dtsi" / { compatible = "linksys,panamera", "brcm,bcm47094", "brcm,bcm4708"; @@ -32,5 +32,242 @@ linux,code = ; gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>; }; + + rfkill { + label = "WiFi"; + linux,code = ; + gpios = <&chipcommon 16 GPIO_ACTIVE_LOW>; + }; + + reset { + label = "Reset"; + linux,code = ; + gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>; + }; + }; + + leds { + compatible = "gpio-leds"; + + wps { + label = "bcm53xx:white:wps"; + gpios = <&chipcommon 22 GPIO_ACTIVE_LOW>; + }; + + usb2 { + label = "bcm53xx:green:usb2"; + gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>; + trigger-sources = <&ohci_port2>, <&ehci_port2>; + linux,default-trigger = "usbport"; + }; + + usb3 { + label = "bcm53xx:green:usb3"; + gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>; + trigger-sources = <&ohci_port1>, <&ehci_port1>, + <&xhci_port1>; + linux,default-trigger = "usbport"; + }; + + power { + label = "bcm53xx:white:power"; + gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>; + }; + + wifi-disabled { + label = "bcm53xx:amber:wifi-disabled"; + gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>; + }; + + wifi-enabled { + label = "bcm53xx:white:wifi-enabled"; + gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>; + }; + + bluebar1 { + label = "bcm53xx:white:bluebar1"; + gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>; + }; + + bluebar2 { + label = "bcm53xx:white:bluebar2"; + gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>; + }; + + bluebar3 { + label = "bcm53xx:white:bluebar3"; + gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>; + }; + + bluebar4 { + label = "bcm53xx:white:bluebar4"; + gpios = <&chipcommon 18 GPIO_ACTIVE_HIGH>; + }; + + bluebar5 { + label = "bcm53xx:white:bluebar5"; + gpios = <&chipcommon 19 GPIO_ACTIVE_HIGH>; + }; + + bluebar6 { + label = "bcm53xx:white:bluebar6"; + gpios = <&chipcommon 20 GPIO_ACTIVE_HIGH>; + }; + + bluebar7 { + label = "bcm53xx:white:bluebar7"; + gpios = <&chipcommon 21 GPIO_ACTIVE_HIGH>; + }; + + bluebar8 { + label = "bcm53xx:white:bluebar8"; + gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&usb2 { + vcc-gpio = <&chipcommon 13 GPIO_ACTIVE_HIGH>; +}; + +&usb3 { + vcc-gpio = <&chipcommon 14 GPIO_ACTIVE_HIGH>; +}; + +&mdio_mii_mux { + status = "okay"; +}; + +&mdio_ext { + status = "okay"; +}; + +&srab { + compatible = "brcm,bcm53012-srab", "brcm,bcm5301x-srab"; + status = "okay"; + dsa,member = <0 0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@1 { + reg = <1>; + label = "lan7"; + }; + + port@2 { + reg = <2>; + label = "lan4"; + }; + + port@3 { + reg = <3>; + label = "lan8"; + }; + + port@4 { + reg = <4>; + label = "wan"; + }; + + port@5 { + reg = <5>; + ethernet = <&gmac0>; + label = "cpu"; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + port@7 { + reg = <7>; + ethernet = <&gmac1>; + label = "cpu"; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + port@8 { + reg = <8>; + ethernet = <&gmac2>; + label = "cpu"; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + sw0_p0: port@0 { + reg = <0>; + label = "extsw"; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; }; }; + +&mdio_mii { + status = "okay"; + + switch@0 { + compatible = "brcm,bcm53125"; + #address-cells = <1>; + #size-cells = <0>; + reset-gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>; + reset-names = "robo_reset"; + reg = <0>; + dsa,member = <1 0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + label = "lan1"; + }; + + port@1 { + reg = <1>; + label = "lan5"; + }; + + port@2 { + reg = <2>; + label = "lan2"; + }; + + port@3 { + reg = <3>; + label = "lan6"; + }; + + port@4 { + reg = <4>; + label = "lan3"; + }; + + sw1_p8: port@8 { + reg = <8>; + ethernet = <&sw0_p0>; + label = "cpu"; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; + }; +}; + diff --git a/arch/arm/boot/dts/bcm47094.dtsi b/arch/arm/boot/dts/bcm47094.dtsi index 4840a78..8f3ec57 100644 --- a/arch/arm/boot/dts/bcm47094.dtsi +++ b/arch/arm/boot/dts/bcm47094.dtsi @@ -6,10 +6,8 @@ #include "bcm4708.dtsi" -/ { - usb3_phy: usb3-phy { - compatible = "brcm,ns-bx-usb3-phy"; - }; +&usb3_phy { + compatible = "brcm,ns-bx-usb3-phy"; }; &uart0 { diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index 9a076c4..9e4386a 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -154,13 +154,6 @@ clock-names = "phy-ref-clk"; }; - usb3_phy: usb3-phy { - compatible = "brcm,ns-ax-usb3-phy"; - reg = <0x18105000 0x1000>, <0x18003000 0x1000>; - reg-names = "dmp", "ccb-mii"; - #phy-cells = <0>; - }; - axi@18000000 { compatible = "brcm,bus-axi"; reg = <0x18000000 0x1000>; @@ -359,7 +352,55 @@ reg = <0x18003000 0x8>; #size-cells = <1>; #address-cells = <0>; + }; + + mdio-bus-mux { + compatible = "mdio-mux-mmioreg"; + mdio-parent-bus = <&mdio>; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x18003000 0x4>; + mux-mask = <0x200>; + + mdio_int: mdio@0 { /* BIT(9) = 0 => internal mdio */ + reg = <0x0>; + #address-cells = <1>; + #size-cells = <0>; + + usb3_phy: usb3-phy@10 { + compatible = "brcm,ns-ax-usb3-phy"; + reg = <0x10>; + usb3-dmp-syscon = <&usb3_dmp>; + #phy-cells = <0>; + }; + }; + + mdio_ext: mdio@200 { /* BIT(9) = 1 => external mdio */ + reg = <0x200>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + }; + + mdio_mii_mux: mdio-mii-mux { + compatible = "mdio-mux-mmioreg"; + mdio-parent-bus = <&mdio_ext>; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x1800c1c0 0x4>; + mux-mask = <0xc0>; /* BIT(6) = mdc, BIT(7) = mdio */ status = "disabled"; + + mdio_mii: mdio-mii@0 { + reg = <0x0>; /* Enable mii function */ + #address-cells = <1>; + #size-cells = <0>; + }; + }; + + usb3_dmp: syscon@18105000 { + reg = <0x18105000 0x1000>; }; i2c0: i2c@18009000 {