From patchwork Tue Dec 17 01:13:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 3358191 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 72264C0D4A for ; Tue, 17 Dec 2013 01:37:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 729B8202E6 for ; Tue, 17 Dec 2013 01:37:10 +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 47CBD202DD for ; Tue, 17 Dec 2013 01:37:06 +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 1VsjFj-0002W9-U8; Tue, 17 Dec 2013 01:15:17 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VsjEn-0003m7-As; Tue, 17 Dec 2013 01:14:17 +0000 Received: from mail-pa0-f45.google.com ([209.85.220.45]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VsjD9-0003d8-BL for linux-arm-kernel@lists.infradead.org; Tue, 17 Dec 2013 01:12:43 +0000 Received: by mail-pa0-f45.google.com with SMTP id fb1so3704396pad.18 for ; Mon, 16 Dec 2013 17:12:14 -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=+kWk3Ggk34PE8UrUZbxVYiZ1wbs5gdO0kOUrgUG6oSs=; b=hSSfrKsF9WcEPL4mozFw7L1hGUVAuls1zJCRba6aHg/biW7dsJWKV4O2CTvhfKMeIF SeMNn2BjC9cBkt1f/4SjpDo04t9JBqw/yi+viB1TndZNvSjnj+NGJE5SoIoOse42Dre4 Bc31egdeK8rU7l61PUJBvfnZoVOVxxsViNz8KPugrKSOHpziez4NNaDX/PlCAG0DVZZI YK1zsyB6OsAQnjHTCyo90Jq96T+vF19JwnsXySOg2j/lGN7EEp1zOE61OTYZi9GV/NNc PiHwjSUQV1F8e+NPIAM6uvFFF74lxR4Isl1B5wiv5rfzEuB6w9FyCYmnJvB6vr0iE0Ax KMyw== X-Gm-Message-State: ALoCoQmCCKzHBtmbmc5lVMRpxL7Pp5iqebO7V8HrNelsBX+Mwz3Du6vwARMNqBtQiO9pN0AQwF1Q X-Received: by 10.66.226.46 with SMTP id rp14mr23531253pac.133.1387242733965; Mon, 16 Dec 2013 17:12:13 -0800 (PST) Received: from officeserver-2 ([63.226.49.26]) by mx.google.com with ESMTPSA id sy10sm40550168pac.15.2013.12.16.17.12.09 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 16 Dec 2013 17:12:11 -0800 (PST) Received: from tkisky by officeserver-2 with local (Exim 4.80) (envelope-from ) id 1VsjDf-0000PM-46; Mon, 16 Dec 2013 18:13:07 -0700 From: Troy Kisky To: shawn.guo@linaro.org Subject: [PATCH V2 13/13] ARM: dts: imx: add nitrogen6x board Date: Mon, 16 Dec 2013 18:13:03 -0700 Message-Id: <1387242783-1462-14-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1387242783-1462-1-git-send-email-troy.kisky@boundarydevices.com> References: <1387242783-1462-1-git-send-email-troy.kisky@boundarydevices.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131216_201235_580454_13869A38 X-CRM114-Status: GOOD ( 13.35 ) X-Spam-Score: -2.6 (--) 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=-3.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY, URIBL_RHS_DOB autolearn=unavailable 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 --- v2: rebase only --- 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 c55a22d..16f0c5c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -150,6 +150,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 \ @@ -162,6 +163,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 b2711ae..65c9a9b 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. * @@ -92,9 +93,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 = @@ -102,7 +103,7 @@ "Mic Jack", "Mic Bias", "Headphone Jack", "HP_OUT"; mux-int-port = <1>; - mux-ext-port = <4>; + mux-ext-port = <3>; }; backlight_lcd { @@ -148,7 +149,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>; @@ -183,7 +184,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hog>; - imx6q-sabrelite { + imx6q-nitrogen6x { pinctrl_hog: hoggrp { fsl,pins = < /* SGTL5000 sys_mclk */ @@ -204,7 +205,7 @@ }; pinctrl_audmux: audmuxgrp { - fsl,pins = ; + fsl,pins = ; }; pinctrl_ecspi1: ecspi1grp { @@ -232,7 +233,7 @@ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0 MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0 /* Phy reset */ - MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x000b0 + MX6QDL_PAD_ENET_RXD0__GPIO1_IO27 0x000b0 >; }; @@ -279,7 +280,6 @@ fsl,pins = < MX6QDL_USDHC3_PINGRP_D4 MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1b0b0 /* CD */ - MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 /* WP */ >; }; @@ -372,7 +372,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; cd-gpios = <&gpio7 0 0>; - wp-gpios = <&gpio7 1 0>; vmmc-supply = <®_3p3v>; status = "okay"; };