From patchwork Tue Jan 21 16:13:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Grinberg X-Patchwork-Id: 3519071 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DFADA9F2E9 for ; Tue, 21 Jan 2014 16:56:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E2D2C20149 for ; Tue, 21 Jan 2014 16:56:24 +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 A701920122 for ; Tue, 21 Jan 2014 16:56:23 +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 1W5ecZ-0008Ug-1u; Tue, 21 Jan 2014 16:56:15 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W5dy3-0002Hj-Nx; Tue, 21 Jan 2014 16:14:23 +0000 Received: from softlayer.compulab.co.il ([50.23.254.55] helo=compulab.co.il) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W5dy0-0002Fp-Cl for linux-arm-kernel@lists.infradead.org; Tue, 21 Jan 2014 16:14:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=compulab.co.il; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=eDjDz2naZlUdH+hWcEOxzDfpfrAJvMCL1oWnrNQpwC8=; b=sRPCLmvDcqws09/zLgspC5mBWtwr6D+1B1/D9b/JukKjNHP+n/QE2Q0mtqTu9IUEZ9hI8M3eYCuDf6/hSq3S8fyq/NklM2RLfSExBmdpIU3IqkWqrkrgKPKCVF+h7jnZm17dkyzt+TSMPMMevSIi2aSBqfZcvjY7v//AxpzZg8U=; Received: from [82.166.188.245] (port=62977 helo=zimbra-mta.compulab.co.il) by softlayer.compulab.co.il with esmtp (Exim 4.80.1) (envelope-from ) id 1W5dxa-0001j6-Q2; Tue, 21 Jan 2014 18:13:55 +0200 Received: from localhost (localhost.localdomain [127.0.0.1]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id CA4E264419F; Tue, 21 Jan 2014 18:13:53 +0200 (IST) X-Virus-Scanned: amavisd-new at compulab.co.il Received: from zimbra-mta.compulab.co.il ([127.0.0.1]) by localhost (zimbra-mta.compulab.co.il [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2Yutt3rpRpHJ; Tue, 21 Jan 2014 18:13:52 +0200 (IST) Received: from compulab.co.il (grinberg-pc.compulab.local [10.1.1.13]) by zimbra-mta.compulab.co.il (Postfix) with SMTP id EA1CA644195; Tue, 21 Jan 2014 18:13:52 +0200 (IST) Received: (nullmailer pid 25139 invoked by uid 1000); Tue, 21 Jan 2014 16:13:41 -0000 From: Igor Grinberg To: Shawn Guo Subject: [PATCH 1/4] ARM: dts: cm-fx6: rearrange the dts file Date: Tue, 21 Jan 2014 18:13:29 +0200 Message-Id: <1390320812-25100-2-git-send-email-grinberg@compulab.co.il> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1390320812-25100-1-git-send-email-grinberg@compulab.co.il> References: <1390320812-25100-1-git-send-email-grinberg@compulab.co.il> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - softlayer.compulab.co.il X-AntiAbuse: Original Domain - lists.infradead.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - compulab.co.il X-Get-Message-Sender-Via: softlayer.compulab.co.il: acl_c_relayhosts_text_entry: grinberg@compulab.co.il|compulab.co.il X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140121_111420_561208_7389E38E X-CRM114-Status: UNSURE ( 7.31 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.3 (--) Cc: Mark Rutland , devicetree@vger.kernel.org, Pawel Moll , Ian Campbell , Rob Herring , Igor Grinberg , Sascha Hauer , Kumar Gala , linux-arm-kernel@lists.infradead.org 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=-4.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY 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 Move the iomuxc definition before the devices definitions (e.g. gpmi, fec). Signed-off-by: Igor Grinberg --- arch/arm/boot/dts/imx6q-cm-fx6.dts | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts index 1a8ee79..94cc6b5 100644 --- a/arch/arm/boot/dts/imx6q-cm-fx6.dts +++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts @@ -31,19 +31,8 @@ linux,default-trigger = "heartbeat"; }; }; -}; -&fec { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_enet>; - phy-mode = "rgmii"; - status = "okay"; -}; -&gpmi { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpmi_nand>; - status = "okay"; }; &iomuxc { @@ -62,6 +51,19 @@ }; }; +&fec { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enet>; + phy-mode = "rgmii"; + status = "okay"; +}; + +&gpmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpmi_nand>; + status = "okay"; +}; + &uart4 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart4>;