[PATCH 0/2] Add devicetree for TQMA53 embedded module

[PATCH 0/2] Add devicetree for TQMA53 embedded module

[Steffen Trumtrar]

Hi!

This series adds devicetree support for the TQMA53 embedded module.
As this module can't operate without a base board, most devices are
disabled in the DT and would have to be enabled in an extra .dts, that
includes the imx53-tqma53.dtsi.

Also, add the missing pinctrl groups to the imx53.dtsi.

The base for this patches is 3.8-rc2.

Regards,
Steffen


Sascha Hauer (1):
  ARM i.MX53: add dts for the TQ tqma53 module

Steffen Trumtrar (1):
  ARM: dts: imx53: pinctrl update

 arch/arm/boot/dts/imx53-tqma53.dtsi |  207 +++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/imx53.dtsi        |   53 +++++++++
 2 files changed, 260 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx53-tqma53.dtsi

-- 
1.7.10.4

[PATCH 1/2] ARM: dts: imx53: pinctrl update

[Steffen Trumtrar]

Add pinctrl for cspi, csi.
Add new pingroups for can1 and uart3.

Signed-off-by: Steffen Trumtrar <s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
---
 arch/arm/boot/dts/imx53.dtsi |   53 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 552aed4..160c24a 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -274,6 +274,44 @@
 					};
 				};
 
+				csi {
+					pinctrl_csi_1: csigrp-1 {
+						fsl,pins = <
+							286 0x1d5	/* MX53_PAD_CSI0_DATA_EN__IPU_CSI0_DATA_EN */
+							291 0x1d5	/* MX53_PAD_CSI0_VSYNC__IPU_CSI0_VSYNC */
+							280 0x1d5	/* MX53_PAD_CSI0_MCLK__IPU_CSI0_HSYNC */
+							276 0x1d5	/* MX53_PAD_CSI0_PIXCLK__IPU_CSI0_PIXCLK */
+							409 0x1d5	/* MX53_PAD_CSI0_DAT19__IPU_CSI0_D_19 */
+							402 0x1d5	/* MX53_PAD_CSI0_DAT18__IPU_CSI0_D_18 */
+							395 0x1d5	/* MX53_PAD_CSI0_DAT17__IPU_CSI0_D_17 */
+							388 0x1d5	/* MX53_PAD_CSI0_DAT16__IPU_CSI0_D_16 */
+							381 0x1d5	/* MX53_PAD_CSI0_DAT15__IPU_CSI0_D_15 */
+							374 0x1d5	/* MX53_PAD_CSI0_DAT14__IPU_CSI0_D_14 */
+							367 0x1d5	/* MX53_PAD_CSI0_DAT13__IPU_CSI0_D_13 */
+							360 0x1d5	/* MX53_PAD_CSI0_DAT12__IPU_CSI0_D_12 */
+							352 0x1d5	/* MX53_PAD_CSI0_DAT11__IPU_CSI0_D_11 */
+							344 0x1d5	/* MX53_PAD_CSI0_DAT10__IPU_CSI0_D_10 */
+							336 0x1d5	/* MX53_PAD_CSI0_DAT9__IPU_CSI0_D_9 */
+							328 0x1d5	/* MX53_PAD_CSI0_DAT8__IPU_CSI0_D_8 */
+							320 0x1d5	/* MX53_PAD_CSI0_DAT7__IPU_CSI0_D_7 */
+							312 0x1d5	/* MX53_PAD_CSI0_DAT6__IPU_CSI0_D_6 */
+							304 0x1d5	/* MX53_PAD_CSI0_DAT5__IPU_CSI0_D_5 */
+							296 0x1d5	/* MX53_PAD_CSI0_DAT4__IPU_CSI0_D_4 */
+							276 0x1d5	/* MX53_PAD_CSI0_PIXCLK__IPU_CSI0_PIXCLK */
+						>;
+					};
+				};
+
+				cspi {
+					pinctrl_cspi_1: cspigrp-1 {
+						fsl,pins = <
+							998  0x1d5	/* MX53_PAD_SD1_DATA0__CSPI_MISO */
+							1008 0x1d5	/* MX53_PAD_SD1_CMD__CSPI_MOSI */
+							1022 0x1d5	/* MX53_PAD_SD1_CLK__CSPI_SCLK */
+						>;
+					};
+				};
+
 				ecspi1 {
 					pinctrl_ecspi1_1: ecspi1grp-1 {
 						fsl,pins = <
@@ -349,6 +387,13 @@
 							853 0x80000000  /* MX53_PAD_PATA_DIOR__CAN1_RXCAN */
 						>;
 					};
+
+					pinctrl_can1_2: can1grp-2 {
+						fsl,pins = <
+							37  0x80000000  /* MX53_PAD_KEY_COL2__CAN1_TXCAN */
+							44  0x80000000  /* MX53_PAD_KEY_ROW2__CAN1_RXCAN */
+						>;
+					};
 				};
 
 				can2 {
@@ -421,6 +466,14 @@
 							880 0x1c5	/* MX53_PAD_PATA_DA_2__UART3_RTS */
 						>;
 					};
