[PATCH 0/5] ARM:dts:imx6:phyflex: dt update

[PATCH 0/5] ARM:dts:imx6:phyflex: dt update

[Christian Hemp]

This series updates the PHYTEC phyFLEX-i.MX6 board.
 - set nodes in correct order
 - enables gpmi in pfla02
 - sets the correct PMIC interrupt
 - add support for PCIe and CAN

Based on branch for-next from Shawn Guo:
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git

Christian Hemp (5):
  ARM:dts:imx6:phyFLEX: set nodes in alphabetical order
  ARM:dts:imx6:phyFLEX: Enable gpmi in module file
  ARM:dts:imx6:phyFLEX: Set correct interrupt for pmic
  ARM:dts:imx6:phyFLEX: Add PCIe
  ARM:dts:imx6:phyFLEX: Add CAN support

 arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi |  8 +++-
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 56 ++++++++++++++++++++--------
 2 files changed, 46 insertions(+), 18 deletions(-)

-- 
1.9.1

[PATCH 1/5] ARM:dts:imx6:phyFLEX: set nodes in alphabetical order

[Christian Hemp]

The gmpi and fec node were not in alphabatical order.

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
---
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 32 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index ab3b1f9..585b823 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -78,6 +78,22 @@
 	};
 };
 
+&fec {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_enet>;
+	phy-mode = "rgmii";
+	phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
+	phy-supply = <&vdd_eth_io_reg>;
+	status = "disabled";
+};
+
+&gpmi {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_gpmi_nand>;
+	nand-on-flash-bbt;
+	status = "disabled";
+};
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_i2c1>;
@@ -337,22 +353,6 @@
 	};
 };
 
-&fec {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_enet>;
-	phy-mode = "rgmii";
-	phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
-	phy-supply = <&vdd_eth_io_reg>;
-	status = "disabled";
-};
-
-&gpmi {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_gpmi_nand>;
-	nand-on-flash-bbt;
-	status = "disabled";
-};
-
 &uart3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_uart3>;
-- 
1.9.1

[PATCH 2/5] ARM:dts:imx6:phyFLEX: Enable gpmi in module file

[Christian Hemp]

The nand is on the module (PFL-A-02) and not on the baseboard (PBA-B-01).

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
---
 arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi | 4 ----
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
index 6b2c892..111b1f5 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
@@ -105,10 +105,6 @@
 	status = "okay";
 };
 
-&gpmi {
-	status = "okay";
-};
-
 &hdmi {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index 585b823..af30653 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -91,7 +91,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_gpmi_nand>;
 	nand-on-flash-bbt;
-	status = "disabled";
+	status = "okay";
 };
 
 &i2c1 {
-- 
1.9.1

[PATCH 3/5] ARM:dts:imx6:phyFLEX: Set correct interrupt for pmic

[Christian Hemp]

The PMIC interrupt was changed from modul revision 1 to 2. Revision 1 was
declared as a prototype and is not in series by any customers.

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
---
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index af30653..8d718b5 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -107,8 +107,8 @@
 	pmic at 58 {
 		compatible = "dlg,da9063";
 		reg = <0x58>;
-		interrupt-parent = <&gpio4>;
-		interrupts = <17 0x8>; /* active-low GPIO4_17 */
+		interrupt-parent = <&gpio2>;
+		interrupts = <9 0x8>; /* active-low GPIO2_9 */
 
 		regulators {
 			vddcore_reg: bcore1 {
@@ -205,7 +205,7 @@
 			fsl,pins = <
 				MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000
 				MX6QDL_PAD_DISP0_DAT3__GPIO4_IO24 0x80000000 /* SPI NOR chipselect */
-				MX6QDL_PAD_DI0_PIN15__GPIO4_IO17  0x80000000 /* PMIC interrupt */
+				MX6QDL_PAD_SD4_DAT1__GPIO2_IO09  0x80000000 /* PMIC interrupt */
 				MX6QDL_PAD_ENET_TXD0__GPIO1_IO30 0x80000000 /* Green LED */
 				MX6QDL_PAD_EIM_EB3__GPIO2_IO31 0x80000000 /* Red LED */
 			>;
-- 
1.9.1

[PATCH 4/5] ARM:dts:imx6:phyFLEX: Add PCIe

[Christian Hemp]

Add PCIe support for Phytec phyFLEX-i.MX6 (PFL-A-02 and PBA-B-01).

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
---
 arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi |  4 ++++
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
index 111b1f5..7634cc1 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
@@ -144,6 +144,10 @@
 	status = "okay";
 };
 
+&pcie {
+	status = "okay";
+};
+
 &ssi2 {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index 8d718b5..2d72109 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -283,6 +283,10 @@
 			>;
 		};
 
+		pinctrl_pcie: pciegrp {
+			fsl,pins = <MX6QDL_PAD_DI0_PIN15__GPIO4_IO17  0x80000000>;
+		};
+
 		pinctrl_uart3: uart3grp {
 			fsl,pins = <
 				MX6QDL_PAD_EIM_D24__UART3_TX_DATA	0x1b0b1
@@ -353,6 +357,13 @@
 	};
 };
 
+&pcie {
+	pinctrl-name = "default";
+	pinctrl-0 = <&pinctrl_pcie>;
+	reset-gpio = <&gpio4 17 0>;
+	status = "disabled";
+};
+
 &uart3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_uart3>;
-- 
1.9.1

[PATCH 5/5] ARM:dts:imx6:phyFLEX: Add CAN support

[Christian Hemp]

Add CAN support for Phytec phyFLEX-i.MX6 (PFL-A-02 and PBA-B-01).

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
---
 arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi |  4 ++++
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
index 7634cc1..585b4f6 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
@@ -101,6 +101,10 @@
 	};
 };
 
