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: 459597 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.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, 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 1E382C48BCF for ; Sun, 13 Jun 2021 09:48:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DCB9D6124B for ; Sun, 13 Jun 2021 09:48:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231195AbhFMJun (ORCPT ); Sun, 13 Jun 2021 05:50:43 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:44615 "EHLO mail-wm1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230255AbhFMJun (ORCPT ); Sun, 13 Jun 2021 05:50:43 -0400 Received: by mail-wm1-f49.google.com with SMTP id m41-20020a05600c3b29b02901b9e5d74f02so7921699wms.3; 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=A2dEtA/WxQ6fJ+XDaFbx+DjWjlb6OsdPCJ3PGY03lljyc2POD84GZxfCKZP3gtkhxR vtWIaPaMCJS/eyOA61Umi9roof9gDWcZBhURdf5dlsc5h6b2ROS307h5EYbZP7Yobtzp tuYZx0S0YKJi1ASRC1vJOa0/jpJ1g9H8VPzb7CteaSUPu4U+aMYgKnnCg/4pTFthYKHF rJIwyhiVZXQQNUw4vNHQJblGIlCa3lQH0MNrMw9u5ky3jwOV9wqdgG+uPFcpZA/ZcnIM VB2NtjXcDBfdzEJbwN88ne6cFYUJVem1yTq02KNkQOxcI060Iy7zxQfmcF52ou9AOTf6 rM7g== X-Gm-Message-State: AOAM531xXHz/pgas95W2lTEEWKphsBAj5xQnmlWP3wZCzomUKYY0BVE+ eIlc9Lasi2ku6dm1f81xAUqJEfiotY0= 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 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 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.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: 460034 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.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, 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 D3E49C48BCF for ; Sun, 13 Jun 2021 09:48:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B0FF161166 for ; Sun, 13 Jun 2021 09:48:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231650AbhFMJu7 (ORCPT ); Sun, 13 Jun 2021 05:50:59 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:46971 "EHLO mail-wr1-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231621AbhFMJu6 (ORCPT ); Sun, 13 Jun 2021 05:50:58 -0400 Received: by mail-wr1-f45.google.com with SMTP id a11so10952182wrt.13; 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=EK+x+NUyxwktpkgfXztk0CL69vqGGGkf8VfnvVdbzQzWsO9rTaQmtX+N3hZk4NhPPe nuA/W3f0b506Gbi/3BDbJCUS58N0HAhEw9OHD7p/9raFOltsPV6XkR5Q23bNG8c12/nd Vfny42Q1c8NW7HiZF1+TmuMDSPgVVWOYTIsilVczDLuPL2AuwcO/2YGteBRG1zjeGADZ kJAHzPdYf5kvEFPW2OXgGhqReMbONmrQYFN8twE7VYKch+prv+hTUfm0RN51ECY/cxHU yoyFnw4Iz/wC5qHY3n4cTmMNC1qByDpOo9Bl5DCQPqk6MAvZXEPtFleT4lUI2Wahv7t4 QuBw== X-Gm-Message-State: AOAM533/v9j9MPLJvAXmDaUWZ2hHaeTDhAwcqWvJaIrY0LgvhO4isEHx c2sim0Rmzf+htMoJCgPsvbqVhY0B9aI= 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 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 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.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: 460035 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.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, 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 574ECC48BDF for ; Sun, 13 Jun 2021 09:48:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3AA5C61279 for ; Sun, 13 Jun 2021 09:48:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231576AbhFMJuv (ORCPT ); Sun, 13 Jun 2021 05:50:51 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:41880 "EHLO mail-wm1-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230255AbhFMJuu (ORCPT ); Sun, 13 Jun 2021 05:50:50 -0400 Received: by mail-wm1-f41.google.com with SMTP id y13-20020a1c4b0d0000b02901c20173e165so3121112wma.0; 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=RVqsDG8jhn2WjxL4SCnwyfUXcmfztR0F/cT9fWVWAq194pDxbm+2AhFOiaQdwRas00 gAm31PMx+r9dhmtQZUvWmOlqyUecSmbqajLEJlcoss5zUaU1pdvtyclYtldqJkzNF7Bh XLysvIJHwO+CmI8lRC/hbanoeIeQ07d+QHXSnjNR26d1ASJZsKsXgt2Ldw9KNz5ndIzT Afvvsrx3LwnVW4xojXlfGPQp5HHzh7rreiDA4lBu32sRbLVeX/TWI8PzKCJKUqACXZ6h Y2aDhxWT00Yam1OKlnfj/gwybrvQcj7XV2irumvyDY3cmCTL8Lc2elF2FF7Wv0BqIF24 DMlA== X-Gm-Message-State: AOAM530sfYs9spGoZ3SsvEi7/Gn9oMNeGIpX3JHKxtIj5l/jX0kHfeIG UWnu8nB0rirQMAeURtVGun11DMeJuEA= 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 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 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.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: 459596 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.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, 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 83C1FC48BDF for ; Sun, 13 Jun 2021 09:48:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 654836124C for ; Sun, 13 Jun 2021 09:48:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230255AbhFMJuy (ORCPT ); Sun, 13 Jun 2021 05:50:54 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:34437 "EHLO mail-wr1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231621AbhFMJuy (ORCPT ); Sun, 13 Jun 2021 05:50:54 -0400 Received: by mail-wr1-f49.google.com with SMTP id q5so10967559wrm.1; Sun, 13 Jun 2021 02:48:52 -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=EFDdcnpYe0SGkE8xkkP1GgYF64UboZ7+chZwZZ2ILj0Z/o9fPmREpQy5YYLAJlynFj VYVPIGUFXQgGGImDeq40d/ZvgqBrbc1Razs5Qw3LRPv5kv/u0qEn0hOeDhqWL8RMqkma nW01XChAVAINSGwHLbdpAdaPPij9rjwQFBgSUtEDFgkoTcJ7Jv7SxteaBBeiPtXkw/Bf FnDHOv4+vvdEXQyTvnvKeV0GohM0aT0YIV5nZ+/VSAKtv6ExQ579rZdjl9UQal7UKA+R qPx1XjfGqdMYHHhaSMUVolHfZ2XCX21WSK55X9o8tE4UBaKR/LhZu1p3zf4E3gAuIKKh JsBg== X-Gm-Message-State: AOAM531/6wMMHMAvjAl4woLdRnD9jgEfXJn1oSv5IfiMPdgYamnLCLak m/ePrZ6ET+B+kigoBKAF9lCbTYwYdjM= 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 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 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.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>; }; };