+
+					pinctrl_uart3_2: uart3grp-2 {
+						fsl,pins = <
+							884 0x1c5	/* MX53_PAD_PATA_CS_0__UART3_TXD_MUX */
+							888 0x1c5	/* MX53_PAD_PATA_CS_1__UART3_RXD_MUX */
+						>;
+					};
+
 				};
 
 				uart4 {
-- 
1.7.10.4

[PATCH 2/2] ARM i.MX53: add dts for the TQ tqma53 module

[Steffen Trumtrar]

From: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>

The tqma53 is an embedded module that has some features on board (e.g. emmc),
but mostly just provides access to them on its interface.
Going along with the imx53.dtsi, the tqma53.dtsi specifies the existing
devices and their pinctrl for this module. All devices that are not on the
module are disabled by default and need to be enabled in a baseboard DT.

Signed-off-by: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
Signed-off-by: Steffen Trumtrar <s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
---
 arch/arm/boot/dts/imx53-tqma53.dtsi |  207 +++++++++++++++++++++++++++++++++++
 1 file changed, 207 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx53-tqma53.dtsi

diff --git a/arch/arm/boot/dts/imx53-tqma53.dtsi b/arch/arm/boot/dts/imx53-tqma53.dtsi
new file mode 100644
index 0000000..41a6277
--- /dev/null
+++ b/arch/arm/boot/dts/imx53-tqma53.dtsi
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2012 Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>, Pengutronix
+ * Copyright 2012 Steffen Trumtrar <s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>, Pengutronix
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/include/ "imx53.dtsi"
+
+/ {
+	model = "TQ TQMa53";
+	compatible = "tq,tqma53", "fsl,imx53";
+
+	memory {
+		reg = <0x70000000 0x40000000>; /* Up to 1GiB */
+	};
+
+	soc {
+		aips@50000000 {
+			spba@50000000 {
+				esdhc2: esdhc@50008000 {
+					pinctrl-names = "default";
+					pinctrl-0 = <&pinctrl_esdhc2_1>;
+					wp-gpios = <&gpio1 2 0>;
+					cd-gpios = <&gpio1 4 0>;
+					status = "disabled";
+				};
+
+				uart3: serial@5000c000 {
+					pinctrl-names = "default";
+					pinctrl-0 = <&pinctrl_uart3_2>;
+					status = "disabled";
+				};
+
+				ecspi1: ecspi@50010000 {
+					pinctrl-names = "default";
+					pinctrl-0 = <&pinctrl_ecspi1_1>;
+					fsl,spi-num-chipselects = <4>;
+					cs-gpios = <&gpio2 30 0>, <&gpio3 19 0>,
+						   <&gpio3 24 0>, <&gpio3 25 0>;
+					status = "disabled";
+				};
+
+				esdhc3: esdhc@50020000 { /* EMMC */
+					pinctrl-names = "default";
+					pinctrl-0 = <&pinctrl_esdhc3_1>;
+					vmmc-supply = <&reg_3p3v>;
+					non-removable;
+					bus-width = <8>;
+					status = "okay";
+				};
+			};
+
+			usbphy1: usbphy@1 {
+				compatible = "nop-usbphy";
+				status = "okay";
+			};
+
+			usbphy2: usbphy@2 {
+				compatible = "nop-usbphy";
+				status = "okay";
+			};
+
+			usbotg: usb@53f80000 {
+				fsl,usbphy = <&usbphy1>;
+				phy-mode-utmi;
+				dr_mode = "peripheral";
+				status = "disabled";
+			};
+
+			usbh1: usb@53f80200 {
+				fsl,usbphy = <&usbphy2>;
+				phy-mode-utmi;
+				status = "disabled";
+			};
+
+			wdog1: wdog@53f98000 {
+				status = "okay";
+			};
+
+			iomuxc@53fa8000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_hog>;
+
+				i2s {
+					pinctrl_i2s_1: i2s-grp1 {
+						fsl,pins = <
+							 1   0x10000	/* I2S_MCLK */
+							 10  0x10000	/* I2S_SCLK */
+							 17  0x10000	/* I2S_DOUT */
+							 23  0x10000	/* I2S_LRCLK*/
+							 30  0x10000	/* I2S_DIN  */
+						>;
+					};
+				};
+
+				hog {
+					pinctrl_hog: hoggrp {
+						fsl,pins = <
+							 610  0x10000	/* MX53_PAD_EIM_CS1__IPU_DI1_PIN6 (VSYNC)*/
+							 711  0x10000	/* MX53_PAD_EIM_DA15__IPU_DI1_PIN4 (HSYNC)*/
+							 873  0x10000	/* MX53_PAD_PATA_DA_1__GPIO7_7 (LCD_BLT_EN)*/
+							 878  0x10000	/* MX53_PAD_PATA_DA_2__GPIO7_8 (LCD_RESET)*/
+							 922  0x10000	/* MX53_PAD_PATA_DATA5__GPIO2_5 (LCD_POWER)*/
+							 928  0x10000	/* MX53_PAD_PATA_DATA6__GPIO2_6 (PMIC_INT)*/
+							 982  0x10000	/* MX53_PAD_PATA_DATA14__GPIO2_14 (CSI_RST)*/
+							 989  0x10000	/* MX53_PAD_PATA_DATA15__GPIO2_15 (CSI_PWDN)*/
+							 1069 0x10000	/* MX53_PAD_GPIO_0__GPIO1_0 (SYSTEM_DOWN)*/
+							 1093 0x10000	/* MX53_PAD_GPIO_3__GPIO1_3 */
+						>;
+					};
+				};
+			};
+
+			uart1: serial@53fbc000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_uart1_2>;
+				fsl,uart-has-rtscts;
+				status = "disabled";
+			};
+
+			uart2: serial@53fc0000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_uart2_1>;
+				status = "disabled";
+			};
+
+			can1: can@53fc8000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_can1_2>;
+				status = "disabled";
+			};
+
+			can2: can@53fcc000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_can2_1>;
+				status = "disabled";
+			};
+
+			i2c3: i2c@53fec000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_i2c3_1>;
+				status = "disabled";
+			};
+		};
+
+		aips@60000000 {
+			cspi: cspi@63fc0000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_cspi_1>;
+				fsl,spi-num-chipselects = <3>;
+				cs-gpios = <&gpio1 18 0>, <&gpio1 19 0>,
+					   <&gpio1 21 0>;
+				status = "disabled";
+			};
+
+			i2c2: i2c@63fc4000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_i2c2_1>;
+				status = "okay";
+
+				pmic: mc34708@8 {
+					compatible = "fsl,mc34708";
+					reg = <0x8>;
+					fsl,mc13xxx-uses-rtc;
+					interrupt-parent = <&gpio2>;
+					interrupts = <6 8>; /* PDATA_DATA6, low active */
+				};
+
+				sensor1: lm75@48 {
+					compatible = "lm75";
+					reg = <0x48>;
+				};
+
+				eeprom: 24c64@50 {
+					compatible = "at,24c64";
+					pagesize = <32>;
+					reg = <0x50>;
+				};
+			};
+
+			fec: ethernet@63fec000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_fec_1>;
+				phy-mode = "rmii";
+				status = "disabled";
+			};
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+
+		reg_3p3v: 3p3v {
+			compatible = "regulator-fixed";
+			regulator-name = "3P3V";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			regulator-always-on;
+		};
+	};
+};
-- 
1.7.10.4

