From patchwork Wed Oct 7 19:01:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Unune X-Patchwork-Id: 11821619 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 34617109B for ; Wed, 7 Oct 2020 19:03:42 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E7BAB2168B for ; Wed, 7 Oct 2020 19:03:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="AVLNCCBt"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QQmFGTNm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7BAB2168B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: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:List-Owner; bh=pI1faaoSE2sPiNl0O9T+BcIHM+r10+HLiqPX+EA8xN8=; b=AVLNCCBtDSsyoFzc/SQEieO05 fWl1W1m+bBxQEwKIXfX+qLmbvmxTWB538Z1xT8OdMZdutzjhu0iv0QqAid1K4b4Km9zIMptVyt+GP NiPpOWUMpkfq0TsADDzhfyLeR4xvtXqcJzfAsV7skryArNq/Uj7J+HDrOtaYyVXt3vBKEnocpOuEl yJ1o0uz60UlkX+Yd5YahaqUcQEMR1KScR3Zot+X1VQXF1YCfNRQj4chbSgaUKIk/ikuV+PZlHVixv nbd35P76u510RJDs8B9pqXbH9dQfabOKfr6nV2giVNgrLDJqJs+WorRRqFzr++wSx6VGGH2v2BXj3 HFmfsAx0Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQEhb-0000hI-UN; Wed, 07 Oct 2020 19:02:15 +0000 Received: from mail-qt1-x82f.google.com ([2607:f8b0:4864:20::82f]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQEhU-0000eH-CA for linux-arm-kernel@lists.infradead.org; Wed, 07 Oct 2020 19:02:09 +0000 Received: by mail-qt1-x82f.google.com with SMTP id j22so2905910qtj.8 for ; Wed, 07 Oct 2020 12:02:06 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=J3VG7MJ7Wsvu/VADxjYStuh9g6YebZQZ+YS6/5hPptA=; b=QQmFGTNmCX1NGBO/hNS8LszE1BVy7iA3ztMK27ybGDywPuMJ5ltGXU/1A0etuBuUVq fbszLgDpYNt72L1ItfUCxEyVhftGaMpzL5Im5IkXVgePnBBOhmDX4/+QVEkq60x3C/0Q 6xBOMo3+M58K9rXGA1Tvt7hFQeOnTgg66rn2lFKMZ8Q+rKLpvMzB99azyVYtgP9BdhZf crFFnPend5yAOrElWYhNJYb/BVg2aaQ5eUkRjoiX06qH+njv6x2/2ts5IX1iQgQxlXQU tbqPuAH99v+xOOlRHy0PwmqlXIa+FQ2bkKW4D0oHlELY4VHjNA8CMhp/8S+Ge9hXbWls Hvmg== 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:mime-version:content-transfer-encoding; bh=J3VG7MJ7Wsvu/VADxjYStuh9g6YebZQZ+YS6/5hPptA=; b=sXEBpjVo25PkyIbRb8M/ok97Bkw2vtjnkad7g7TCq8uyuoqa/F3RJoloaiS5f+acVr uO1g9qEyNyzjFZ21aggpLc8m5OwQl5VtwM6g6vhTV/1erOlp+Mm+EVgHJ0F58x3EIpXf wAwsvpULgEUU56zHKFIXwBkCZTJRklOzrflLvgsaQgRROIuVtKnzWsQYztG9nTE/9edd DDIw+IrAm78tFqShXPFhzD93skp585GnK2j1ZEZ4zjnXZdmPdGOWz72d8zqo9uDaj1cJ rYSK1Z1LyajG8QLjAtAgluKvglBRYwg8e6JDRsUtFSbnI/I2FiHuR2PW09Zjf5bm7kU8 4n+w== X-Gm-Message-State: AOAM5330PnE+drUeIdAVoH0NinzM//H98yAcALTsP2DD65DuZCct3z8k TcsWLSL3XsUz2zzjL5Px/JioKxXxoftyQQ== X-Google-Smtp-Source: ABdhPJyWE2fl4bpuo5qgJr8ZJn0I8P3qX0q6Bgh0IXAAbnA/WFqJMxEJKB5DvYoQAXHC8G4huSz5Kg== X-Received: by 2002:ac8:588d:: with SMTP id t13mr4757344qta.380.1602097324929; Wed, 07 Oct 2020 12:02:04 -0700 (PDT) Received: from ubuntu.localdomain (ool-45785633.dyn.optonline.net. [69.120.86.51]) by smtp.googlemail.com with ESMTPSA id j16sm2087078qkg.26.2020.10.07.12.02.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2020 12:02:04 -0700 (PDT) From: Vivek Unune To: Subject: [PATCH 1/3] ARM: dts: BCM5301X: Linksys EA9500 make use of pinctrl Date: Wed, 7 Oct 2020 15:01:50 -0400 Message-Id: <6687de05226dd055ee362933d4841a12b038792d.1601655904.git.npcomplete13@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201007_150208_423274_1216EEC5 X-CRM114-Status: GOOD ( 15.51 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [npcomplete13[at]gmail.com] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [npcomplete13[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:82f listed in] [list.dnswl.org] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , linux-kernel@vger.kernel.org, Rob Herring , bcm-kernel-feedback-list@broadcom.com, Vivek Unune , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Forgo the use of mmioreg mdio mux infavor of the pinctrl Signed-off-by: Vivek Unune --- .../boot/dts/bcm47094-linksys-panamera.dts | 153 +++++++++--------- arch/arm/boot/dts/bcm5301x.dtsi | 4 +- 2 files changed, 74 insertions(+), 83 deletions(-) diff --git a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts index 0faae8950375..f8443d9f86b7 100644 --- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts +++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts @@ -122,87 +122,6 @@ bluebar8 { gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>; }; }; - - mdio-bus-mux { - #address-cells = <1>; - #size-cells = <0>; - - /* BIT(9) = 1 => external mdio */ - mdio_ext: mdio@200 { - reg = <0x200>; - #address-cells = <1>; - #size-cells = <0>; - }; - }; - - mdio-mii-mux { - compatible = "mdio-mux-mmioreg"; - mdio-parent-bus = <&mdio_ext>; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x1800c1c0 0x4>; - - /* BIT(6) = mdc, BIT(7) = mdio */ - mux-mask = <0xc0>; - - mdio-mii@0 { - /* Enable MII function */ - reg = <0x0>; - #address-cells = <1>; - #size-cells = <0>; - - 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; - }; - }; - }; - }; - }; - }; }; &usb2 { @@ -265,6 +184,78 @@ fixed-link { }; }; +&pinctrl { + compatible = "brcm,bcm4709-pinmux"; + + pinmux_mdio: mdio { + groups = "mdio_grp"; + function = "mdio"; + }; +}; + +&mdio_bus_mux { + + /* BIT(9) = 1 => external mdio */ + mdio@200 { + reg = <0x200>; + #address-cells = <1>; + #size-cells = <0>; + + 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>; + pinctrl-names = "default"; + pinctrl-0 = <&pinmux_mdio>; + + 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; + }; + }; + }; + }; + }; +}; + &usb3_phy { status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index 9d9e8fe3f6ae..1476375f88bb 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -369,7 +369,7 @@ mdio: mdio@18003000 { #address-cells = <1>; }; - mdio-bus-mux@18003000 { + mdio_bus_mux: mdio-bus-mux@18003000 { compatible = "mdio-mux-mmioreg"; mdio-parent-bus = <&mdio>; #address-cells = <1>; @@ -428,7 +428,7 @@ cru@100 { #address-cells = <1>; #size-cells = <1>; - pin-controller@1c0 { + pinctrl: pin-controller@1c0 { compatible = "brcm,bcm4708-pinmux"; reg = <0x1c0 0x24>; reg-names = "cru_gpio_control";