+&can1 {
+	status = "okay";
+};
+
 &fec {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index 2d72109..19cc269 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -64,6 +64,12 @@
 	status = "disabled";
 };
 
+&can1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_flexcan1>;
+	status = "disabled";
+};
+
 &ecspi3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_ecspi3>;
@@ -240,6 +246,13 @@
 			>;
 		};
 
+		pinctrl_flexcan1: flexcan1grp {
+			fsl,pins = <
+				MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX	0x1b0b0
+				MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX	0x1b0b0
+			>;
+		};
+
 		pinctrl_gpmi_nand: gpminandgrp {
 			fsl,pins = <
 				MX6QDL_PAD_NANDF_CLE__NAND_CLE		0xb0b1
-- 
1.9.1

[PATCH 2/5] ARM:dts:imx6:phyFLEX: Enable gpmi in module file

[Arnd Bergmann]

On Friday 14 November 2014 14:32:23 Christian Hemp wrote:
> --- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
> @@ -91,7 +91,7 @@
>         pinctrl-names = "default";
>         pinctrl-0 = <&pinctrl_gpmi_nand>;
>         nand-on-flash-bbt;
> -       status = "disabled";
> +       status = "okay";
>  };
> 

No need for the property unless you are overriding a 'status="disabled"'
from another file. Just remove this property here.

	Arnd

[PATCH 2/5] ARM:dts:imx6:phyFLEX: Enable gpmi in module file

[Christian Hemp]

Hello Arnd,

Am Freitag, 14. November 2014, 15:55:11 schrieb Arnd Bergmann:
> On Friday 14 November 2014 14:32:23 Christian Hemp wrote:
> > --- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
> > +++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
> > @@ -91,7 +91,7 @@
> > 
> >         pinctrl-names = "default";
> >         pinctrl-0 = <&pinctrl_gpmi_nand>;
> >         nand-on-flash-bbt;
> > 
> > -       status = "disabled";
> > +       status = "okay";
> > 
> >  };
> 
> No need for the property unless you are overriding a 'status="disabled"'
> from another file. Just remove this property here.

the status is disabled in 'arch/arm/boot/dts/imx6qdl.dtsi'. 
That why I enabled it in the 'arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi'.

	Christian

> 
> 	Arnd

[PATCH 2/5] ARM:dts:imx6:phyFLEX: Enable gpmi in module file

[Arnd Bergmann]

On Monday 17 November 2014 09:27:37 Christian Hemp wrote:
> Am Freitag, 14. November 2014, 15:55:11 schrieb Arnd Bergmann:
> > On Friday 14 November 2014 14:32:23 Christian Hemp wrote:
> > > --- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
> > > +++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
> > > @@ -91,7 +91,7 @@
> > > 
> > >         pinctrl-names = "default";
> > >         pinctrl-0 = <&pinctrl_gpmi_nand>;
> > >         nand-on-flash-bbt;
> > > 
> > > -       status = "disabled";
> > > +       status = "okay";
> > > 
> > >  };
> > 
> > No need for the property unless you are overriding a 'status="disabled"'
> > from another file. Just remove this property here.
> 
> the status is disabled in 'arch/arm/boot/dts/imx6qdl.dtsi'. 
> That why I enabled it in the 'arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi'.
> 

Ok, makes sense. Thanks for the clarification.

	Arnd

[PATCH 0/5] ARM:dts:imx6:phyflex: dt update

[Shawn Guo]

On Fri, Nov 14, 2014 at 02:32:21PM +0100, Christian Hemp wrote:
> This series updates the PHYTEC phyFLEX-i.MX6 board.
>  - set nodes in correct order
>  - enables gpmi in pfla02
>  - sets the correct PMIC interrupt
>  - add support for PCIe and CAN
> 
> Based on branch for-next from Shawn Guo:
> git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
> 
> Christian Hemp (5):
>   ARM:dts:imx6:phyFLEX: set nodes in alphabetical order
>   ARM:dts:imx6:phyFLEX: Enable gpmi in module file
>   ARM:dts:imx6:phyFLEX: Set correct interrupt for pmic
>   ARM:dts:imx6:phyFLEX: Add PCIe
>   ARM:dts:imx6:phyFLEX: Add CAN support

Applied all, thanks.