Re: [PATCH 2/2] ARM i.MX53: add dts for the TQ tqma53 module

[Sascha Hauer]

Please Cc linux arm kernel list next time.

On Mon, Jan 07, 2013 at 04:16:00PM +0100, Steffen Trumtrar wrote:
> From: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> 
> The tqma53 is an embedded module that has some features on board (e.g. emmc),
> but mostly just provides access to them on its interface.
> Going along with the imx53.dtsi, the tqma53.dtsi specifies the existing
> devices and their pinctrl for this module. All devices that are not on the
> module are disabled by default and need to be enabled in a baseboard DT.
> 
> Signed-off-by: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> Signed-off-by: Steffen Trumtrar <s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> ---
>  arch/arm/boot/dts/imx53-tqma53.dtsi |  207 +++++++++++++++++++++++++++++++++++
>  1 file changed, 207 insertions(+)
>  create mode 100644 arch/arm/boot/dts/imx53-tqma53.dtsi
> 
> diff --git a/arch/arm/boot/dts/imx53-tqma53.dtsi b/arch/arm/boot/dts/imx53-tqma53.dtsi
> new file mode 100644
> index 0000000..41a6277
> --- /dev/null
> +++ b/arch/arm/boot/dts/imx53-tqma53.dtsi
> @@ -0,0 +1,207 @@
> +/*
> + * Copyright 2012 Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>, Pengutronix
> + * Copyright 2012 Steffen Trumtrar <s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>, Pengutronix
> + *
> + * The code contained herein is licensed under the GNU General Public
> + * License. You may obtain a copy of the GNU General Public License
> + * Version 2 or later at the following locations:
> + *
> + * http://www.opensource.org/licenses/gpl-license.html
> + * http://www.gnu.org/copyleft/gpl.html
> + */
> +
> +/include/ "imx53.dtsi"
> +
> +/ {
> +	model = "TQ TQMa53";
> +	compatible = "tq,tqma53", "fsl,imx53";
> +
> +	memory {
> +		reg = <0x70000000 0x40000000>; /* Up to 1GiB */
> +	};
> +
> +	soc {
> +		aips@50000000 {
> +			spba@50000000 {
> +				esdhc2: esdhc@50008000 {
> +					pinctrl-names = "default";
> +					pinctrl-0 = <&pinctrl_esdhc2_1>;
> +					wp-gpios = <&gpio1 2 0>;
> +					cd-gpios = <&gpio1 4 0>;
> +					status = "disabled";
> +				};

Please convert all these to:

&esdhc2 {
	pinctrl-names = "default";
	...
};

(see arch/arm/boot/dts/omap3-beagle.dts for an example)

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH 2/2] ARM i.MX53: add dts for the TQ tqma53 module

[Shawn Guo]

On Mon, Jan 07, 2013 at 04:16:00PM +0100, Steffen Trumtrar wrote:
> From: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> 
> The tqma53 is an embedded module that has some features on board (e.g. emmc),
> but mostly just provides access to them on its interface.
> Going along with the imx53.dtsi, the tqma53.dtsi specifies the existing
> devices and their pinctrl for this module. All devices that are not on the
> module are disabled by default and need to be enabled in a baseboard DT.
> 
> Signed-off-by: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> Signed-off-by: Steffen Trumtrar <s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> ---
>  arch/arm/boot/dts/imx53-tqma53.dtsi |  207 +++++++++++++++++++++++++++++++++++

Please add the dtb target into arch/arm/boot/dts/Makefile.

...

> +			usbphy1: usbphy@1 {
> +				compatible = "nop-usbphy";

Is this compatible something kernel is actually using?

Shawn

> +				status = "okay";
> +			};

Re: [PATCH 2/2] ARM i.MX53: add dts for the TQ tqma53 module

[Steffen Trumtrar]

On Wed, Jan 09, 2013 at 11:48:11AM +0800, Shawn Guo wrote:
> On Mon, Jan 07, 2013 at 04:16:00PM +0100, Steffen Trumtrar wrote:
> > From: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> > 
> > The tqma53 is an embedded module that has some features on board (e.g. emmc),
> > but mostly just provides access to them on its interface.
> > Going along with the imx53.dtsi, the tqma53.dtsi specifies the existing
> > devices and their pinctrl for this module. All devices that are not on the
> > module are disabled by default and need to be enabled in a baseboard DT.
> > 
> > Signed-off-by: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> > Signed-off-by: Steffen Trumtrar <s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> > ---
> >  arch/arm/boot/dts/imx53-tqma53.dtsi |  207 +++++++++++++++++++++++++++++++++++
> 
> Please add the dtb target into arch/arm/boot/dts/Makefile.
> 
> ...

Ah, yes. Forgot that.

> 
> > +			usbphy1: usbphy@1 {
> > +				compatible = "nop-usbphy";
> 
> Is this compatible something kernel is actually using?
> 

It is used in mainline imx25.dtsi, but maybe got there by mistake. The according
patches are floating around for a while AFAIK, but haven't made it into mainline.

I am reworking the patch according to Saschas comment and will throw everything
out, that has no mainline driver. I will also include a baseboard .dts, that uses
this .dtsi.

Regards,
Steffen

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |