From e49f32c3b841d7b5f204539ae674b41254d5c309 Mon Sep 17 00:00:00 2001
From: Alexander Shiyan <shc_work@mail.ru>
Date: Sat, 7 Dec 2013 12:26:32 +0400
Subject: [PATCH] ARM: dts: i.MX: Move include "imxXX-pinfunc.h" into
 "imxXX-pingrp.h"

Pin function definitions are used for pin groups definitions,
so move the header in the correspond "imxXX-pingrp.h".

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 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 16c7a19150f1..4a35a630c933 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 1a86eabeeecb..9e9e3b8a690b 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 d46b7e0e6e36..0f4ce8ca3bd8 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 fd3a50a25622..01c0499010d7 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 <dt-bindings/clock/imx5-clock.h>
 
diff --git a/arch/arm/boot/dts/imx51-pingrp.h b/arch/arm/boot/dts/imx51-pingrp.h
index 550d0d1120f7..f63267b2a1e6 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 db828ab1f5e4..3291e553c4fd 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 <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/clock/imx5-clock.h>
diff --git a/arch/arm/boot/dts/imx53-pingrp.h b/arch/arm/boot/dts/imx53-pingrp.h
index 561bc1bee33d..ac8e73dfe799 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 4b2053b585d1..90359da564ce 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 <dt-bindings/clock/imx5-clock.h>
 
-- 
2.39.5