From patchwork Fri Dec 13 01:49:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 3335451 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 756D7C0D4A for ; Fri, 13 Dec 2013 01:53:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5A4CB207B2 for ; Fri, 13 Dec 2013 01:53:54 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 49FC0207AF for ; Fri, 13 Dec 2013 01:53:53 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VrHul-0001xp-CE; Fri, 13 Dec 2013 01:51:41 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VrHtp-0007OH-S1; Fri, 13 Dec 2013 01:50:41 +0000 Received: from mail-pb0-f44.google.com ([209.85.160.44]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VrHs2-0007Dz-Ax for linux-arm-kernel@lists.infradead.org; Fri, 13 Dec 2013 01:48:59 +0000 Received: by mail-pb0-f44.google.com with SMTP id rq2so1584659pbb.3 for ; Thu, 12 Dec 2013 17:48:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZGxKreeEeyGZnATnDSEuxFe+N+Kxu4yHLV5HEpJSzQ4=; b=BNWKTs9RbqKZLEWIEBJeV8Ell5NVXR3PSO1RMjIXM1w9hTPG9mUUJWqaBlnGx6klpY 5RfxTzoQQb9/4vhp6DJNY+p4GU9T5KyifyPV3pfuT9mcGORTT5p+PNwIDz9utpceBS1Q upV9FGRj7lZoAcPjScQi77/py3Yw8xDC5x7lXjARcP51+LkwFxhgFYfMoKUaVfK9Qlc1 Z+zK9lvK9ExZ5psUQF45odxpxvFHo7mCdci2IfaUcbpn7qpCVX9KVWfvCLNxtp8JjH5d FuxF//CuDmrHCGIYf/QDfy6LnQovhB5siLo8ihAC2KLF/E8E7ju70uneOEV1hoKGbQkj Fw0Q== X-Gm-Message-State: ALoCoQkSe5UHASXQX1gsIgy+WG/c6WnELZGNvABg6rdzQ5OLLzhVokxqoG894DNK35s0Kquoxpdi X-Received: by 10.66.150.69 with SMTP id ug5mr1178543pab.55.1386899305505; Thu, 12 Dec 2013 17:48:25 -0800 (PST) Received: from officeserver-2 ([63.226.49.26]) by mx.google.com with ESMTPSA id pa1sm794951pac.17.2013.12.12.17.48.22 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 12 Dec 2013 17:48:23 -0800 (PST) Received: from tkisky by officeserver-2 with local (Exim 4.80) (envelope-from ) id 1VrHsU-0004Xu-J4; Thu, 12 Dec 2013 18:49:18 -0700 From: Troy Kisky To: shawn.guo@linaro.org Subject: [PATCH V1 11/11] ARM: dts: imx: add nitrogen6x board Date: Thu, 12 Dec 2013 18:49:15 -0700 Message-Id: <1386899355-17379-12-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1386899355-17379-1-git-send-email-troy.kisky@boundarydevices.com> References: <1386899355-17379-1-git-send-email-troy.kisky@boundarydevices.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131212_204850_778547_6EFBB0FD X-CRM114-Status: GOOD ( 12.92 ) X-Spam-Score: -1.0 (-) Cc: marex@denx.de, eric.nelson@boundarydevices.com, festevam@gmail.com, linux-arm-kernel@lists.infradead.org, Troy Kisky X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY, URIBL_SBL autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add file imx6q-nitrogen6x.dts, imx6dl-nitrogen6x.dts, imx6qdl-nitrogen6x.dtsi And add board to makefile. Eric Nelson created a web page to show the differences between Nitrogen6x and Sabre Lite boards. http://boundarydevices.com/differences-sabre-lite-nitrogen6x Signed-off-by: Troy Kisky --- arch/arm/boot/dts/Makefile | 2 ++ arch/arm/boot/dts/imx6dl-nitrogen6x.dts | 22 ++++++++++++++++++ arch/arm/boot/dts/imx6q-nitrogen6x.dts | 26 ++++++++++++++++++++++ ...6qdl-sabrelite.dtsi => imx6qdl-nitrogen6x.dtsi} | 17 +++++++------- 4 files changed, 58 insertions(+), 9 deletions(-) create mode 100644 arch/arm/boot/dts/imx6dl-nitrogen6x.dts create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6x.dts copy arch/arm/boot/dts/{imx6qdl-sabrelite.dtsi => imx6qdl-nitrogen6x.dtsi} (95%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 3c6f456..f8fb8d0 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -148,6 +148,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6dl-gw52xx.dtb \ imx6dl-gw53xx.dtb \ imx6dl-gw54xx.dtb \ + imx6dl-nitrogen6x.dtb \ imx6dl-sabreauto.dtb \ imx6dl-sabrelite.dtb \ imx6dl-sabresd.dtb \ @@ -160,6 +161,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6q-gw53xx.dtb \ imx6q-gw5400-a.dtb \ imx6q-gw54xx.dtb \ + imx6q-nitrogen6x.dtb \ imx6q-phytec-pbab01.dtb \ imx6q-sabreauto.dtb \ imx6q-sabrelite.dtb \ diff --git a/arch/arm/boot/dts/imx6dl-nitrogen6x.dts b/arch/arm/boot/dts/imx6dl-nitrogen6x.dts new file mode 100644 index 0000000..89d32f3 --- /dev/null +++ b/arch/arm/boot/dts/imx6dl-nitrogen6x.dts @@ -0,0 +1,22 @@ +/* + * Copyright 2013 Boundary Devices, Inc. + * Copyright 2012 Freescale Semiconductor, Inc. + * Copyright 2011 Linaro Ltd. + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx6dl.dtsi" +#include "imx6qdl-nitrogen6x.dtsi" + +/ { + model = "Freescale i.MX6 DualLite Nitrogen6x Board"; + compatible = "fsl,imx6dl-nitrogen6x", "fsl,imx6dl"; + +}; diff --git a/arch/arm/boot/dts/imx6q-nitrogen6x.dts b/arch/arm/boot/dts/imx6q-nitrogen6x.dts new file mode 100644 index 0000000..5790172 --- /dev/null +++ b/arch/arm/boot/dts/imx6q-nitrogen6x.dts @@ -0,0 +1,26 @@ +/* + * Copyright 2013 Boundary Devices, Inc. + * Copyright 2012 Freescale Semiconductor, Inc. + * Copyright 2011 Linaro Ltd. + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx6q.dtsi" +#include "imx6qdl-nitrogen6x.dtsi" + +/ { + model = "Freescale i.MX6 Quad Nitrogen6x Board"; + compatible = "fsl,imx6q-nitrogen6x", "fsl,imx6q"; + +}; + +&sata { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi similarity index 95% copy from arch/arm/boot/dts/imx6qdl-sabrelite.dtsi copy to arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi index 1a95faf..3e60ba5 100644 --- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi @@ -1,4 +1,5 @@ /* + * Copyright 2013 Boundary Devices, Inc. * Copyright 2011 Freescale Semiconductor, Inc. * Copyright 2011 Linaro Ltd. * @@ -91,9 +92,9 @@ }; sound { - compatible = "fsl,imx6q-sabrelite-sgtl5000", + compatible = "fsl,imx6q-nitrogen6x-sgtl5000", "fsl,imx-audio-sgtl5000"; - model = "imx6q-sabrelite-sgtl5000"; + model = "imx6q-nitrogen6x-sgtl5000"; ssi-controller = <&ssi1>; audio-codec = <&codec>; audio-routing = @@ -101,7 +102,7 @@ "Mic Jack", "Mic Bias", "Headphone Jack", "HP_OUT"; mux-int-port = <1>; - mux-ext-port = <4>; + mux-ext-port = <3>; }; backlight_lcd { @@ -147,7 +148,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii"; - phy-reset-gpios = <&gpio3 23 0>; + phy-reset-gpios = <&gpio1 27 0>; txen-skew-ps = <0>; txc-skew-ps = <3000>; rxdv-skew-ps = <0>; @@ -182,15 +183,14 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hog>; - imx6q-sabrelite { + imx6q-nitrogen6x { pinctrl_hog: hoggrp { fsl,pins = < /* uSDHC4 CD */ MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x1b0b0 /* spi-nor CS */ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x1b0b0 /* otg power en */ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0 -/* ethernet phy reset */ MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x000b0 +/* ethernet phy reset */ MX6QDL_PAD_ENET_RXD0__GPIO1_IO27 0x000b0 /* USDHC3 CD */ MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1b0b0 -/* USDHC3 WP */ MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 /* SGTL5000 sys_mclk */ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x000b0 /* Power Button */ MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x1b0b0 /* Menu Button */ MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x1b0b0 @@ -202,7 +202,7 @@ }; pinctrl_audmux: audmuxgrp { - fsl,pins = ; + fsl,pins = ; }; pinctrl_ecspi1: ecspi1grp { @@ -352,7 +352,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; cd-gpios = <&gpio7 0 0>; - wp-gpios = <&gpio7 1 0>; vmmc-supply = <®_3p3v>; status = "okay"; };