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>

diff --git a/arch/arm/boot/dts/imx25-pingrp.h b/arch/arm/boot/dts/imx25-pingrp.h
index 16c7a19150f191c79ef44bd717126cb098f1bb61..4a35a630c9337efe4338049c694a0d9ad2a90a9c 100644 (file)
--- 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 1a86eabeeecb9c3f2b2e9ba277b2a0193fc1b388..9e9e3b8a690b913cf46ba8edda925561847f8a29 100644 (file)
--- 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 d46b7e0e6e36dad6531a56f3765e3d2dbee1b2c8..0f4ce8ca3bd88f4397e7ff3c05019cf9db1386e0 100644 (file)
--- 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 fd3a50a25622423df86eef5af9f650ba139ac7d0..01c0499010d737e804be1475f6430fc1f4035ebb 100644 (file)
--- 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 550d0d1120f7b31ce4baef62f40440ab749e93c2..f63267b2a1e6d112998fc5fe7c3d24e5e9bda60b 100644 (file)
--- 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 db828ab1f5e4b5169fbd9a91b5582fcadbc4229c..3291e553c4fd2639066ed80903371731ad40088e 100644 (file)
--- 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 561bc1bee33d7a10c25f9f7fbe5e78122eee291e..ac8e73dfe7995ba02d5ab61f9ae76b63060980df 100644 (file)
--- 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 4b2053b585d1c8cef9d37e596fa99ef4cc1938b5..90359da564ce183e3f3bf13760bc15e7b14f6c43 100644 (file)
--- 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>