From patchwork Tue Dec 27 17:58:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Nelson X-Patchwork-Id: 9489769 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 1786F62AAF for ; Tue, 27 Dec 2016 18:01:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EF1A2094F for ; Tue, 27 Dec 2016 18:01:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0398225E13; Tue, 27 Dec 2016 18:01:03 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8EC2A2094F for ; Tue, 27 Dec 2016 18:01:02 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cLw2I-0000JG-W4; Tue, 27 Dec 2016 17:59:43 +0000 Received: from mail-io0-x243.google.com ([2607:f8b0:4001:c06::243]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cLw1p-0008VV-LX for linux-arm-kernel@lists.infradead.org; Tue, 27 Dec 2016 17:59:16 +0000 Received: by mail-io0-x243.google.com with SMTP id f73so41316329ioe.2 for ; Tue, 27 Dec 2016 09:58:53 -0800 (PST) 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; bh=PZQgfwbPsaEc3vmXFEWwoLw9T8Pm4pnhgkKranbOZJc=; b=PO6k04Iz1OpxhhHr3c+NGICKQCkO5DLfJEVYDYrciLi1ul1aYXSUIRqFE6J7XqWO5T YhL1WdibnbEN2B2mqbpcMDcOqljWXI233cMRdexweePefUXrZb7lwQyDnsLuIN5TMxzz hODGbx72peAvzxumKzNKqIx4SfA/nMOnToKPNYb7eXvV7Z0DgZK4uefiRoyeLVdwulLh ILKq4pAvlDjAEs6EOKiRCC7rrRNfpoM2M2JHJc8vMcOGnFHJ6rtTOVQ1jkETOOJla1e5 67r/7ALhotThsOB8yhqiWLqGFKF5hAaCzNCgNqAsc4jWl+6b9Lg3hXKqKIWiYzyh40a8 bvfg== 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; bh=PZQgfwbPsaEc3vmXFEWwoLw9T8Pm4pnhgkKranbOZJc=; b=bb8iHcwJ12fIeKvQfdJijviRsiEpwBUdo5mdFnmDFRZK06E919TA2qp/zmE/ojQyN+ L9KYZePOI1+5IXQpSEviNFji/QAhFhUEbVAl3auam0k3bih9uI2IIqj/cDGXIRmoGK3K dWiI0U0B0+mL6GyPpCPx5DEuIY9AQBZi3CSUVFb7pfUnvN/yXhIP5MOYnFP8CeYNtlOz HRNvipqmuQTgd++sfBsUKKV0cZLvbloF2uiP69Ch6Gcvez7U+vAKtA/XVXWWjoreWB0W Tb9l2aU0O5etL15S7vh+X7cDAX+ewwGLTvsSsorn1ur3ZDQ/uTZDQD+fprAIo4oq29DV B2pA== X-Gm-Message-State: AIkVDXLg63t7goqnUpxR3wnlJCRPW23qGoxNcLOIWkeTyIIDku6Dz+5AoBQNufOhVBL16g== X-Received: by 10.107.147.9 with SMTP id v9mr29179376iod.110.1482861532594; Tue, 27 Dec 2016 09:58:52 -0800 (PST) Received: from localhost.localdomain ([64.77.213.245]) by smtp.gmail.com with ESMTPSA id u63sm8445860ita.1.2016.12.27.09.58.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Dec 2016 09:58:51 -0800 (PST) From: Robert Nelson To: tony@atomide.com Subject: [PATCH 3/4] ARM: dts: Move most of am335x-bonegreen.dts to am335x-bonegreen-common.dtsi Date: Tue, 27 Dec 2016 11:58:36 -0600 Message-Id: <20161227175837.28970-3-robertcnelson@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161227175837.28970-1-robertcnelson@gmail.com> References: <20161227175837.28970-1-robertcnelson@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161227_095913_982324_E0EA47AA X-CRM114-Status: GOOD ( 15.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-omap@vger.kernel.org, Robert Nelson , linux-arm-kernel@lists.infradead.org, Jason Kridner 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 This is going to be shared with the SeeedStudio BeagleBone Green Wireless Signed-off-by: Robert Nelson CC: Tony Lindgren CC: Jason Kridner --- arch/arm/boot/dts/am335x-bonegreen-common.dtsi | 44 ++++++++++++++++++++++++++ arch/arm/boot/dts/am335x-bonegreen.dts | 38 +--------------------- 2 files changed, 45 insertions(+), 37 deletions(-) create mode 100644 arch/arm/boot/dts/am335x-bonegreen-common.dtsi diff --git a/arch/arm/boot/dts/am335x-bonegreen-common.dtsi b/arch/arm/boot/dts/am335x-bonegreen-common.dtsi new file mode 100644 index 000000000000..853e6d3a028d --- /dev/null +++ b/arch/arm/boot/dts/am335x-bonegreen-common.dtsi @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +&ldo3_reg { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; +}; + +&mmc1 { + vmmc-supply = <&vmmcsd_fixed>; +}; + +&mmc2 { + vmmc-supply = <&vmmcsd_fixed>; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_pins>; + bus-width = <8>; + status = "okay"; +}; + +&am33xx_pinmux { + uart2_pins: uart2_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x950, PIN_INPUT | MUX_MODE1) /* spi0_sclk.uart2_rxd */ + AM33XX_IOPAD(0x954, PIN_OUTPUT | MUX_MODE1) /* spi0_d0.uart2_txd */ + >; + }; +}; + +&uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&uart2_pins>; + status = "okay"; +}; + +&rtc { + system-power-controller; +}; diff --git a/arch/arm/boot/dts/am335x-bonegreen.dts b/arch/arm/boot/dts/am335x-bonegreen.dts index dce3c8657e04..a8b4d969ce2a 100644 --- a/arch/arm/boot/dts/am335x-bonegreen.dts +++ b/arch/arm/boot/dts/am335x-bonegreen.dts @@ -9,45 +9,9 @@ #include "am33xx.dtsi" #include "am335x-bone-common.dtsi" +#include "am335x-bonegreen-common.dtsi" / { model = "TI AM335x BeagleBone Green"; compatible = "ti,am335x-bone-green", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; }; - -&ldo3_reg { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; -}; - -&mmc1 { - vmmc-supply = <&vmmcsd_fixed>; -}; - -&mmc2 { - vmmc-supply = <&vmmcsd_fixed>; - pinctrl-names = "default"; - pinctrl-0 = <&emmc_pins>; - bus-width = <8>; - status = "okay"; -}; - -&am33xx_pinmux { - uart2_pins: uart2_pins { - pinctrl-single,pins = < - AM33XX_IOPAD(0x950, PIN_INPUT | MUX_MODE1) /* spi0_sclk.uart2_rxd */ - AM33XX_IOPAD(0x954, PIN_OUTPUT | MUX_MODE1) /* spi0_d0.uart2_txd */ - >; - }; -}; - -&uart2 { - pinctrl-names = "default"; - pinctrl-0 = <&uart2_pins>; - status = "okay"; -}; - -&rtc { - system-power-controller; -};