From patchwork Sun Jun 13 09:46:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Hagan X-Patchwork-Id: 12317433 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80231C48BDF for ; Sun, 13 Jun 2021 09:50:23 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 3B3466124B for ; Sun, 13 Jun 2021 09:50:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B3466124B 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :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=DJSiHUwm8GIO8MLOyHygvsJ0HQ7iepfXI1JraJSfeuE=; b=J+pHyZwlIpN0o5 JL/MO+m4nJPyXMqBST6ufqhLl9ktA/IQttyMhZYc82ISohnSreNFrTEOROk07nJ63J1qWcXHYL/PM aD9WtYbQybFKPS+B98HftuPIJEB4/15SKS7oGZa2J9MI9xvflYZwFH04G8C0NJ8yFmYTxsiqMN2TD HAnZAqV5QtN6gJDAm/tZSLjAFQnKOE6/2rQqXUN/ojT8eYTijzJ1K8wfhPIU9FPqiUOeNFZtin8aJ R272LvBqBB7FaoyuUI3wMwaNVsmnKFMsg00Ze/2mGdqIx8p8QoXhvSQQ7Qx0c+z43MBUlINTyHxlZ XEnfE5+/1cj3xoZ44Z4A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsMjX-00A79s-Bj; Sun, 13 Jun 2021 09:48:47 +0000 Received: from mail-wm1-f51.google.com ([209.85.128.51]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsMjU-00A758-7G for linux-arm-kernel@lists.infradead.org; Sun, 13 Jun 2021 09:48:45 +0000 Received: by mail-wm1-f51.google.com with SMTP id h22-20020a05600c3516b02901a826f84095so11016384wmq.5 for ; Sun, 13 Jun 2021 02:48:42 -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:mime-version :content-transfer-encoding; bh=k8Tcr/7hh6x1TjU9mgPl8U2ujjvIEU7EhIT4MxZ7SOk=; b=KeA0K7SElPIS7sEnawxhgq1tX01lPeaGPuoWXaUhK/80J3R+clXgxYf0k8i3U+ToVq MIioP/6SpgwuH952kXtXj1zM8YXm7yLoaLUgfa/ZPI7Xtn5bMtbs0zxtQ86pWl+i12ec s8d7+b64GyedYJHw+dYyThPZ2Pc/TrJJ9ZxycOi0WGr9QfJYbNV2GnYIMxgULGuKIHPF caPFgmILv79rWr0pgfWmyDuNNBVLPSfhdS18WDlhAPxfYBXk7udk+xvTgg/1ieURiblH e5eNt4BV668NZO7pBBZtnWD2I08zY0R4GcsFJb80O4W+ZYba5HD+1a5ad97XCf1CrZ0g v2Vw== 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=k8Tcr/7hh6x1TjU9mgPl8U2ujjvIEU7EhIT4MxZ7SOk=; b=XMjfQdhfl70daGi/NqCOFypxxyVwB/fkG/iptDmIAzdVX8y2DuvxFmzJoHLt1BKpvI uJm/5N5VYuLEc5A4ztNFMvoAaZuY5vvhaIeKq6PrQZGwbj5ULz1XMCCiNkpTfpdYf1K1 RsaRUPzpLxg/RAKd5A9qze0D8kREYiV4CExKDBZ3HTvtaUqRBBJ2tKwN2QI/uv6fEA8M WkeoV5y5OVh9XnUQJJqZp52LUmiIeIkbpnZGE7c7b8C94CqgD6RcLmTScK+devpc61E6 Uii0X3YLybOMqzDgLGcARYqOWZlnr4kPdWP/NZje8gbUfBBzV3pC68mnomgAKssxxy37 PPJg== X-Gm-Message-State: AOAM531luvBkUNCW3Th7xvcWgG6d26YClZaKCM2LMIQYTJnfU3pr2yMs yLnBL+6UeU7zSquGPu4pEvoYpGxS9iI= X-Google-Smtp-Source: ABdhPJy/XuQCc5BH8sN6gBgGQS78fLek7ilWWUE+4UJ0gifajvZw76otnVo+Y4jKdnURGQtS6AdZoA== X-Received: by 2002:a1c:453:: with SMTP id 80mr11077477wme.171.1623577661587; Sun, 13 Jun 2021 02:47:41 -0700 (PDT) Received: from cluster5 ([80.76.206.81]) by smtp.gmail.com with ESMTPSA id y189sm10953178wmy.25.2021.06.13.02.47.40 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Sun, 13 Jun 2021 02:47:41 -0700 (PDT) From: Matthew Hagan To: Cc: Florian Fainelli , Vladimir Oltean , Andrew Lunn , Vivek Unune , Matthew Hagan , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] ARM: dts: NSP: disable qspi node by default Date: Sun, 13 Jun 2021 10:46:34 +0100 Message-Id: <20210613094639.3242151-1-mnhagan88@gmail.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210613_024844_287521_5745ECA4 X-CRM114-Status: GOOD ( 12.43 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The QSPI bus is enabled by default, however this may not used on all devices. This patch disables by default, requiring it to be explicitly enabled where required. Signed-off-by: Matthew Hagan --- arch/arm/boot/dts/bcm-nsp.dtsi | 1 + arch/arm/boot/dts/bcm958522er.dts | 1 + arch/arm/boot/dts/bcm958525er.dts | 1 + arch/arm/boot/dts/bcm958525xmc.dts | 1 + arch/arm/boot/dts/bcm958622hr.dts | 1 + arch/arm/boot/dts/bcm958623hr.dts | 1 + arch/arm/boot/dts/bcm958625hr.dts | 1 + arch/arm/boot/dts/bcm958625k.dts | 1 + arch/arm/boot/dts/bcm988312hr.dts | 1 + 9 files changed, 9 insertions(+) diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index b4d2cc70afb1..c0427d985438 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -310,6 +310,7 @@ qspi: spi@27200 { num-cs = <2>; #address-cells = <1>; #size-cells = <0>; + status = "disabled"; }; xhci: usb@29000 { diff --git a/arch/arm/boot/dts/bcm958522er.dts b/arch/arm/boot/dts/bcm958522er.dts index b6f4d931123c..e5ed67b3c35f 100644 --- a/arch/arm/boot/dts/bcm958522er.dts +++ b/arch/arm/boot/dts/bcm958522er.dts @@ -134,6 +134,7 @@ nand_sel: nand_sel { }; &qspi { + status = "okay"; bspi-sel = <0>; flash: m25p80@0 { #address-cells = <1>; diff --git a/arch/arm/boot/dts/bcm958525er.dts b/arch/arm/boot/dts/bcm958525er.dts index af66caa87bfc..017fc46cdf0b 100644 --- a/arch/arm/boot/dts/bcm958525er.dts +++ b/arch/arm/boot/dts/bcm958525er.dts @@ -134,6 +134,7 @@ nand_sel: nand_sel { }; &qspi { + status = "okay"; bspi-sel = <0>; flash: m25p80@0 { #address-cells = <1>; diff --git a/arch/arm/boot/dts/bcm958525xmc.dts b/arch/arm/boot/dts/bcm958525xmc.dts index 3d6859e4fd5e..5364f98ae1b8 100644 --- a/arch/arm/boot/dts/bcm958525xmc.dts +++ b/arch/arm/boot/dts/bcm958525xmc.dts @@ -150,6 +150,7 @@ nand_sel: nand_sel { }; &qspi { + status = "okay"; bspi-sel = <0>; flash: m25p80@0 { #address-cells = <1>; diff --git a/arch/arm/boot/dts/bcm958622hr.dts b/arch/arm/boot/dts/bcm958622hr.dts index dca2c9c60857..4763eb5d68a6 100644 --- a/arch/arm/boot/dts/bcm958622hr.dts +++ b/arch/arm/boot/dts/bcm958622hr.dts @@ -138,6 +138,7 @@ nand_sel: nand_sel { }; &qspi { + status = "okay"; bspi-sel = <0>; flash: m25p80@0 { #address-cells = <1>; diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts index 4e106ce1384a..f2468bed2808 100644 --- a/arch/arm/boot/dts/bcm958623hr.dts +++ b/arch/arm/boot/dts/bcm958623hr.dts @@ -142,6 +142,7 @@ &sata_phy0 { }; &qspi { + status = "okay"; bspi-sel = <0>; flash: m25p80@0 { #address-cells = <1>; diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts index 3a62d2d90a18..c26849304bc7 100644 --- a/arch/arm/boot/dts/bcm958625hr.dts +++ b/arch/arm/boot/dts/bcm958625hr.dts @@ -149,6 +149,7 @@ nand_sel: nand_sel { }; &qspi { + status = "okay"; bspi-sel = <0>; flash: m25p80@0 { #address-cells = <1>; diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts index d331c0a4e6b6..b7b136c862a8 100644 --- a/arch/arm/boot/dts/bcm958625k.dts +++ b/arch/arm/boot/dts/bcm958625k.dts @@ -153,6 +153,7 @@ &pwm { }; &qspi { + status = "okay"; bspi-sel = <0>; flash: m25p80@0 { #address-cells = <1>; diff --git a/arch/arm/boot/dts/bcm988312hr.dts b/arch/arm/boot/dts/bcm988312hr.dts index 7cfb48fb48ba..6b57530a3964 100644 --- a/arch/arm/boot/dts/bcm988312hr.dts +++ b/arch/arm/boot/dts/bcm988312hr.dts @@ -138,6 +138,7 @@ nand_sel: nand_sel { }; &qspi { + status = "okay"; bspi-sel = <0>; flash: m25p80@0 { #address-cells = <1>; From patchwork Sun Jun 13 09:46:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Hagan X-Patchwork-Id: 12317435 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E34F5C48BDF for ; Sun, 13 Jun 2021 09:50:34 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 AB2AF6124B for ; Sun, 13 Jun 2021 09:50:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB2AF6124B 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bgsECPBxrKBgWuS/SvPZZvQZnpNkUrHd3pI4MFuILkI=; b=MCVKowRlEIjTOi tWHaB1VQ0UdD/oyPytHjmQ8zfN9q6Tv9Ny1fQ/cyx+QWGxuZRkuWoVRCdiEw9Dfv/mQOC0zLfnOVV VjrAHAL9LEIdeYhjfTfrCWTVlBHq+3YHxNDhZlnFZukFea2KuyF52kvP/HtQ2hxYMZ6dXEnGEPPAA nOBy0B+KwMZK2lt7YKaZ7cc4rk3/ue/OOqls5votMH6aOd7tEmovGd1PTbQnXagfxjm/irdIo91Xh iP3nCJWhQmeIXy82cy/oHP8LAxx98TejC9vlmOrjXhscmHOXoVMmdp/KqVzEdlFC+PO+gnQcsxSvZ BIopcVCDu5k4cYAsWNiA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsMjj-00A7ER-3K; Sun, 13 Jun 2021 09:48:59 +0000 Received: from mail-wr1-f43.google.com ([209.85.221.43]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsMjW-00A79c-LY for linux-arm-kernel@lists.infradead.org; Sun, 13 Jun 2021 09:48:48 +0000 Received: by mail-wr1-f43.google.com with SMTP id i94so10951698wri.4 for ; Sun, 13 Jun 2021 02:48:46 -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=KBrRGeB2tLy5jflZx3zulUwPWNrmiYbBd39TsmsVpuw=; b=gw+5NPw2bBt+nzYszknOnzycfUn4fdvONurNUi1Hn9pTftkzvQwGmEE77QBjXyviRA GhqurWcUTq9oujOY6dkYqVe+b4njy0TF60TUHDDZ39arB0U/8fwokWTQsiRhCOYQow/v eSj2RXAueGvfrl+2Axkq4lHi0r/h23kvM3uyDcs2EzzPHJvBFPd1zUHv4WAQeoj9AYQN FL18cm7qvJ14WXGHIG8aIC9qki+ULZjbjsZ3zsdktehqRsFyKXkO1u4ehU4Ck1aV8ije VCNTAcjG4YIZ+WYF6DtJ6ora46bC+VpEDAKgc1QZOguZEjjVU1pOTzMnb8Uts1845ahF waAQ== 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=KBrRGeB2tLy5jflZx3zulUwPWNrmiYbBd39TsmsVpuw=; b=q0/SV5cMLZueKrA8YWFws0jjXk5e97PhRtIFxGypgqY6shI2bZxJdj71cPVM/JAH9i kVh4+HmdJJVJHfwal9aF3q8kgnLHN5Gq8FNVWT84ut3gkVo8YAaHDgEWmhXxN3q5uzyf MZ1kBq/R1GymRxrQQKDMbPH2z2w9nInLSFGmrxKxt1c0fPoCNfXB3ceOHyNBGH8cfqlW gqO5Gf+pT1tB+ohhJ298YBNTf9JY68NircSeA7NJdxxRjsV/2PLi/g7sgpuDgyBiOMfT z5DwaI07oZWga1LYUsx2iKL7vVn2iIydMLxF6pAXJ8cyYJA/OHoy0hlo8ws8zPv8Uk3s yL3w== X-Gm-Message-State: AOAM533/oUuLET06iOAbLPCGjcF4xPdftABbcOi1eH/1+oPRq1qLExes c6+f4PPmiPoIak1aq3D0eQE= X-Google-Smtp-Source: ABdhPJzwtdE93FMlFu/4fNl7RSNmV/lGQ6cGe5Cy2BftilYN6LnSqlMM/a9NKHeoXAvJ9f+j5tKhEg== X-Received: by 2002:a5d:6849:: with SMTP id o9mr12508891wrw.44.1623577665284; Sun, 13 Jun 2021 02:47:45 -0700 (PDT) Received: from cluster5 ([80.76.206.81]) by smtp.gmail.com with ESMTPSA id u15sm14548391wmq.1.2021.06.13.02.47.44 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Sun, 13 Jun 2021 02:47:44 -0700 (PDT) From: Matthew Hagan To: Cc: Florian Fainelli , Vladimir Oltean , Andrew Lunn , Vivek Unune , Matthew Hagan , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] ARM: dts: NSP: disable sp804 ccbtimers by default Date: Sun, 13 Jun 2021 10:46:35 +0100 Message-Id: <20210613094639.3242151-2-mnhagan88@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210613094639.3242151-1-mnhagan88@gmail.com> References: <20210613094639.3242151-1-mnhagan88@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210613_024846_732890_71434E34 X-CRM114-Status: GOOD ( 13.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The sp804 ccbtimers are enabled by default, however they may or may not be present on the board. This patch disables them by default, requiring them to be enabled only where applicable. Signed-off-by: Matthew Hagan --- arch/arm/boot/dts/bcm-nsp.dtsi | 2 ++ arch/arm/boot/dts/bcm958522er.dts | 8 ++++++++ arch/arm/boot/dts/bcm958525er.dts | 8 ++++++++ arch/arm/boot/dts/bcm958525xmc.dts | 8 ++++++++ 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 | 8 ++++++++ arch/arm/boot/dts/bcm988312hr.dts | 8 ++++++++ 9 files changed, 66 insertions(+) diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index c0427d985438..043d3bfaf1cc 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -375,6 +375,7 @@ ccbtimer0: timer@34000 { ; clocks = <&iprocslow>; clock-names = "apb_pclk"; + status = "disabled"; }; ccbtimer1: timer@35000 { @@ -384,6 +385,7 @@ ccbtimer1: timer@35000 { ; clocks = <&iprocslow>; clock-names = "apb_pclk"; + status = "disabled"; }; srab: ethernet-switch@36000 { diff --git a/arch/arm/boot/dts/bcm958522er.dts b/arch/arm/boot/dts/bcm958522er.dts index e5ed67b3c35f..bc7a28cd1017 100644 --- a/arch/arm/boot/dts/bcm958522er.dts +++ b/arch/arm/boot/dts/bcm958522er.dts @@ -70,6 +70,14 @@ &amac1 { status = "okay"; }; +&ccbtimer0 { + status = "okay"; +}; + +&ccbtimer1 { + status = "okay"; +}; + &ehci0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm958525er.dts b/arch/arm/boot/dts/bcm958525er.dts index 017fc46cdf0b..cd9b24bf2ee6 100644 --- a/arch/arm/boot/dts/bcm958525er.dts +++ b/arch/arm/boot/dts/bcm958525er.dts @@ -70,6 +70,14 @@ &amac1 { status = "okay"; }; +&ccbtimer0 { + status = "okay"; +}; + +&ccbtimer1 { + status = "okay"; +}; + &ehci0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm958525xmc.dts b/arch/arm/boot/dts/bcm958525xmc.dts index 5364f98ae1b8..b7c76a7d4a40 100644 --- a/arch/arm/boot/dts/bcm958525xmc.dts +++ b/arch/arm/boot/dts/bcm958525xmc.dts @@ -66,6 +66,14 @@ &amac0 { status = "okay"; }; +&ccbtimer0 { + status = "okay"; +}; + +&ccbtimer1 { + status = "okay"; +}; + &ehci0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm958622hr.dts b/arch/arm/boot/dts/bcm958622hr.dts index 4763eb5d68a6..fe5ac3495223 100644 --- a/arch/arm/boot/dts/bcm958622hr.dts +++ b/arch/arm/boot/dts/bcm958622hr.dts @@ -74,6 +74,14 @@ &amac2 { status = "okay"; }; +&ccbtimer0 { + status = "okay"; +}; + +&ccbtimer1 { + status = "okay"; +}; + &ehci0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts index f2468bed2808..4c8563fdd635 100644 --- a/arch/arm/boot/dts/bcm958623hr.dts +++ b/arch/arm/boot/dts/bcm958623hr.dts @@ -74,6 +74,14 @@ &amac2 { status = "okay"; }; +&ccbtimer0 { + status = "okay"; +}; + +&ccbtimer1 { + status = "okay"; +}; + &ehci0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts index c26849304bc7..dc0fccf57dfe 100644 --- a/arch/arm/boot/dts/bcm958625hr.dts +++ b/arch/arm/boot/dts/bcm958625hr.dts @@ -85,6 +85,14 @@ &amac2 { status = "okay"; }; +&ccbtimer0 { + status = "okay"; +}; + +&ccbtimer1 { + status = "okay"; +}; + &ehci0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts index b7b136c862a8..f23e97df2fc1 100644 --- a/arch/arm/boot/dts/bcm958625k.dts +++ b/arch/arm/boot/dts/bcm958625k.dts @@ -64,6 +64,14 @@ &amac2 { status = "okay"; }; +&ccbtimer0 { + status = "okay"; +}; + +&ccbtimer1 { + status = "okay"; +}; + &ehci0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm988312hr.dts b/arch/arm/boot/dts/bcm988312hr.dts index 6b57530a3964..a2c8a22e8381 100644 --- a/arch/arm/boot/dts/bcm988312hr.dts +++ b/arch/arm/boot/dts/bcm988312hr.dts @@ -74,6 +74,14 @@ &amac2 { status = "okay"; }; +&ccbtimer0 { + status = "okay"; +}; + +&ccbtimer1 { + status = "okay"; +}; + &ehci0 { status = "okay"; }; From patchwork Sun Jun 13 09:46:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Hagan X-Patchwork-Id: 12317437 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 980BCC48BDF for ; Sun, 13 Jun 2021 09:50:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 5CFCE6124B for ; Sun, 13 Jun 2021 09:50:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5CFCE6124B 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3QJo8KzcK11xLCh4e4PqHiUF3D0EzGb68J2BejQylkg=; b=imxWFrTraeokWI YjjuhYSqJbrsCnMWTyTX0FCvsgT7m0NwukDOo5B/M6I6SiIDwEnPy8d76vqDLHWcPIrYd4EwxnoyN 9S/pDBqEhFbnLg1sp/wzzTmqg+TKLD1wu84p/xG63JImeaoIOcQX9lRUiVNK+Xq61NKLG9iyVXnE+ CpjEGt2t8+R4hbvmiCxceyK9wkgA0aTVOh9BybEKqyXHaUJiCeQVCp4dCpq6/vddEMAo+evyKkhHb vJhLbzz70lq6Z/6+KtPCLycpziEkz9JG1MbijB4xDS2EpNBUHYP/TRR5stYd0N1iiJoMH88Dn4Abj RMcqCLI6MPgZYHkrNJ2g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsMju-00A7Hg-Mj; Sun, 13 Jun 2021 09:49:10 +0000 Received: from mail-wm1-f45.google.com ([209.85.128.45]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsMja-00A7Bi-1K for linux-arm-kernel@lists.infradead.org; Sun, 13 Jun 2021 09:48:51 +0000 Received: by mail-wm1-f45.google.com with SMTP id h22-20020a05600c3516b02901a826f84095so11016512wmq.5 for ; Sun, 13 Jun 2021 02:48:49 -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=DIgDiWl4iCy2anFFqyIPL2t42uojiajXvda67OAw2z4=; b=Ncyfia/HC2eVv63ke+DsqnQTUiyIxFpnZtS8BjNxZa/eVPKo+M9jsKVboJSAnnceQi 81q7cNC3vnElMzRvyhyW3iPb6Qw8b+R5ZCAzmCKmR3Zaf2tP1z4tf7rCCJkRBGJx7jxH bNFKsBzRVrYdO/BnJMQFI3efb52O1XeABb7iPnpwblp5XIfGSKJc4oj+9yVJFOm5FWmh XNJ/A7q/PZXuNWl9lKXbrCkLuXKAS5BU25s1eUwSQ+c63FesrT+Lvv3Yr7SS4HLdoP65 UhDO8GrLQOZtmbZr9WkqloDgjz+XtxcyZRJWJLfIz/N5OsovNrEIZ1Kztp7vcN5dNjmR ShCg== 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=DIgDiWl4iCy2anFFqyIPL2t42uojiajXvda67OAw2z4=; b=RVl7ASSnFUwX3OwUXYsidkmhDGbyMTmOigrkfLdAjfvV8xVpYW2+yHzjfUC1dnK9NZ jWN80Dz4dgvviU6FVI98wOKn0S6Mq72p9xsGnynZMwo92a6vqeuCLBcAlfBcoXGYbLNu ink5CNBoUySICoPV9w4TkFV/jebyDt2BPquflazuLItM3IvimNxG/a+SNKl353dz/rrz HsEZHxlWIQYc8UUnY6z4qNKpc8+Qo6nXKXzMRe9dpQGI/RnCYV7WQ2XI/FAfWd922Uky cEc+t3+p/g38RALUdMFh8JOqlkq4uSq8Jxdu1kJiC0fzKXHE4cxuMv6IMN+VQ5J8Bh5G nNaw== X-Gm-Message-State: AOAM532SXwZuEn5/fSrisAwul68lSb5Pqd/j5LARwQ2e27bLUI0mT0Jt 3N7jJRKzR9enklh6dtFRv9Y= X-Google-Smtp-Source: ABdhPJzBEkHW1i+rmP3wvj5vETRCaGR2D+QVtFk4mX935/+jWKv/SwvT4zBqg5J9JMg+nYa9sv3ueQ== X-Received: by 2002:a1c:4e03:: with SMTP id g3mr27160166wmh.127.1623577668650; Sun, 13 Jun 2021 02:47:48 -0700 (PDT) Received: from cluster5 ([80.76.206.81]) by smtp.gmail.com with ESMTPSA id g21sm13558793wrb.46.2021.06.13.02.47.48 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Sun, 13 Jun 2021 02:47:48 -0700 (PDT) From: Matthew Hagan To: Cc: Florian Fainelli , Vladimir Oltean , Andrew Lunn , Vivek Unune , Matthew Hagan , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] ARM: dts: NSP: add MDIO bus controller node Date: Sun, 13 Jun 2021 10:46:36 +0100 Message-Id: <20210613094639.3242151-3-mnhagan88@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210613094639.3242151-1-mnhagan88@gmail.com> References: <20210613094639.3242151-1-mnhagan88@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210613_024850_100385_30F8AB83 X-CRM114-Status: GOOD ( 12.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This patch adds the node for the MDIO bus controller, present on the NSP SoC. Signed-off-by: Matthew Hagan --- arch/arm/boot/dts/bcm-nsp.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index 043d3bfaf1cc..e91a68996986 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -363,6 +363,13 @@ pwm: pwm@31000 { status = "disabled"; }; + mdio: mdio@32000 { + compatible = "brcm,iproc-mdio"; + reg = <0x32000 0x8>; + #size-cells = <0>; + #address-cells = <1>; + }; + rng: rng@33000 { compatible = "brcm,bcm-nsp-rng"; reg = <0x33000 0x14>; From patchwork Sun Jun 13 09:46:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Hagan X-Patchwork-Id: 12317431 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 650FAC48BDF for ; Sun, 13 Jun 2021 09:49:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 38C076124B for ; Sun, 13 Jun 2021 09:49:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 38C076124B 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7KZshNFQN0QGCRV97Hs+fugUBXdEQujTtdcdKX+mu8g=; b=isFAamlx9/Fc6G 1iZU0KmZY7i6QRrRfm3oWc8jSGfH/foCgzJytzdOHAk+zjK88dxdAKf4DXvGohMYmgfZq1O/K1IjL I9lpmk3fyP0qwE2cX2nCoygxS934FcCf7Cm4itF6FT3jo+FgwGtxC0nxSHYsfDqo12TPsLdnnWRuh TdhfaGyqBvGDNGYCqU5LjgdECqssmcBlKAWlnPSs4XME392ep4pdr32QThHUvt/TlOBrbEMc8n6eH h3sZXvefeVEveZQRDJZ08Nlks6NqslcTcIdAB6zls5EhTK/7N9RAYhGM+5YAWYs6OgW5KA7pmFkxC tGEvZ3k6VjMKZeojn+QQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsMim-00A6r9-0A; Sun, 13 Jun 2021 09:48:00 +0000 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsMii-00A6qX-8M for linux-arm-kernel@lists.infradead.org; Sun, 13 Jun 2021 09:47:57 +0000 Received: by mail-wr1-x429.google.com with SMTP id c5so10943509wrq.9 for ; Sun, 13 Jun 2021 02:47:53 -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=IDfBcudzWJBKabnnvY8z/cQCBRgnrN5jAmw/3Eca5LM=; b=mIUAFX4VpiU75CUcRASXp/3YKIOqCFjR04uNxvfwu3mQuXu55ZIMdPOjBCpOtwd/hJ SrF0ZhSw6Kzk4rVC/uzFsABKltCWHe69iY0VyooaZYXlYOilK9pLkRaRzBKv89jCTu8o 8b3PJTsuzLyUEgYQFYBsANQVkmALybai5UZ621ndXMYJ8cqIZb8EG8SItOe2HCocmRdw HoKhGQ6YAWSyVjcZMKIHqj8uVb1V8MIy5JsxeNxd5/XSkeg5sVCLUufbG6D5+OKl4Egm NPFgtMtJGxx8anfhQ4JpBQnEWCPq04as6CYm+vxP2zmbo34KjaQH3YO4vahODo2Yoeba T+mg== 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=IDfBcudzWJBKabnnvY8z/cQCBRgnrN5jAmw/3Eca5LM=; b=PuTrhE5SJgT469EeHLPy2kHSJD/ENLIIKKJRX0mKA00MxwsMdctHZWGUg64ZikLMuP J6+JHisnCNaT523ou3USeLiyuQe8PjQzpg/bYJWZrUXzREAx9G3rd4GVkQSKtzP3AKnh uQsRXnN/72xE7hCAiFqPbJ1Kkc84vvbzUj4fuV5GvnWWqcSOFYSv8X8ujx18JmMo9aQ7 O9QTX07oekSTLB/zUIDukrWDFPjOLgBHkHRf5MsKd4JrP4qeDH93DqaHF1IbVAF65Ugz doY2Me6Azb7yWMDzxUqQWaAnqnxVvnFsrgiaGUy8GmQsbM40WF6wh79XDa+5xrYwEzuc VMig== X-Gm-Message-State: AOAM532mPJNMKfbGfyz1OmfMlGN/9Wy7XnDHXS01p7IuNYnTg7w/VLIP 71OXEnAjjpsv5+pm1m2035I= X-Google-Smtp-Source: ABdhPJy1oD1q0kSYxcHbnuLF0CAphsMk6y07KdPjoM5BuVtzdozideQb7kcc94K0shW8eB3HfJFdug== X-Received: by 2002:a05:6000:188:: with SMTP id p8mr5874031wrx.296.1623577672062; Sun, 13 Jun 2021 02:47:52 -0700 (PDT) Received: from cluster5 ([80.76.206.81]) by smtp.gmail.com with ESMTPSA id 2sm12827599wrz.87.2021.06.13.02.47.51 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Sun, 13 Jun 2021 02:47:51 -0700 (PDT) From: Matthew Hagan To: Cc: Florian Fainelli , Vladimir Oltean , Andrew Lunn , Vivek Unune , Matthew Hagan , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] ARM: dts: NSP: Move USB3 PHY to internal MDIO bus Date: Sun, 13 Jun 2021 10:46:37 +0100 Message-Id: <20210613094639.3242151-4-mnhagan88@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210613094639.3242151-1-mnhagan88@gmail.com> References: <20210613094639.3242151-1-mnhagan88@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210613_024756_343318_F4A2B857 X-CRM114-Status: GOOD ( 15.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This patch largely replicates Vivek Unune's patch "ARM: dts: BCM5301X:Make usb3 phy use mdio phy driver"[1] for the NSP platform, whereby we need to create an mdio-mux to facilitate switches configured via external MDIO, in this case on the Meraki MX65. However in doing so, we are creating an overlap with usb3_phy's ccb-mii range. To resolve this, usb3_phy should be moved to a child node of the internal MDIO bus. The result is heavily based upon Vivek's patch. This has also been cross-referenced with Yendapally Reddy's earlier work which utilised the subsequently dropped brcm,nsp-usb3-phy driver: "[PATCH v2 4/4] arm: dts: nsp: Add USB nodes to device tree" [2]. Finally, this change provides conformance to the bcm-ns-usb3-phy documentation, utilising the required usb3-dmp-syscon property. Note that support for the deprecated ccb-mii bindings has been dropped as of "phy: phy-bcm-ns-usb3: drop support for deprecated DT binding"[3]. [1] https://lore.kernel.org/patchwork/patch/933971/ [2] https://www.spinics.net/lists/arm-kernel/msg555132.html [3] https://lore.kernel.org/linux-devicetree/20201113113423.9466-1-zajec5@gmail.com/ Signed-off-by: Matthew Hagan --- arch/arm/boot/dts/bcm-nsp.dtsi | 38 +++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index e91a68996986..7c59816fdb32 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -370,6 +370,35 @@ mdio: mdio@32000 { #address-cells = <1>; }; + mdio-mux@32000 { + compatible = "mdio-mux-mmioreg"; + reg = <0x32000 0x4>; + mux-mask = <0x200>; + #address-cells = <1>; + #size-cells = <0>; + mdio-parent-bus = <&mdio>; + + mdio_int: mdio@0 { + reg = <0x0>; + #address-cells = <1>; + #size-cells = <0>; + + usb3_phy: usb3-phy@10 { + compatible = "brcm,ns-bx-usb3-phy"; + reg = <0x10>; + usb3-dmp-syscon = <&usb3_dmp>; + #phy-cells = <0>; + status = "disabled"; + }; + }; + + mdio_ext: mdio@200 { + reg = <0x200>; + #address-cells = <1>; + #size-cells = <0>; + }; + }; + rng: rng@33000 { compatible = "brcm,bcm-nsp-rng"; reg = <0x33000 0x14>; @@ -530,13 +559,8 @@ sata1: sata-port@1 { }; }; - usb3_phy: usb3-phy@104000 { - compatible = "brcm,ns-bx-usb3-phy"; - reg = <0x104000 0x1000>, - <0x032000 0x1000>; - reg-names = "dmp", "ccb-mii"; - #phy-cells = <0>; - status = "disabled"; + usb3_dmp: syscon@104000 { + reg = <0x104000 0x1000>; }; };