From patchwork Sat Dec 7 08:26:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 3304821 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 E60C0C0D4A for ; Sat, 7 Dec 2013 08:29:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 07F6F203E6 for ; Sat, 7 Dec 2013 08:29: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 036A9203E5 for ; Sat, 7 Dec 2013 08:29: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 1VpDFH-00057F-LI; Sat, 07 Dec 2013 08:28:16 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VpDEs-000463-9x; Sat, 07 Dec 2013 08:27:50 +0000 Received: from smtp37.i.mail.ru ([94.100.177.97]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VpDEG-000427-Is for linux-arm-kernel@lists.infradead.org; Sat, 07 Dec 2013 08:27:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2; h=Message-Id:Date:Subject:Cc:To:From; bh=N2oMMzstGNeBCsGrdbQnvCIhF8IRDoScYorRLSb76Q0=; b=MRUMNqy9DYTQ5v38O9C6tqWrxeLhj7A0d4oG0AKam3gnyyhK7rXS8vY9bYQcKdtFpMVYPH7cy4MJH/O4LMK2rwiY/8i5Yy/uOsWNFRL9e9Kj8JtF7b+O7/XgDlkkerYSU9ptx2hmLb5xBxkC76teUHIMomlHfWL7n4hDhZMnaF8=; Received: from [188.134.40.128] (port=47226 helo=shc.zet) by smtp37.i.mail.ru with esmtpa (envelope-from ) id 1VpDDs-0003pK-Pw; Sat, 07 Dec 2013 12:26:49 +0400 From: Alexander Shiyan To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/5] ARM: dts: i.MX: Move include "imxXX-pinfunc.h" into "imxXX-pingrp.h" Date: Sat, 7 Dec 2013 12:26:32 +0400 Message-Id: <1386404796-8848-1-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 1.8.3.2 X-Mras: Ok X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131207_032713_100026_3B0B24CA X-CRM114-Status: UNSURE ( 6.67 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) Cc: Shawn Guo , Alexander Shiyan , Sascha Hauer 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.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,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 Pin function definitions are used for pin groups definitions, so move the header in the correspond "imxXX-pingrp.h". Signed-off-by: Alexander Shiyan --- arch/arm/boot/dts/imx25-pingrp.h | 2 ++ arch/arm/boot/dts/imx25.dtsi | 1 - arch/arm/boot/dts/imx50-pingrp.h | 2 ++ arch/arm/boot/dts/imx50.dtsi | 1 - arch/arm/boot/dts/imx51-pingrp.h | 2 ++ arch/arm/boot/dts/imx51.dtsi | 1 - arch/arm/boot/dts/imx53-pingrp.h | 2 ++ arch/arm/boot/dts/imx53.dtsi | 1 - 8 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/imx25-pingrp.h b/arch/arm/boot/dts/imx25-pingrp.h index 16c7a19..4a35a63 100644 --- a/arch/arm/boot/dts/imx25-pingrp.h +++ b/arch/arm/boot/dts/imx25-pingrp.h @@ -10,6 +10,8 @@ #ifndef __DTS_IMX25_PINGRP_H #define __DTS_IMX25_PINGRP_H +#include "imx25-pinfunc.h" + #define MX25_AUDMUX_PINGRP1 \ MX25_PAD_KPP_COL3__AUD5_TXFS 0xe0 \ MX25_PAD_KPP_COL2__AUD5_TXC 0xe0 \ diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi index 1a86eab..9e9e3b8 100644 --- a/arch/arm/boot/dts/imx25.dtsi +++ b/arch/arm/boot/dts/imx25.dtsi @@ -10,7 +10,6 @@ */ #include "skeleton.dtsi" -#include "imx25-pinfunc.h" #include "imx25-pingrp.h" / { diff --git a/arch/arm/boot/dts/imx50-pingrp.h b/arch/arm/boot/dts/imx50-pingrp.h index d46b7e0..0f4ce8c 100644 --- a/arch/arm/boot/dts/imx50-pingrp.h +++ b/arch/arm/boot/dts/imx50-pingrp.h @@ -10,6 +10,8 @@ #ifndef __DTS_IMX50_PINGRP_H #define __DTS_IMX50_PINGRP_H +#include "imx50-pinfunc.h" + #define MX50_CSPI_PINGRP1 \ MX50_PAD_CSPI_SCLK__CSPI_SCLK 0x00 \ MX50_PAD_CSPI_MISO__CSPI_MISO 0x00 \ diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi index fd3a50a..01c0499 100644 --- a/arch/arm/boot/dts/imx50.dtsi +++ b/arch/arm/boot/dts/imx50.dtsi @@ -12,7 +12,6 @@ */ #include "skeleton.dtsi" -#include "imx50-pinfunc.h" #include "imx50-pingrp.h" #include diff --git a/arch/arm/boot/dts/imx51-pingrp.h b/arch/arm/boot/dts/imx51-pingrp.h index 550d0d1..f63267b 100644 --- a/arch/arm/boot/dts/imx51-pingrp.h +++ b/arch/arm/boot/dts/imx51-pingrp.h @@ -10,6 +10,8 @@ #ifndef __DTS_IMX51_PINGRP_H #define __DTS_IMX51_PINGRP_H +#include "imx51-pinfunc.h" + #define MX51_AUDMUX_PINGRP1 \ MX51_PAD_AUD3_BB_TXD__AUD3_TXD 0x80000000 \ MX51_PAD_AUD3_BB_RXD__AUD3_RXD 0x80000000 \ diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index cad5a56..61a2552 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi @@ -11,7 +11,6 @@ */ #include "skeleton.dtsi" -#include "imx51-pinfunc.h" #include "imx51-pingrp.h" #include #include diff --git a/arch/arm/boot/dts/imx53-pingrp.h b/arch/arm/boot/dts/imx53-pingrp.h index 561bc1b..ac8e73d 100644 --- a/arch/arm/boot/dts/imx53-pingrp.h +++ b/arch/arm/boot/dts/imx53-pingrp.h @@ -10,6 +10,8 @@ #ifndef __DTS_IMX53_PINGRP_H #define __DTS_IMX53_PINGRP_H +#include "imx53-pinfunc.h" + #define MX53_AUDMUX_PINGRP1 \ MX53_PAD_KEY_COL0__AUDMUX_AUD5_TXC 0x80000000 \ MX53_PAD_KEY_ROW0__AUDMUX_AUD5_TXD 0x80000000 \ diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi index 885dbbd..175a94c 100644 --- a/arch/arm/boot/dts/imx53.dtsi +++ b/arch/arm/boot/dts/imx53.dtsi @@ -11,7 +11,6 @@ */ #include "skeleton.dtsi" -#include "imx53-pinfunc.h" #include "imx53-pingrp.h" #include