From patchwork Tue May 22 18:55:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Branden X-Patchwork-Id: 10419407 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 66A4260224 for ; Tue, 22 May 2018 18:56:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5552C28F67 for ; Tue, 22 May 2018 18:56:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 499D029015; Tue, 22 May 2018 18:56:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B6AE128F67 for ; Tue, 22 May 2018 18:56:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=hUPu/tnX0dzk6Mi7Tpz26KkHSwsIMCbuZgiAyvEk0mM=; b=ls2 b768RN9zQNOBDsO9XknAFP9JVgEYe36hTKpSkPI6MQImpqb+4CZsVMJOLoesVtVHzhkTRmFR4G1Ta OjSp6kMCAUP43ZfiQF+ydTCdohOnP0Rw0hZ/NDMXjK7kwO7ruPxgabrClQ2onZ58Sa0aOKfBamPMO f4tRdWym3u9MxxmjtODaHtXOW0YLHWoD7LuAlIgBugBzsbotmSFGzFDQbNU+C7HoXKY+w0kNAAj/q m4nWwAwhNJSOmpSF3xFbkb5HHFKgPupKi7u5A4LbsLF+Ygs/Is5ack2QevKU2UbN0g2sXXBe2dKBA PAk3gFDx24u3PUfC7urBIfeR6Cvuh4w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fLCSK-0006tx-Gk; Tue, 22 May 2018 18:56:20 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fLCSH-0006tD-KH for linux-arm-kernel@lists.infradead.org; Tue, 22 May 2018 18:56:19 +0000 Received: by mail-wm0-x243.google.com with SMTP id f6-v6so2464917wmc.4 for ; Tue, 22 May 2018 11:56:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id; bh=Vqij6/tL4g64sOH2vVBVRBIq1deHLWZB57To7r4ikPk=; b=FTcRnMVcKe4cuJI1wYDkLFZ5vRwesbg+BSbxjy2Cb9YjJiflKauZTgtr43N/Ps24fw rOPgwshNDUpbjNVIDO3KXPA/mLd+kM4V/aemYGvbMKRb55A8eVKIqRT+DDhVC6IPZ1M1 9FFBOzD7AqGFOYC4x/hufWCbTdX562WcJLlWs= 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; bh=Vqij6/tL4g64sOH2vVBVRBIq1deHLWZB57To7r4ikPk=; b=FCo32kzo6j4yxCgf0mM/5K6K0nvTi74gCVX4/oXO59+ygT8A47F583zqr+iGnTtYqd +3kC7zkc4Kac0t/KZaIKxHQOLbxGigSC9GcLug8QtHKiaqhiGmTdeQ4MKFA+MTeGbJTZ ZTg0noQO40Jt7nU+KJxDBwJAkW9lpbccJ0CkkQqtM9CY94Kkj2sZBs8c2sYQmFOUtJZo DD715UQJEr115KmdN6Clu9/hNCfe+N5TDVf+pfM/fpTOHGqFB4OuACCAPtbKaYfJF54Z KaeK5rwGUXqI5sLFynlhJU1OxJwdJSeZmkuI4Rv0RzDu9bBIfK0K+izM63QWAEFaivuv KUqA== X-Gm-Message-State: ALKqPwf+7KKKfohDGMPU6knYwzB389aQ3QxgVnQcrTaD48HHNBhtiIrR Sfx/nvPsyqlnm51Xd/FV6gtQNQ== X-Google-Smtp-Source: AB8JxZp0sIh7gZ2HLRAx2ZDqZ+GyHsap1ovhEE5KkVkEHPUqOBaBObyhlWlr8r0lE88PA3NuBtTfTw== X-Received: by 2002:a50:8b26:: with SMTP id l35-v6mr3713324edl.224.1527015366020; Tue, 22 May 2018 11:56:06 -0700 (PDT) Received: from lbrmn-lnxub113.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id d18-v6sm9160526edb.97.2018.05.22.11.56.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 11:56:04 -0700 (PDT) From: Scott Branden To: Rob Herring , Mark Rutland , Catalin Marinas , Will Deacon , Florian Fainelli Subject: [PATCH] arm64: dts: stingray: move common board components to stingray-board-base Date: Tue, 22 May 2018 11:55:42 -0700 Message-Id: <1527015342-9317-1-git-send-email-scott.branden@broadcom.com> X-Mailer: git-send-email 2.5.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180522_115617_668720_24EA5C83 X-CRM114-Status: GOOD ( 16.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, BCM Kernel Feedback , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Scott Branden MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Move common board components from base bcm958742 dtsi file to new stingray-board-base dtsi file so they can be shared between many stingray boards following common design. Signed-off-by: Scott Branden --- .../boot/dts/broadcom/stingray/bcm958742-base.dtsi | 35 +-------------- .../dts/broadcom/stingray/stingray-board-base.dtsi | 51 ++++++++++++++++++++++ 2 files changed, 52 insertions(+), 34 deletions(-) create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-board-base.dtsi diff --git a/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi b/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi index cacc25e..d74f6df 100644 --- a/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi +++ b/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi @@ -30,20 +30,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "stingray.dtsi" +#include "stingray-board-base.dtsi" / { - chosen { - stdout-path = "serial0:115200n8"; - }; - - aliases { - serial0 = &uart1; - serial1 = &uart0; - serial2 = &uart2; - serial3 = &uart3; - }; - sdio0_vddo_ctrl_reg: sdio0_vddo_ctrl { compatible = "regulator-gpio"; regulator-name = "sdio0_vddo_ctrl_reg"; @@ -67,23 +56,6 @@ }; }; -&memory { /* Default DRAM banks */ - reg = <0x00000000 0x80000000 0x0 0x80000000>, /* 2G @ 2G */ - <0x00000008 0x80000000 0x1 0x80000000>; /* 6G @ 34G */ -}; - -&mdio_mux_iproc { - mdio@10 { - gphy0: eth-phy@10 { - reg = <0x10>; - }; - }; -}; - -&uart1 { - status = "okay"; -}; - &pwm { status = "okay"; }; @@ -111,8 +83,6 @@ }; &enet { - phy-mode = "rgmii-id"; - phy-handle = <&gphy0>; status = "okay"; }; @@ -133,13 +103,10 @@ &sdio0 { vqmmc-supply = <&sdio0_vddo_ctrl_reg>; - non-removable; - full-pwr-cycle; status = "okay"; }; &sdio1 { vqmmc-supply = <&sdio1_vddo_ctrl_reg>; - full-pwr-cycle; status = "okay"; }; diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray-board-base.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray-board-base.dtsi new file mode 100644 index 0000000..82a2471 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray-board-base.dtsi @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: (GPL-2.0 or BSD-3-Clause) +/* + * Copyright(c) 2016-2018 Broadcom + */ + +#include "stingray.dtsi" +#include + +/ { + aliases { + serial0 = &uart1; + serial1 = &uart0; + serial2 = &uart2; + serial3 = &uart3; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&memory { /* Default DRAM banks */ + reg = <0x00000000 0x80000000 0x0 0x80000000>, /* 2G @ 2G */ + <0x00000008 0x80000000 0x1 0x80000000>; /* 6G @ 34G */ +}; + +&enet { + phy-mode = "rgmii-id"; + phy-handle = <&gphy0>; +}; + +&uart1 { + status = "okay"; +}; + +&sdio0 { + non-removable; + full-pwr-cycle; +}; + +&sdio1 { + full-pwr-cycle; +}; + +&mdio_mux_iproc { + mdio@10 { + gphy0: eth-phy@10 { + reg = <0x10>; + }; + }; +};