From patchwork Thu Jun 10 23:27:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Hagan X-Patchwork-Id: 12314269 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,URIBL_BLOCKED, 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 59229C48BD1 for ; Thu, 10 Jun 2021 23:31:42 +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 28274611B0 for ; Thu, 10 Jun 2021 23:31:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 28274611B0 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=CB8E8OsNznZCAYGQF5TRl5j6cAnezx/JVutxy7indmQ=; b=jbBkBaW7Xz7zvV xqGvwPLsFEh4g0T+MezwQPv96Xr0QWpSDY6etyEZCq1TV0OaihG/HykXGSvXHe/ujmPlLevlLcrb6 mi2pYOYrAXTAcCPwCT/SaloTN4LFlVIFJaru+pU2T18IN5xQVJWY15eSkdILS9XxchgSxfaA2OLRh Fq5sb3jq6XDulSgT1yZ9bLdaM8TrLEb0z2pY8uHT7dw+iJqyCoAduVcPS42ZqBJnm24OgaCbNAkRt bZ6jKZclCLoANyxht6QqTkPeapLo1830Bk5kmd4k0EXtSmxryIZz7qpVkXLfDRup0tERnLTat1C61 mylZ8OCZnADBSHJjB2qg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrU7B-002tMP-MC; Thu, 10 Jun 2021 23:29:34 +0000 Received: from mail-wr1-f48.google.com ([209.85.221.48]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrU76-002tK9-IN for linux-arm-kernel@lists.infradead.org; Thu, 10 Jun 2021 23:29:29 +0000 Received: by mail-wr1-f48.google.com with SMTP id m18so4041616wrv.2 for ; Thu, 10 Jun 2021 16:29:27 -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=0nt1QAmwrT7KiwVRGBb2sEf7u5dtEbfMgMB1Y3n/d6U=; b=Eq89jfHz5HtM/LYs41rCP41gcszr+5aevF46W868z1ggqWA7F2YEIbtWSBnz8t0fOb G5WKgiPzhOkWyom+ib0Q48I5t+kZYmWkM01ILBhz5ooilZCDOQ6fDUQI0C/CRGX1Fevt WK/MRIQOWUbg4yy1SFOB/Bs2aQwYzsopQ3ULXUwROcnkRK7HCB+JjAry/wYP99GgoyW0 cwJRLfVel4p5nK31KDMlW2Sh5Qmhag7QVxJ3c3WjnYNI4yvk1PE0SWH39XfgUL+rOTfY iWOJlv7ngdCWc80UXbPKAwMAX0s7/Cik774swDTXSOXV5IRmoT/ZQycXo6PYKuWaC53/ yYgQ== 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=0nt1QAmwrT7KiwVRGBb2sEf7u5dtEbfMgMB1Y3n/d6U=; b=ck0e21vt4YkysNi1pgfmbDJb68M96+PvDbyJEO1N1rCHrUqw1RMP++Z9GpAqHbMQ2K ECC+w2AWz0S8nfr83rMTrozOzD/ojo1V8cwRowSGtz0unAkzPtllfeFYhnzm5Ml941SI iOFtHaSxYgxR9wJ+eFV66zXd1MZEL+VXHtehwH574I/Ov/NPHjmJOPl+GlFhACQfzvh6 UkufkI35/rkSNB/sTpwymz5Dv7LUKkm5TH7agvjSS9RT8yj1FoUxy9fr3cL5stQbM2Is slS/w2R3YmvjIC1gr/Mpp0Ir5BnDhvG85WeGx/Gz4ZhaXZe8L6JtU3JEaRDIB0Kr5Juq 1EeA== X-Gm-Message-State: AOAM533ysGVs4l6gQKeQlcBJGr3ITCVByiIFzRqiS4IQvdiSQhBOnoZD gxtG66sCqJXFMS6e2DEvbmRGZDhZpqk= X-Google-Smtp-Source: ABdhPJzkq1CzfZQJ8JofM0yC65tXnI8aWTVOPbJZPZymMPGbOqTy3A8A+IWO3hilqAsMDEWhYfPW0Q== X-Received: by 2002:a05:6000:18f:: with SMTP id p15mr820358wrx.102.1623367705704; Thu, 10 Jun 2021 16:28:25 -0700 (PDT) Received: from cluster5 ([80.76.206.81]) by smtp.gmail.com with ESMTPSA id d13sm3196182wrs.41.2021.06.10.16.28.25 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Thu, 10 Jun 2021 16:28:25 -0700 (PDT) From: Matthew Hagan To: List-Id: Cc: Florian Fainelli , Vladimir Oltean , Andrew Lunn , Matthew Hagan , Rob Herring , Arnd Bergmann , Olof Johansson , soc@kernel.org, Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, Geert Uytterhoeven , Krzysztof Kozlowski , Sam Ravnborg , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/5] dt-bindings: arm: bcm: NSP: add Meraki MX64/MX65 Date: Fri, 11 Jun 2021 00:27:13 +0100 Message-Id: <20210610232727.1383117-2-mnhagan88@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210610232727.1383117-1-mnhagan88@gmail.com> References: <20210610232727.1383117-1-mnhagan88@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210610_162928_642632_30BF5AB5 X-CRM114-Status: GOOD ( 11.79 ) 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 Add bindings for the Meraki MX64/MX65 series. Note this patch should be applied on top of "dt-bindings: arm: bcm: add NSP devices to SoCs". Signed-off-by: Matthew Hagan --- Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml index 78dfa315f3d0..7d184ba7d180 100644 --- a/Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml +++ b/Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml @@ -62,6 +62,12 @@ properties: - enum: - brcm,bcm958625hr - brcm,bcm958625k + - meraki,mx64 + - meraki,mx64-a0 + - meraki,mx64w + - meraki,mx64w-a0 + - meraki,mx65 + - meraki,mx65w - const: brcm,bcm58625 - const: brcm,nsp From patchwork Thu Jun 10 23:27:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Hagan X-Patchwork-Id: 12314265 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=-10.9 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, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,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 C1F87C48BD1 for ; Thu, 10 Jun 2021 23:30:30 +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 931CA613E1 for ; Thu, 10 Jun 2021 23:30:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 931CA613E1 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=5r2OsOcspaU/ivobxITHrumd7Zo+1EvwW+TBSeS/iSw=; b=FhvCNWYjkZ87Hp aBFUIQdzkxFzWS9Pqg1W5buojr7sBGbgXgIRMNUT1mVZuOJqcciukPMXKD4ItYcsuJFp6gO5GS6J5 9MNk4UrhmXvPktz+wONvSaEVG/31+Dga5exwDzTWlh0ZHTR9uuHIOqkBLXAD3gQjLXgoBUp+Q7bo0 ZWurAfkNnjiGK4Ir9YSpcAwh57KbSwct7au83ITRUJyELFsjYiPvBluyozf5n1Koa67cwUbsgyOUM ggOMP9Uu7PDn+aOJBrwxG/l/t4RHW/WtytWaxBQk0FuuDCU8tUOMbZt7E1aGVZjcnZuGZ44DFfhOh NV02XbXMW6CfFWUVxvJA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrU6N-002t30-0m; Thu, 10 Jun 2021 23:28:43 +0000 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrU6I-002t1e-HT for linux-arm-kernel@lists.infradead.org; Thu, 10 Jun 2021 23:28:39 +0000 Received: by mail-wm1-x336.google.com with SMTP id h11-20020a05600c350bb02901b59c28e8b4so7087058wmq.1 for ; Thu, 10 Jun 2021 16:28:37 -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=fY39Ptk0sw5qXBAnjzWmLKrEgOiYPHLxRS1HTe3/ra8=; b=a/MiVDn1JdEQF9wRpjW4aEDvLn1WR4dUr3dVfjAg2cV8yAdEsdR/hsZXp3Qxwq21Sd 4TI/x+j1vfVV5nfCkZe/1T6aPR+FAYy3wjVksI/ryDaU5Y7oyWLd46Bgi71YqG1pC/tv Sft8hMp55HpAxY15hgXgls8SpkoWrsV3I4g9FU1uDIQ8vuNEH4BF/dTOqshCjrPOk22V CTHZai335bSowLt1rNe7zUYkrGBMSkVtiJp67O7cCvA052LmtQTGXo067npFVKPZQkss IoZVnZXCLAbXcsmTGV3mVqp6AVlw17PUr7w/iLvuhLjf61YtWsjCCImhia2CbSCpiEKj 1z7g== 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=fY39Ptk0sw5qXBAnjzWmLKrEgOiYPHLxRS1HTe3/ra8=; b=ueVNJ/L0/OPyPuC9o8CozMYgsNOX3zTbQdVxebp7htYEQbm65/3QewXSXm1Uiz7r+N WikDvbh+YcndcIKZiVmsj1iA4AtDS4SivBo3UrJdhO5vjkJfry7Rk1H7k30sB760VbNd YdzxyUrl9W0WM1p2eySCwT638dwos4Rw4nlMYK+ZvVlbiP+MIrXnNg+xx8qjGHkV3rq6 AuUDVQtYWCxD4fXrzEApTFysBcMz/Qu29Qdx9d3Bdc92FKDRjU+nPQlJ53n5HJjSpgJ/ AFRR/DlRutDdpHEfx3/VJvv4bOJkGUxsnHn54i+4gktSqI6w+Zrwf4ocqZy4DIJ/mcGJ J4Dg== X-Gm-Message-State: AOAM532kY4kDFKGdmcYSRDfP+3v4XCdjpoVDGpq+UQqXw+hqJEW6oMKo mDDmpnz5Lr4mvrs3Mg92y6dPUjmWsUE= X-Google-Smtp-Source: ABdhPJy+s2yIZkcJEiGe84bEKlWeqiQEB0JakPzVhGXnIuj7SAMYOp9sVBFq4Je+XRMXvzk1PZe56w== X-Received: by 2002:a1c:ddc3:: with SMTP id u186mr17327237wmg.44.1623367716526; Thu, 10 Jun 2021 16:28:36 -0700 (PDT) Received: from cluster5 ([80.76.206.81]) by smtp.gmail.com with ESMTPSA id o7sm5433527wro.76.2021.06.10.16.28.35 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Thu, 10 Jun 2021 16:28:36 -0700 (PDT) From: Matthew Hagan To: List-Id: Cc: Florian Fainelli , Vladimir Oltean , Andrew Lunn , Matthew Hagan , Rob Herring , Arnd Bergmann , Olof Johansson , soc@kernel.org, Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, Krzysztof Kozlowski , Viresh Kumar , Sam Ravnborg , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 2/5] ARM: dts: NSP: Add Meraki MX64/MX65 to Makefile Date: Fri, 11 Jun 2021 00:27:14 +0100 Message-Id: <20210610232727.1383117-3-mnhagan88@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210610232727.1383117-1-mnhagan88@gmail.com> References: <20210610232727.1383117-1-mnhagan88@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210610_162838_609888_09266262 X-CRM114-Status: GOOD ( 11.81 ) 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 Add Makefile entries for the Meraki MX64/MX65 series devices. Signed-off-by: Matthew Hagan --- arch/arm/boot/dts/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index f8f09c5066e7..033d9604db60 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -154,6 +154,12 @@ dtb-$(CONFIG_ARCH_BCM_NSP) += \ bcm958525xmc.dtb \ bcm958622hr.dtb \ bcm958623hr.dtb \ + bcm958625-meraki-mx64.dtb \ + bcm958625-meraki-mx64-a0.dtb \ + bcm958625-meraki-mx64w.dtb \ + bcm958625-meraki-mx64w-a0.dtb \ + bcm958625-meraki-mx65.dtb \ + bcm958625-meraki-mx65w.dtb \ bcm958625hr.dtb \ bcm988312hr.dtb \ bcm958625k.dtb From patchwork Thu Jun 10 23:27:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Hagan X-Patchwork-Id: 12314271 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,URIBL_BLOCKED, 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 7FF7FC48BD1 for ; Thu, 10 Jun 2021 23:32:02 +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 4335261182 for ; Thu, 10 Jun 2021 23:32:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4335261182 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=sWNvZuwXqi19NCpGoNRk2LnfCLF1gn8Ai5ve9ovFL6s=; b=yfEnWgdmH2gKD4 hFmj24SU2Ag7WC3Quur94wx/3MOhgH9iG5jIeKUJn+xCsPlvdmWS66Ui0+aLloub8YORYXYAuWnAs qnm29CXHTeqi8L+7y2fzrJFIpZJv3MP/XfTg/BN2NPqtvnllwboFE398jQ5MBBxLTW3epK+yMAWG9 II09FBlpbXjvBYUV0snfrYZk358wXGhyNSmx6G3vy1fQ0lGkB8ZUWLAA6L2OBIuhS7+66awny6T0G pvL7fKu/K6qJLWeM4Sx0Ne+X4v3CIMq04IZhkZZcpEIZrcNHPInO8U5Bdwnj5pbpaAkeAmM/7wBlu /Y5ahK83kwkPDRqQJBPg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrU7c-002tYg-Gt; Thu, 10 Jun 2021 23:30:02 +0000 Received: from mail-wm1-f42.google.com ([209.85.128.42]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrU7R-002tUk-LJ for linux-arm-kernel@lists.infradead.org; Thu, 10 Jun 2021 23:29:51 +0000 Received: by mail-wm1-f42.google.com with SMTP id f17so7088151wmf.2 for ; Thu, 10 Jun 2021 16:29:48 -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=SyK9z77KPeuihLjFv6CL15mYQ8zBPJwgwgxafmnnN4I=; b=GtV8tYpbysk23WR8WYdoLRG0IuES2TyMPeFoyWMZhkihp+JDhGcRInM9PnfPDcdpVQ aIpYR9KtjmTYavCP1G0mYCwQNOSnXgzC+CpyPzkMDY/mkOOSLZuwBUYrOQAvxs1du7JU VZqlBMNqfE4e72fBODuNlyri4cFqkOD0fiFOPUd/Sm5ophgBP04JPCTO06Rk5II0i3Tg Fhc08Q8mjfUU/syBEhN9UU8EnWZ3Ygzy8NRyJQPUhvDobOfUiHpquFAyYV/I4sJpAclT 9SyPjRtK83/oV0pkJ9jcL2cXFpSEKokcGsBtYZTgnVNP8m5C1IdQQQyEF3d7mZJ2z1qT auEw== 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=SyK9z77KPeuihLjFv6CL15mYQ8zBPJwgwgxafmnnN4I=; b=aGMcu9+aytvBFEKg/k01Kt/NCmaNBOnGEG5aaTCg2rrt+RyZ+ouUtP/zebPZwtp2vj YOd9qkor8vUPf7ftvRSOfIwq5VfEs/U/vNevVQYcECdpJQX8dMKzsSk+gJkeL1Ztg39r P30HVNRS83xKrBIfoV/9G8pL38WzCMLSX8g7fMNR5oPtEtcd18N6iL15B2VlgXOImX8b vanYqol4w5vQbV02dxpqxPh9XhDF/HfdYt35bEz2DN33JX8aeG7KF+ylri0yyH3FEDJQ mXWs8uGeXuZId6wzaA1coTCHpff8Idib/payisg5TCNZIQDSK5Qtt9CHe7+5qeNXvbYO 5cKA== X-Gm-Message-State: AOAM532UM5ORhTAHSoN8mWWFk2A1G2LzJSd9RL2R4m5ttxyZIZOM22pA PEjxds/PNwKs1Og2wfQixImvkber4nc= X-Google-Smtp-Source: ABdhPJxReN3yGxJyKbpYbQ91cIEM+68PrNx6S/fpAPT7jFhtMq+7YBxVgjndmP7se65wYIpXEAAaBQ== X-Received: by 2002:a05:600c:4f94:: with SMTP id n20mr17396630wmq.121.1623367727547; Thu, 10 Jun 2021 16:28:47 -0700 (PDT) Received: from cluster5 ([80.76.206.81]) by smtp.gmail.com with ESMTPSA id g186sm4324045wme.6.2021.06.10.16.28.46 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Thu, 10 Jun 2021 16:28:47 -0700 (PDT) From: Matthew Hagan To: List-Id: Cc: Florian Fainelli , Vladimir Oltean , Andrew Lunn , Matthew Hagan , Rob Herring , Arnd Bergmann , Olof Johansson , soc@kernel.org, Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, Sam Ravnborg , Geert Uytterhoeven , Viresh Kumar , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 3/5] ARM: dts: NSP: Add common bindings for MX64/MX65 Date: Fri, 11 Jun 2021 00:27:15 +0100 Message-Id: <20210610232727.1383117-4-mnhagan88@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210610232727.1383117-1-mnhagan88@gmail.com> References: <20210610232727.1383117-1-mnhagan88@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210610_162949_740221_4F83AB51 X-CRM114-Status: GOOD ( 15.24 ) 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 These bindings are required for all Meraki MX64/MX65 devices. Signed-off-by: Matthew Hagan --- .../dts/bcm958625-meraki-mx6x-common.dtsi | 148 ++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi diff --git a/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi b/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi new file mode 100644 index 000000000000..47a30dedf7b3 --- /dev/null +++ b/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Common Bindings for Cisco Meraki MX64 (Kingpin) and MX65 (Alamo) devices. + * + * Copyright (C) 2021 Matthew Hagan + */ + +#include "bcm-nsp.dtsi" +#include + +/ { + chosen { + stdout-path = "serial0:115200n8"; + }; + + memory { + device_type = "memory"; + reg = <0x60000000 0x80000000>; + }; + + pwm-leds { + compatible = "pwm-leds"; + + red { + label = "red:led"; + pwms = <&pwm 1 50000>; + }; + + green { + label = "green:led"; + pwms = <&pwm 2 50000>; + }; + + blue { + label = "blue:led"; + pwms = <&pwm 3 50000>; + }; + }; +}; + +&L2 { + arm,io-coherent; + prefetch-data = <1>; + prefetch-instr = <1>; +}; + +&uart0 { + clock-frequency = <62500000>; + status = "okay"; +}; + +&i2c0 { + status = "okay"; + at24@50 { + compatible = "atmel,24c64"; + pagesize = <32>; + reg = <0x50>; + }; +}; + +&amac2 { + status = "okay"; +}; + +&nand { + nandcs@0 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-on-flash-bbt; + + #address-cells = <1>; + #size-cells = <1>; + + nand-ecc-strength = <24>; + nand-ecc-step-size = <1024>; + + brcm,nand-oob-sector-size = <27>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x80000>; + read-only; + }; + + partition@80000 { + label = "shmoo"; + reg = <0x80000 0x80000>; + read-only; + }; + + partition@100000 { + label = "bootkernel1"; + reg = <0x100000 0x300000>; + }; + + partition@400000 { + label = "senao_nvram"; + reg = <0x400000 0x100000>; + }; + + partition@500000 { + label = "bootkernel2"; + reg = <0x500000 0x300000>; + }; + + partition@800000 { + label = "ubi"; + reg = <0x800000 0x3f700000>; + }; + }; +}; + +&qspi { + status = "disabled"; +}; + +&ehci0 { + status = "okay"; +}; + +&ohci0 { + status = "okay"; +}; + +&pwm { + status = "okay"; + #pwm-cells = <2>; + chan0 { + channel = <1>; + active_low = <1>; + }; + chan1 { + channel = <2>; + active_low = <1>; + }; + chan2 { + channel = <3>; + active_low = <1>; + }; +}; + +&ccbtimer1 { + status = "disabled"; +}; + +&sata_phy { + status = "disabled"; +}; From patchwork Thu Jun 10 23:27:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Hagan X-Patchwork-Id: 12314267 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,URIBL_BLOCKED, 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 F1A25C48BD1 for ; Thu, 10 Jun 2021 23:31:19 +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 AD489613E1 for ; Thu, 10 Jun 2021 23:31:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD489613E1 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=7yoRpck7IuCvMskBJR7SC0eNeSDAJvrIdYEBijBSXsQ=; b=AcBz7Wo1MS58fT wA45wfZ51MZn8lKIYB8Izisc5eVis54JcktNyciMfJ03HmS+f+AwFuuoN5rxwH6UxH49v1ZqIWsHD 9LkrmkrMD6Bcese9PFO9jIW+hfh1+dnyYSjftAeFQtpUMNGXkgzP/MbSHfKuJ94neLWBQi8iahMzH uhrRaahJ7BnpNT40FhkPGjjZRpV4bsAecyO162akdZfKIAUUpBaIGf1uJeMpLfoC8LGJz9B6jjFle SmC+8BWEBi2fkUTEV81L/vX8nc9px6Mm95LhT8BVInQJyFl28JeEEXnsm1Bds5Ge+SSMxaveddO/u 9FDopwaRvoQePZ8Ltf9Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrU6l-002tBC-Ks; Thu, 10 Jun 2021 23:29:07 +0000 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrU6e-002t8I-JR for linux-arm-kernel@lists.infradead.org; Thu, 10 Jun 2021 23:29:02 +0000 Received: by mail-wr1-x431.google.com with SMTP id m18so4042477wrv.2 for ; Thu, 10 Jun 2021 16:28:59 -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=BTpjcEscnkXt8biWria3TPVvbm38R/l/UTSx1WwHNQ4=; b=HV8O5Wx+mQNMN2vpuSzv6+t3TN3t8AVdOuLrs6e0MI3vI0yveOfPUCL09T29xrwxX/ niGf6R3taOBFa8NYD4uEp0yNeNLCyMyzyYf6gKdaAGJ4EPvWR426NVveEtldotO7Nd91 LKyfqy+Ribef0jOKTR61fp1aymO05HvpUYUqc/vJLoIcUeOpgTnL9Wzdxbw5d9PX4ebR wSN92PxI4lp2g4eseZu5R7VwHs+3zRQY8SxKzo4mNY2Z/KIs6psFnXmRKzbLaLkI3ao7 h7uV6+I6mveGb0jP+TOEuP4Sp0nZKDE9vEHqI/5Cvy0U+lCuln3iwJSOL/Z6KSHqx+TZ 4Yog== 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=BTpjcEscnkXt8biWria3TPVvbm38R/l/UTSx1WwHNQ4=; b=ESr2yc2hCyHp8QKjTxi8pf4afc29diOHbgjkmhmHi7rW/ZvEL28tlocKzEvubiqB9Y sZ0S6j/rnrkUUE2xpoDtuzIcXIaHR6hyOD9g5fCHtlVD6UHwOh6Xstgfr4JOzccnfzyf yl0F8qurDZOjEV8/VDvzm0LWhwdvzDvAmioXbnC9yY6kTo10REbRswe04Se2Ukwr7um3 YhR+7VU8IyZNHtMMqIs8+czv0FZHBsPuTzVWy8vlULk4PD3/FRkpxhCwT0oHOuojAQNV IlTiZQiKObef/WOBHGM6fRMnqupC8CMlap0LKBQZo4nJxuWLYTMMBJwKgFYZeRaEREH7 FzdA== X-Gm-Message-State: AOAM5321276VQGsBKbauagsQ6na2cwUiSHKz6F8FjG2TQNtYG5iI83eg qY4101s6DOQpje9I+40p/cmHn20OhZ4= X-Google-Smtp-Source: ABdhPJyCoU8FCEn23JKM5OCnln6DG5M5qDbzdTAbzlnFUMV2OTYKEdslyh579et4/sWhtyi1REg0Yw== X-Received: by 2002:adf:de03:: with SMTP id b3mr788972wrm.15.1623367738500; Thu, 10 Jun 2021 16:28:58 -0700 (PDT) Received: from cluster5 ([80.76.206.81]) by smtp.gmail.com with ESMTPSA id f14sm9786849wmq.10.2021.06.10.16.28.57 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Thu, 10 Jun 2021 16:28:58 -0700 (PDT) From: Matthew Hagan To: List-Id: Cc: Florian Fainelli , Vladimir Oltean , Andrew Lunn , Matthew Hagan , Rob Herring , Arnd Bergmann , Olof Johansson , soc@kernel.org, Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, Viresh Kumar , Krzysztof Kozlowski , Geert Uytterhoeven , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 4/5] ARM: dts: NSP: Add DT files for Meraki MX64 series Date: Fri, 11 Jun 2021 00:27:16 +0100 Message-Id: <20210610232727.1383117-5-mnhagan88@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210610232727.1383117-1-mnhagan88@gmail.com> References: <20210610232727.1383117-1-mnhagan88@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210610_162900_680503_B9D5B99A X-CRM114-Status: GOOD ( 17.28 ) 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 MX64 Hardware info: - CPU: Broadcom BCM58625 Cortex A9 @ 1200Mhz - RAM: 2 GB (4 x 4Gb SK Hynix H5TC4G83CFR) - Storage: 1 GB (Micron MT29F8G08ABACA) - Networking: BCM58625 internal switch (5x 1GbE ports) - USB: 1x USB2.0 - Serial: Internal header This patch adds the Meraki MX64 series. Since some devices make use of the older A0 SoC, changes need to be made to accommodate this device, including removal of dma-coherent and change in the secondary-cpu address. The MX64W devices have 2x Broadcom BCM43520KMLG on the PCI bus. Signed-off-by: Matthew Hagan --- .../boot/dts/bcm958625-meraki-kingpin.dtsi | 131 ++++++++++++++++++ .../arm/boot/dts/bcm958625-meraki-mx64-a0.dts | 45 ++++++ arch/arm/boot/dts/bcm958625-meraki-mx64.dts | 15 ++ .../boot/dts/bcm958625-meraki-mx64w-a0.dts | 55 ++++++++ arch/arm/boot/dts/bcm958625-meraki-mx64w.dts | 23 +++ 5 files changed, 269 insertions(+) create mode 100644 arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx64-a0.dts create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx64.dts create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx64w-a0.dts create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx64w.dts diff --git a/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi b/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi new file mode 100644 index 000000000000..8c4834f3496b --- /dev/null +++ b/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi @@ -0,0 +1,131 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Device Tree Bindings for Cisco Meraki MX64 series (Kingpin). + * + * Copyright (C) 2021 Matthew Hagan + */ + +#include "bcm958625-meraki-mx6x-common.dtsi" + +#include + +/ { + leds { + compatible = "gpio-leds"; + + orange_power { + label = "orange:power"; + gpios = <&gpioa 0 GPIO_ACTIVE_LOW>; + default-state = "on"; + }; + + lan1_right { + label = "green:lan1-right"; + gpios = <&gpioa 18 GPIO_ACTIVE_LOW>; + }; + + lan1_left { + label = "green:lan1-left"; + gpios = <&gpioa 19 GPIO_ACTIVE_LOW>; + }; + + lan2_right { + label = "green:lan2-right"; + gpios = <&gpioa 20 GPIO_ACTIVE_LOW>; + }; + + lan2_left { + label = "green:lan2-left"; + gpios = <&gpioa 24 GPIO_ACTIVE_LOW>; + }; + + lan3_right { + label = "green:lan3-right"; + gpios = <&gpioa 25 GPIO_ACTIVE_LOW>; + }; + + lan3_left { + label = "green:lan3-left"; + gpios = <&gpioa 26 GPIO_ACTIVE_LOW>; + }; + + lan4_right { + label = "green:lan4-right"; + gpios = <&gpioa 27 GPIO_ACTIVE_LOW>; + }; + + lan4_left { + label = "green:lan4-left"; + gpios = <&gpioa 28 GPIO_ACTIVE_LOW>; + }; + + wan_right { + label = "green:wan-right"; + gpios = <&gpioa 29 GPIO_ACTIVE_LOW>; + }; + + wan_left { + label = "green:wan-left"; + gpios = <&gpioa 30 GPIO_ACTIVE_LOW>; + }; + + white_status { + label = "white:status"; + gpios = <&gpioa 31 GPIO_ACTIVE_HIGH>; + }; + }; + + keys { + compatible = "gpio-keys-polled"; + autorepeat; + poll-interval = <20>; + + reset { + label = "reset"; + linux,code = ; + gpios = <&gpioa 6 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&srab { + compatible = "brcm,bcm58625-srab", "brcm,nsp-srab"; + status = "okay"; + + ports { + port@0 { + label = "lan1"; + reg = <0>; + }; + + port@1 { + label = "lan2"; + reg = <1>; + }; + + port@2 { + label = "lan3"; + reg = <2>; + }; + + port@3 { + label = "lan4"; + reg = <3>; + }; + + port@4 { + label = "wan"; + reg = <4>; + }; + + port@8 { + ethernet = <&amac2>; + label = "cpu"; + reg = <8>; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; +}; diff --git a/arch/arm/boot/dts/bcm958625-meraki-mx64-a0.dts b/arch/arm/boot/dts/bcm958625-meraki-mx64-a0.dts new file mode 100644 index 000000000000..aed9eb9fccd7 --- /dev/null +++ b/arch/arm/boot/dts/bcm958625-meraki-mx64-a0.dts @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Device Tree Bindings for Cisco Meraki MX64 with A0 SoC. + * + * Copyright (C) 2021 Matthew Hagan + */ + +/dts-v1/; + +#include "bcm958625-meraki-kingpin.dtsi" + +/ { + model = "Cisco Meraki MX64(A0)"; + compatible = "meraki,mx64-a0", "brcm,bcm58625", "brcm,nsp"; +}; + +&cpu1 { + secondary-boot-reg = <0xffff042c>; +}; + +&L2 { + /delete-property/ arm,io-coherent; + /delete-property/ prefetch-data; + /delete-property/ prefetch-instr; +}; + +&amac2 { + /delete-property/ dma-coherent; +}; + +&mailbox { + /delete-property/ dma-coherent; +}; + +&ehci0 { + /delete-property/ dma-coherent; +}; + +&ohci0 { + /delete-property/ dma-coherent; +}; + +&i2c0 { + /delete-property/ dma-coherent; +}; diff --git a/arch/arm/boot/dts/bcm958625-meraki-mx64.dts b/arch/arm/boot/dts/bcm958625-meraki-mx64.dts new file mode 100644 index 000000000000..fe787fd7d660 --- /dev/null +++ b/arch/arm/boot/dts/bcm958625-meraki-mx64.dts @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Device Tree Bindings for Cisco Meraki MX64 with B0+ SoC. + * + * Copyright (C) 2021 Matthew Hagan + */ + +/dts-v1/; + +#include "bcm958625-meraki-kingpin.dtsi" + +/ { + model = "Cisco Meraki MX64"; + compatible = "meraki,mx64", "brcm,bcm58625", "brcm,nsp"; +}; diff --git a/arch/arm/boot/dts/bcm958625-meraki-mx64w-a0.dts b/arch/arm/boot/dts/bcm958625-meraki-mx64w-a0.dts new file mode 100644 index 000000000000..b7d88c542943 --- /dev/null +++ b/arch/arm/boot/dts/bcm958625-meraki-mx64w-a0.dts @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Device Tree Bindings for Cisco Meraki MX64W with A0 SoC. + * + * Copyright (C) 2021 Matthew Hagan + */ + +/dts-v1/; + +#include "bcm958625-meraki-kingpin.dtsi" + +/ { + model = "Cisco Meraki MX64(A0)"; + compatible = "meraki,mx64-a0", "brcm,bcm58625", "brcm,nsp"; +}; + +&cpu1 { + secondary-boot-reg = <0xffff042c>; +}; + +&L2 { + /delete-property/ arm,io-coherent; + /delete-property/ prefetch-data; + /delete-property/ prefetch-instr; +}; + +&amac2 { + /delete-property/ dma-coherent; +}; + +&mailbox { + /delete-property/ dma-coherent; +}; + +&ehci0 { + /delete-property/ dma-coherent; +}; + +&ohci0 { + /delete-property/ dma-coherent; +}; + +&i2c0 { + /delete-property/ dma-coherent; +}; + +&pcie0 { + /delete-property/ dma-coherent; + status = "okay"; +}; + +&pcie1 { + /delete-property/ dma-coherent; + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm958625-meraki-mx64w.dts b/arch/arm/boot/dts/bcm958625-meraki-mx64w.dts new file mode 100644 index 000000000000..aa29c96f2871 --- /dev/null +++ b/arch/arm/boot/dts/bcm958625-meraki-mx64w.dts @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Device Tree Bindings for Cisco Meraki MX64W with B0+ SoC. + * + * Copyright (C) 2021 Matthew Hagan + */ + +/dts-v1/; + +#include "bcm958625-meraki-kingpin.dtsi" + +/ { + model = "Cisco Meraki MX64W"; + compatible = "meraki,mx64w", "brcm,bcm58625", "brcm,nsp"; +}; + +&pcie0 { + status = "okay"; +}; + +&pcie1 { + status = "okay"; +}; From patchwork Thu Jun 10 23:27:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Hagan X-Patchwork-Id: 12314273 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=-14.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, 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 2DE45C48BD1 for ; Thu, 10 Jun 2021 23:29:11 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 0CCC0613CB; Thu, 10 Jun 2021 23:29:11 +0000 (UTC) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D9C3B613E1; Thu, 10 Jun 2021 23:29:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D9C3B613E1 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=mnhagan88@gmail.com Received: by mail-wr1-f41.google.com with SMTP id a11so4022995wrt.13; Thu, 10 Jun 2021 16:29:10 -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=HhcSQy57Xk+molyTSgrm3dx5SrUlr/2mzbjEv/WNMOU=; b=jpnPaLg60jW07YzzHu0ChAhdSW5p348xAPpzJKBpHWzR4USG4MQxJD0GW2OGPTxp4q mktJnQp6hB2S5FttzxSrRVK6VFiPry8axeMQwF+st8FKHA9UxiEE7oLgGHgEvr4ZsAsS l/KFjye6H47nCGWIig+sQj5P4q/ZzJIqqJPTyMyKUhw4UIFB3ReobZTBbLu0YvGYSV0g iT6GQF7KNzlKXQT1o1bT2j77C0fFkevKJAqDNiSvnPYIuORExrrowxt4Qd4lnIkJXTaB s2efglSaUwdBnCmVOxMfHTO2W/ioZrkY3yg83DpYn25SoKHbAIqyUjCetIf71T8fsTrm FoAw== 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=HhcSQy57Xk+molyTSgrm3dx5SrUlr/2mzbjEv/WNMOU=; b=cMuSuc9BFPxh19QR/9HxnGNQGnkd2OI8IYqx9M7eHZsDTUeUnAsNP0rLEf0FbswZo5 OQps0NQNavehuI2O4HFxtvyFGuxuitNhgIvlCNKRT0aCTiKWulYPi0E+zMwJFBTq19Qc HQ9vK/Zp9RD+G5VIt9ks/aJGfvpJpvyeldCoBEBZ+Xc2KksMQ3GaWtvgaIDhoHEbVRz1 nG2OfgyvmzULyqNd9Rdv0JIIgrI0S7MvZ5UQS9iqiRO2dQ16H/e5mCeTMNrwYXsdQtbl 2NR/QGBrEBveQnj7se60YmMxYa5hJX8gluxWR7Y2sFwi+Si3OV4xRkUrwvBS673pLAbz OgjA== X-Gm-Message-State: AOAM530+o6XMZMLZam3hJxo+ad8mpilDOD2fDfhnyIqB0uR258ZNXj3p fmT1y/Mrcj1KHzlYLYZKDXA= X-Google-Smtp-Source: ABdhPJwoti1dul8w+JOC/xKhLILahBFZgQncf7h90KOztRCshJATWa5qRQ6fZ/ywaE3tcbDmwGwJow== X-Received: by 2002:a5d:6a02:: with SMTP id m2mr793033wru.77.1623367749540; Thu, 10 Jun 2021 16:29:09 -0700 (PDT) Received: from cluster5 ([80.76.206.81]) by smtp.gmail.com with ESMTPSA id 31sm5561644wrc.96.2021.06.10.16.29.08 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Thu, 10 Jun 2021 16:29:09 -0700 (PDT) From: Matthew Hagan To: List-Id: Cc: Florian Fainelli , Vladimir Oltean , Andrew Lunn , Matthew Hagan , Rob Herring , Arnd Bergmann , Olof Johansson , soc@kernel.org, Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, Geert Uytterhoeven , Sam Ravnborg , Viresh Kumar , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 5/5] ARM: dts: NSP: Add DT files for Meraki MX65 series Date: Fri, 11 Jun 2021 00:27:17 +0100 Message-Id: <20210610232727.1383117-6-mnhagan88@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210610232727.1383117-1-mnhagan88@gmail.com> References: <20210610232727.1383117-1-mnhagan88@gmail.com> MIME-Version: 1.0 MX65 Hardware info: - CPU: Broadcom BCM58625 Cortex A9 @ 1200Mhz - RAM: 2 GB (4 x 4Gb SK Hynix H5TC4G83CFR) - Storage: 1 GB (Micron MT29F8G08ABACA) - Networking: BCM58625 switch (2x 1GbE ports, used for WAN ports 1 & 2) 2x Qualcomm QCA8337 switches (10x 1GbE ports, used for LAN ports 3-12) - PSE: Broadcom BCM59111KMLG connected to LAN ports 11 & 12 - USB: 1x USB2.0 - Serial: Internal header As with the MX64, the MX65 has 2x Broadcom BCM43520KMLG on the PCI bus. Signed-off-by: Matthew Hagan --- arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi | 298 ++++++++++++++++++ arch/arm/boot/dts/bcm958625-meraki-mx65.dts | 15 + arch/arm/boot/dts/bcm958625-meraki-mx65w.dts | 23 ++ 3 files changed, 336 insertions(+) create mode 100644 arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx65.dts create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx65w.dts diff --git a/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi b/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi new file mode 100644 index 000000000000..0ff78fb89b6d --- /dev/null +++ b/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi @@ -0,0 +1,298 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Device Tree Bindings for Cisco Meraki MX65 series (Alamo). + * + * Copyright (C) 2021 Matthew Hagan + */ + +#include "bcm958625-meraki-mx6x-common.dtsi" + +#include + +/ { + aliases { + mdio-mux-mmio = &mdiomux0; + }; + + leds { + compatible = "gpio-leds"; + + orange_power { + label = "orange:power"; + gpios = <&gpioa 3 GPIO_ACTIVE_HIGH>; + default-state = "on"; + }; + + wan1_right { + label = "green:wan1-right"; + gpios = <&gpioa 24 GPIO_ACTIVE_LOW>; + }; + + wan1_left { + label = "green:wan1-left"; + gpios = <&gpioa 25 GPIO_ACTIVE_LOW>; + }; + + wan2_right { + label = "green:wan2-right"; + gpios = <&gpioa 26 GPIO_ACTIVE_LOW>; + }; + + wan2_left { + label = "green:wan2-left"; + gpios = <&gpioa 27 GPIO_ACTIVE_LOW>; + }; + + white_status { + label = "white:status"; + gpios = <&gpioa 31 GPIO_ACTIVE_HIGH>; + }; + }; + + keys { + compatible = "gpio-keys-polled"; + autorepeat; + poll-interval = <20>; + + reset { + label = "reset"; + linux,code = ; + gpios = <&gpioa 8 GPIO_ACTIVE_LOW>; + }; + }; + + mdio: mdio@18032000 { + compatible = "brcm,iproc-mdio"; + reg = <0x18032000 0x8>; + #size-cells = <0>; + #address-cells = <1>; + }; + + mdiomux0: mdio-mux { + compatible = "mdio-mux-mmioreg"; + reg = <0x18032000 0x4>; + mux-mask = <0x200>; + #address-cells = <1>; + #size-cells = <0>; + mdio-parent-bus = <&mdio>; + + mdio_ext: mdio@200 { + reg = <0x200>; + #address-cells = <1>; + #size-cells = <0>; + }; + }; + + mdio-mii-mux { + compatible = "mdio-mux-mmioreg"; + reg = <0x1803f1c0 0x4>; + mux-mask = <0x2000>; + mdio-parent-bus = <&mdio_ext>; + #address-cells = <1>; + #size-cells = <0>; + + mdio@0 { + reg = <0x0>; + #address-cells = <1>; + #size-cells = <0>; + + phy_port6: phy@0 { + reg = <0>; + }; + + phy_port7: phy@1 { + reg = <1>; + }; + + phy_port8: phy@2 { + reg = <2>; + }; + + phy_port9: phy@3 { + reg = <3>; + }; + + phy_port10: phy@4 { + reg = <4>; + }; + + switch@10 { + compatible = "qca,qca8337"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x10>; + dsa,member = <1 0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + port@0 { + reg = <0>; + label = "cpu"; + ethernet = <&sgmii1>; + phy-mode = "sgmii"; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + port@1 { + reg = <1>; + label = "lan8"; + phy-handle = <&phy_port6>; + }; + + port@2 { + reg = <2>; + label = "lan9"; + phy-handle = <&phy_port7>; + }; + + port@3 { + reg = <3>; + label = "lan10"; + phy-handle = <&phy_port8>; + }; + + port@4 { + reg = <4>; + label = "lan11"; + phy-handle = <&phy_port9>; + }; + + port@5 { + reg = <5>; + label = "lan12"; + phy-handle = <&phy_port10>; + }; + }; + }; + }; + + mdio-mii@2000 { + reg = <0x2000>; + #address-cells = <1>; + #size-cells = <0>; + + phy_port1: phy@0 { + reg = <0>; + }; + + phy_port2: phy@1 { + reg = <1>; + }; + + phy_port3: phy@2 { + reg = <2>; + }; + + phy_port4: phy@3 { + reg = <3>; + }; + + phy_port5: phy@4 { + reg = <4>; + }; + + switch@10 { + compatible = "qca,qca8337"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x10>; + dsa,member = <2 0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + port@0 { + reg = <0>; + label = "cpu"; + ethernet = <&sgmii0>; + phy-mode = "sgmii"; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + port@1 { + reg = <1>; + label = "lan3"; + phy-handle = <&phy_port1>; + }; + + port@2 { + reg = <2>; + label = "lan4"; + phy-handle = <&phy_port2>; + }; + + port@3 { + reg = <3>; + label = "lan5"; + phy-handle = <&phy_port3>; + }; + + port@4 { + reg = <4>; + label = "lan6"; + phy-handle = <&phy_port4>; + }; + + port@5 { + reg = <5>; + label = "lan7"; + phy-handle = <&phy_port5>; + }; + }; + }; + }; + }; +}; + +&srab { + compatible = "brcm,bcm58625-srab", "brcm,nsp-srab"; + status = "okay"; + dsa,member = <0 0>; + + ports { + port@0 { + label = "wan1"; + reg = <0>; + }; + + port@1 { + label = "wan2"; + reg = <1>; + }; + + sgmii0: port@4 { + label = "sw0"; + reg = <4>; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + sgmii1: port@5 { + label = "sw1"; + reg = <5>; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + port@8 { + ethernet = <&amac2>; + label = "cpu"; + reg = <8>; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; +}; diff --git a/arch/arm/boot/dts/bcm958625-meraki-mx65.dts b/arch/arm/boot/dts/bcm958625-meraki-mx65.dts new file mode 100644 index 000000000000..aec86c3a4d05 --- /dev/null +++ b/arch/arm/boot/dts/bcm958625-meraki-mx65.dts @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Device Tree Bindings for Cisco Meraki MX65. + * + * Copyright (C) 2021 Matthew Hagan + */ + +/dts-v1/; + +#include "bcm958625-meraki-alamo.dtsi" + +/ { + model = "Cisco Meraki MX65"; + compatible = "meraki,mx65", "brcm,bcm58625", "brcm,nsp"; +}; diff --git a/arch/arm/boot/dts/bcm958625-meraki-mx65w.dts b/arch/arm/boot/dts/bcm958625-meraki-mx65w.dts new file mode 100644 index 000000000000..0045a33055c1 --- /dev/null +++ b/arch/arm/boot/dts/bcm958625-meraki-mx65w.dts @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Device Tree Bindings for Cisco Meraki MX65W. + * + * Copyright (C) 2021 Matthew Hagan + */ + +/dts-v1/; + +#include "bcm958625-meraki-mx65x.dtsi" + +/ { + model = "Cisco Meraki MX65W"; + compatible = "meraki,mx65w", "brcm,bcm58625", "brcm,nsp"; +}; + +&pcie0 { + status = "okay"; +}; + +&pcie1 { + status = "okay"; +};