[PATCH 1/5] ARM: dts: i.MX: Move include "imxXX-pinfunc.h" into "imxXX-pingrp.h"

[PATCH 1/5] ARM: dts: i.MX: Move include "imxXX-pinfunc.h" into "imxXX-pingrp.h"

[Alexander Shiyan]

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>
---
 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 <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 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 <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 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 <dt-bindings/clock/imx5-clock.h>
 
-- 
1.8.3.2

[PATCH 2/5] ARM: dts: imx27-phytec-phycore-rdk: Change pinctrl settings for I2C1

[Alexander Shiyan]

Pullup resistor for I2C1 DATA line on PCM-970 board is missing.
This patch adds internal pullup for local workaround.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
index 2cb9e4b..0903e3a 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
@@ -37,7 +37,11 @@
 &iomuxc {
 	imx27_phycore_rdk {
 		pinctrl_i2c1: i2c1grp {
-			fsl,pins = <MX27_I2C1_PINGRP1>;
+			/* Add pullup to DATA line */
+			fsl,pins = <
+				MX27_PAD_I2C_DATA__I2C_DATA	0x1
+				MX27_PAD_I2C_CLK__I2C_CLK	0x0
+			>;
 		};
 
 		pinctrl_uart1: uart1grp {
-- 
1.8.3.2

[PATCH 3/5] ARM: dts: imx27-phytec-phycore-som: trivial: Typo fix

[Alexander Shiyan]

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/boot/dts/imx27-phytec-phycore-som.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dts b/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
index 3435ce9..ce8d69a 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
@@ -180,7 +180,7 @@
 };
 
 &iomuxc {
-	imx27_phycard_s_som {
+	imx27_phycore_som {
 		pinctrl_fec1: fec1grp {
 			fsl,pins = <MX27_FEC1_PINGRP1>;
 		};
-- 
1.8.3.2

[PATCH 4/5] ARM: dts: imx27-phytec-phycore-som: Add pinctrl for CSPI1 and GPIOs used on module

[Alexander Shiyan]

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/boot/dts/imx27-phytec-phycore-som.dts | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dts b/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
index ce8d69a..7087a4f 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
@@ -51,6 +51,8 @@
 };
 
 &cspi1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_cspi1>;
 	fsl,spi-num-chipselects = <1>;
 	cs-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>;
 	status = "okay";
@@ -181,8 +183,19 @@
 
 &iomuxc {
 	imx27_phycore_som {
+		pinctrl_cspi1: cspi1grp {
+			fsl,pins = <
+				MX27_CSPI1_PINGRP1
+				MX27_PAD_CSPI1_SS0__GPIO4_28	0x0 /* SPI1 CS0 */
+				MX27_PAD_USB_PWR__GPIO2_23	0x0 /* PMIC IRQ */
+			>;
+		};
+
 		pinctrl_fec1: fec1grp {
-			fsl,pins = <MX27_FEC1_PINGRP1>;
+			fsl,pins = <
+				MX27_FEC1_PINGRP1
+				MX27_PAD_SSI3_TXDAT__GPIO3_30	0x0 /* FEC RST */
+			>;
 		};
 
 		pinctrl_i2c2: i2c2grp {
-- 
1.8.3.2

[PATCH 5/5] ARM: dts: imx27-phytec-phycore-som: Rename file to .dtsi

[Alexander Shiyan]

PCM-038 module cannot be used standalone. This patch renames
module file to .dtsi and excludes it from compilation.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/boot/dts/Makefile                                              | 1 -
 arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts                          | 2 +-
 .../dts/{imx27-phytec-phycore-som.dts => imx27-phytec-phycore-som.dtsi} | 0
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename arch/arm/boot/dts/{imx27-phytec-phycore-som.dts => imx27-phytec-phycore-som.dtsi} (100%)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 648c016..88cd3d9 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -124,7 +124,6 @@ dtb-$(CONFIG_ARCH_MXC) += \
 	imx27-apf27.dtb \
 	imx27-apf27dev.dtb \
 	imx27-pdk.dtb \
-	imx27-phytec-phycore-som.dtb \
 	imx27-phytec-phycore-rdk.dtb \
 	imx27-phytec-phycard-s-som.dtb \
 	imx27-phytec-phycard-s-rdk.dtb \
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
index 0903e3a..7ada054 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
@@ -7,7 +7,7 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-#include "imx27-phytec-phycore-som.dts"
+#include "imx27-phytec-phycore-som.dtsi"
 
 / {
 	model = "Phytec pcm970";
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dts b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
similarity index 100%
rename from arch/arm/boot/dts/imx27-phytec-phycore-som.dts
rename to arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
-- 
1.8.3.2