All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 0/7] Convert mxs board files to device tree
@ 2012-07-10  5:36 Shawn Guo
  2012-07-10  5:36 ` [PATCH v2 1/7] ARM: dts: imx28: move extra gpmi-nand pins into board dts Shawn Guo
                   ` (8 more replies)
  0 siblings, 9 replies; 20+ messages in thread
From: Shawn Guo @ 2012-07-10  5:36 UTC (permalink / raw)
  To: linux-arm-kernel

Changes since v1:
* Drop pwm, backlight and led for m28evk
* Enable enet_out clock for m28evk as well
* Drop the rewriting of tx28_add_fec0 for tx28

Regards,
Shawn

Marek Vasut (1):
  ARM: mxs: convert m28evk board to device tree

Shawn Guo (6):
  ARM: dts: imx28: move extra gpmi-nand pins into board dts
  ARM: dts: imx28: move lcdif control pins into board dts
  ARM: mxs: convert apx4devkit board to device tree
  ARM: mxs: convert tx28 board to device tree
  ARM: mxs: convert stmp378x_devb board to device tree
  ARM: mxs: add dtb-y target into Makefile.boot

 arch/arm/boot/dts/apx4devkit.dts    |  143 ++++++++++++++++++++++++
 arch/arm/boot/dts/imx28-evk.dts     |   30 +++++-
 arch/arm/boot/dts/imx28.dtsi        |   86 +++++++++++++-
 arch/arm/boot/dts/m28evk.dts        |  210 +++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/stmp378x_devb.dts |   78 +++++++++++++
 arch/arm/boot/dts/tx28.dts          |   82 ++++++++++++++
 arch/arm/mach-mxs/Makefile.boot     |    9 ++
 arch/arm/mach-mxs/mach-mxs.c        |   67 ++++++++++-
 8 files changed, 692 insertions(+), 13 deletions(-)
 create mode 100644 arch/arm/boot/dts/apx4devkit.dts
 create mode 100644 arch/arm/boot/dts/m28evk.dts
 create mode 100644 arch/arm/boot/dts/stmp378x_devb.dts
 create mode 100644 arch/arm/boot/dts/tx28.dts

-- 
1.7.5.4

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH v2 1/7] ARM: dts: imx28: move extra gpmi-nand pins into board dts
  2012-07-10  5:36 [PATCH v2 0/7] Convert mxs board files to device tree Shawn Guo
@ 2012-07-10  5:36 ` Shawn Guo
  2012-07-10  5:36 ` [PATCH v2 2/7] ARM: dts: imx28: move lcdif control " Shawn Guo
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 20+ messages in thread
From: Shawn Guo @ 2012-07-10  5:36 UTC (permalink / raw)
  To: linux-arm-kernel

Only pins GPMI_CE0N and GPMI_READY0 are generally used by other boards.
Move GPMI_CE1N and GPMI_READY1 into imx28-evk.dts to make gpmi_pins_a
more general, and can be used by other boards.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/imx28-evk.dts |   14 +++++++++++++-
 arch/arm/boot/dts/imx28.dtsi    |    2 --
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
index 0d8739d..0444964 100644
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@ -24,7 +24,8 @@
 		apbh at 80000000 {
 			gpmi-nand at 8000c000 {
 				pinctrl-names = "default";
-				pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
+				pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg
+					     &gpmi_pins_evk>;
 				status = "okay";
 			};
 
@@ -64,6 +65,17 @@
 					fsl,voltage = <1>;
 					fsl,pull-up = <0>;
 				};
+
+				gpmi_pins_evk: gpmi-nand-evk at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x0110 /* MX28_PAD_GPMI_CE1N__GPMI_CE1N */
+						0x0150 /* MX28_PAD_GPMI_RDY1__GPMI_READY1 */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
 			};
 
 			lcdif at 80030000 {
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index adb5ffc..2874adc 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -198,9 +198,7 @@
 						0x0060 /* MX28_PAD_GPMI_D06__GPMI_D6 */
 						0x0070 /* MX28_PAD_GPMI_D07__GPMI_D7 */
 						0x0100 /* MX28_PAD_GPMI_CE0N__GPMI_CE0N */
-						0x0110 /* MX28_PAD_GPMI_CE1N__GPMI_CE1N */
 						0x0140 /* MX28_PAD_GPMI_RDY0__GPMI_READY0 */
-						0x0150 /* MX28_PAD_GPMI_RDY1__GPMI_READY1 */
 						0x0180 /* MX28_PAD_GPMI_RDN__GPMI_RDN */
 						0x0190 /* MX28_PAD_GPMI_WRN__GPMI_WRN */
 						0x01a0 /* MX28_PAD_GPMI_ALE__GPMI_ALE */
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [PATCH v2 2/7] ARM: dts: imx28: move lcdif control pins into board dts
  2012-07-10  5:36 [PATCH v2 0/7] Convert mxs board files to device tree Shawn Guo
  2012-07-10  5:36 ` [PATCH v2 1/7] ARM: dts: imx28: move extra gpmi-nand pins into board dts Shawn Guo
@ 2012-07-10  5:36 ` Shawn Guo
  2012-07-10  5:36 ` [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree Shawn Guo
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 20+ messages in thread
From: Shawn Guo @ 2012-07-10  5:36 UTC (permalink / raw)
  To: linux-arm-kernel

The presence and muxing of lcdif control pins can vary much on different
boards.  Move them into imx28-evk.dts to make lcdif_24bit_pins_a only
about data pins, so that it can be reused by other boards.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/imx28-evk.dts |   16 +++++++++++++++-
 arch/arm/boot/dts/imx28.dtsi    |    4 ----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
index 0444964..0fcc7ea 100644
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@ -76,11 +76,25 @@
 					fsl,voltage = <1>;
 					fsl,pull-up = <0>;
 				};
+
+				lcdif_pins_evk: lcdif-evk at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */
+						0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */
+						0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */
+						0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
 			};
 
 			lcdif at 80030000 {
 				pinctrl-names = "default";
-				pinctrl-0 = <&lcdif_24bit_pins_a>;
+				pinctrl-0 = <&lcdif_24bit_pins_a
+					     &lcdif_pins_evk>;
 				panel-enable-gpios = <&gpio3 30 0>;
 				status = "okay";
 			};
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 2874adc..02e778b 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -400,10 +400,6 @@
 						0x1150 /* MX28_PAD_LCD_D21__LCD_D21 */
 						0x1160 /* MX28_PAD_LCD_D22__LCD_D22 */
 						0x1170 /* MX28_PAD_LCD_D23__LCD_D23 */
-						0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */
-						0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */
-						0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */
-						0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */
 					>;
 					fsl,drive-strength = <0>;
 					fsl,voltage = <1>;
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree
  2012-07-10  5:36 [PATCH v2 0/7] Convert mxs board files to device tree Shawn Guo
  2012-07-10  5:36 ` [PATCH v2 1/7] ARM: dts: imx28: move extra gpmi-nand pins into board dts Shawn Guo
  2012-07-10  5:36 ` [PATCH v2 2/7] ARM: dts: imx28: move lcdif control " Shawn Guo
@ 2012-07-10  5:36 ` Shawn Guo
  2012-07-10  7:20   ` Marek Vasut
  2012-07-10  5:36 ` [PATCH v2 4/7] ARM: mxs: convert apx4devkit " Shawn Guo
                   ` (5 subsequent siblings)
  8 siblings, 1 reply; 20+ messages in thread
From: Shawn Guo @ 2012-07-10  5:36 UTC (permalink / raw)
  To: linux-arm-kernel

From: Marek Vasut <marex@denx.de>

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/imx28.dtsi |   11 ++
 arch/arm/boot/dts/m28evk.dts |  210 ++++++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-mxs/mach-mxs.c |   41 ++++++++-
 3 files changed, 258 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/boot/dts/m28evk.dts

diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 02e778b..895a072 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -232,6 +232,17 @@
 					fsl,pull-up = <0>;
 				};
 
+				auart0_2pins_a: auart0-2pins at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x3000 /* MX28_PAD_AUART0_RX__AUART0_RX */
+						0x3010 /* MX28_PAD_AUART0_TX__AUART0_TX */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
 				auart3_pins_a: auart3 at 0 {
 					reg = <0>;
 					fsl,pinmux-ids = <
diff --git a/arch/arm/boot/dts/m28evk.dts b/arch/arm/boot/dts/m28evk.dts
new file mode 100644
index 0000000..f3acdfa
--- /dev/null
+++ b/arch/arm/boot/dts/m28evk.dts
@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2012 Marek Vasut <marex@denx.de>
+ *
+ * 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
+ */
+
+/dts-v1/;
+/include/ "imx28.dtsi"
+
+/ {
+	model = "DENX M28EVK";
+	compatible = "denx,m28evk", "fsl,imx28";
+
+	memory {
+		reg = <0x40000000 0x08000000>;
+	};
+
+	apb at 80000000 {
+		apbh at 80000000 {
+			gpmi-nand at 8000c000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
+				status = "okay";
+
+				partition at 0 {
+					label = "bootloader";
+					reg = <0x00000000 0x00300000>;
+					read-only;
+				};
+
+				partition at 1 {
+					label = "environment";
+					reg = <0x00300000 0x00080000>;
+				};
+
+				partition at 2 {
+					label = "redundant-environment";
+					reg = <0x00380000 0x00080000>;
+				};
+
+				partition at 3 {
+					label = "kernel";
+					reg = <0x00400000 0x00400000>;
+				};
+
+				partition at 4 {
+					label = "filesystem";
+					reg = <0x00800000 0x0f800000>;
+				};
+			};
+
+			ssp0: ssp at 80010000 {
+				compatible = "fsl,imx28-mmc";
+				pinctrl-names = "default";
+				pinctrl-0 = <&mmc0_8bit_pins_a
+					     &mmc0_cd_cfg
+					     &mmc0_sck_cfg>;
+				bus-width = <8>;
+				wp-gpios = <&gpio3 10 1>;
+				status = "okay";
+			};
+
+			pinctrl at 80018000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&hog_pins_a>;
+
+				hog_pins_a: hog-gpios at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x30a3 /* MX28_PAD_AUART2_CTS__GPIO_3_10 */
+						0x30b3 /* MX28_PAD_AUART2_RTS__GPIO_3_11 */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
+				lcdif_pins_m28: lcdif-m28 at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x11e0 /* MX28_PAD_LCD_DOTCLK__LCD_DOTCLK */
+						0x11f0 /* MX28_PAD_LCD_ENABLE__LCD_ENABLE */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+			};
+
+			lcdif at 80030000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&lcdif_24bit_pins_a
+					     &lcdif_pins_m28>;
+				status = "okay";
+			};
+
+			can0: can at 80032000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&can0_pins_a>;
+				status = "okay";
+			};
+
+			can1: can at 80034000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&can1_pins_a>;
+				status = "okay";
+			};
+		};
+
+		apbx at 80040000 {
+			saif0: saif at 80042000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&saif0_pins_a>;
+				status = "okay";
+			};
+
+			saif1: saif at 80046000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&saif1_pins_a>;
+				fsl,saif-master = <&saif0>;
+				status = "okay";
+			};
+
+			i2c0: i2c at 80058000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&i2c0_pins_a>;
+				status = "okay";
+
+				sgtl5000: codec at 0a {
+					compatible = "fsl,sgtl5000";
+					reg = <0x0a>;
+					VDDA-supply = <&reg_3p3v>;
+					VDDIO-supply = <&reg_3p3v>;
+
+				};
+
+				eeprom: eeprom at 51 {
+					compatible = "atmel,24c128";
+					reg = <0x51>;
+					pagesize = <32>;
+				};
+
+				rtc: rtc at 68 {
+					compatible = "stm,mt41t62";
+					reg = <0x68>;
+				};
+			};
+
+			duart: serial at 80074000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&duart_pins_a>;
+				status = "okay";
+			};
+
+			auart0: serial at 8006a000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&auart0_2pins_a>;
+				status = "okay";
+			};
+
+			auart3: serial at 80070000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&auart3_pins_a>;
+				status = "okay";
+			};
+		};
+	};
+
+	ahb at 80080000 {
+		mac0: ethernet at 800f0000 {
+			phy-mode = "rmii";
+			pinctrl-names = "default";
+			pinctrl-0 = <&mac0_pins_a>;
+			phy-reset-gpios = <&gpio3 11 0>;
+			status = "okay";
+		};
+
+		mac1: ethernet at 800f4000 {
+			phy-mode = "rmii";
+			pinctrl-names = "default";
+			pinctrl-0 = <&mac1_pins_a>;
+			status = "okay";
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+
+		reg_3p3v: 3p3v {
+			compatible = "regulator-fixed";
+			regulator-name = "3P3V";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			regulator-always-on;
+		};
+	};
+
+	sound {
+		compatible = "fsl,imx28-evk-sgtl5000",
+			     "fsl,mxs-audio-sgtl5000";
+		model = "imx28-evk-sgtl5000";
+		saif-controllers = <&saif0 &saif1>;
+		audio-codec = <&sgtl5000>;
+	};
+};
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 7bbb961..d3fc8ba 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -59,6 +59,23 @@ static struct fb_videomode mx28evk_video_modes[] = {
 	},
 };
 
+static struct fb_videomode m28evk_video_modes[] = {
+	{
+		.name		= "Ampire AM-800480R2TMQW-T01H",
+		.refresh	= 60,
+		.xres		= 800,
+		.yres		= 480,
+		.pixclock	= 30066, /* picosecond (33.26 MHz) */
+		.left_margin	= 0,
+		.right_margin	= 256,
+		.upper_margin	= 0,
+		.lower_margin	= 45,
+		.hsync_len	= 1,
+		.vsync_len	= 1,
+		.sync		= FB_SYNC_DATA_ENABLE_HIGH_ACT,
+	},
+};
+
 static struct mxsfb_platform_data mxsfb_pdata __initdata;
 
 static struct of_dev_auxdata mxs_auxdata_lookup[] __initdata = {
@@ -186,15 +203,17 @@ static void __init imx23_evk_init(void)
 	mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT;
 }
 
-static void __init imx28_evk_init(void)
+static inline void enable_clk_enet_out(void)
 {
-	struct clk *clk;
+	struct clk *clk = clk_get_sys("enet_out", NULL);
 
-	/* Enable fec phy clock */
-	clk = clk_get_sys("enet_out", NULL);
 	if (!IS_ERR(clk))
 		clk_prepare_enable(clk);
+}
 
+static void __init imx28_evk_init(void)
+{
+	enable_clk_enet_out();
 	update_fec_mac_prop(OUI_FSL);
 
 	mxsfb_pdata.mode_list = mx28evk_video_modes;
@@ -203,12 +222,25 @@ static void __init imx28_evk_init(void)
 	mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT;
 }
 
+static void __init m28evk_init(void)
+{
+	enable_clk_enet_out();
+	update_fec_mac_prop(OUI_DENX);
+
+	mxsfb_pdata.mode_list = m28evk_video_modes;
+	mxsfb_pdata.mode_count = ARRAY_SIZE(m28evk_video_modes);
+	mxsfb_pdata.default_bpp = 16;
+	mxsfb_pdata.ld_intf_width = STMLCDIF_18BIT;
+}
+
 static void __init mxs_machine_init(void)
 {
 	if (of_machine_is_compatible("fsl,imx28-evk"))
 		imx28_evk_init();
 	else if (of_machine_is_compatible("fsl,imx23-evk"))
 		imx23_evk_init();
+	else if (of_machine_is_compatible("denx,m28evk"))
+		m28evk_init();
 
 	of_platform_populate(NULL, of_default_bus_match_table,
 			     mxs_auxdata_lookup, NULL);
@@ -223,6 +255,7 @@ static const char *imx23_dt_compat[] __initdata = {
 
 static const char *imx28_dt_compat[] __initdata = {
 	"crystalfontz,cfa10036",
+	"denx,m28evk",
 	"fsl,imx28-evk",
 	"fsl,imx28",
 	NULL,
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [PATCH v2 4/7] ARM: mxs: convert apx4devkit board to device tree
  2012-07-10  5:36 [PATCH v2 0/7] Convert mxs board files to device tree Shawn Guo
                   ` (2 preceding siblings ...)
  2012-07-10  5:36 ` [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree Shawn Guo
@ 2012-07-10  5:36 ` Shawn Guo
  2012-07-10  5:36 ` [PATCH v2 5/7] ARM: mxs: convert tx28 " Shawn Guo
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 20+ messages in thread
From: Shawn Guo @ 2012-07-10  5:36 UTC (permalink / raw)
  To: linux-arm-kernel

Cc: Lauri Hintsala <lauri.hintsala@bluegiga.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/apx4devkit.dts |  143 ++++++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/imx28.dtsi     |   33 +++++++++
 arch/arm/mach-mxs/mach-mxs.c     |   20 +++++
 3 files changed, 196 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/boot/dts/apx4devkit.dts

diff --git a/arch/arm/boot/dts/apx4devkit.dts b/arch/arm/boot/dts/apx4devkit.dts
new file mode 100644
index 0000000..a670a90
--- /dev/null
+++ b/arch/arm/boot/dts/apx4devkit.dts
@@ -0,0 +1,143 @@
+/dts-v1/;
+/include/ "imx28.dtsi"
+
+/ {
+	model = "Bluegiga APX4 Development Kit";
+	compatible = "bluegiga,apx4devkit", "fsl,imx28";
+
+	memory {
+		reg = <0x40000000 0x04000000>;
+	};
+
+	apb at 80000000 {
+		apbh at 80000000 {
+			ssp0: ssp at 80010000 {
+				compatible = "fsl,imx28-mmc";
+				pinctrl-names = "default";
+				pinctrl-0 = <&mmc0_8bit_pins_a
+					     &mmc0_cd_cfg
+					     &mmc0_sck_cfg>;
+				bus-width = <8>;
+				status = "okay";
+			};
+
+			pinctrl at 80018000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&hog_pins_a>;
+
+				hog_pins_a: hog-gpios at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x31c3 /* MX28_PAD_PWM3__GPIO_3_28 */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+			};
+		};
+
+		apbx at 80040000 {
+			saif0: saif at 80042000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&saif0_pins_a>;
+				status = "okay";
+			};
+
+			saif1: saif at 80046000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&saif1_pins_a>;
+				fsl,saif-master = <&saif0>;
+				status = "okay";
+			};
+
+			i2c0: i2c at 80058000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&i2c0_pins_a>;
+				status = "okay";
+
+				sgtl5000: codec at 0a {
+					compatible = "fsl,sgtl5000";
+					reg = <0x0a>;
+					VDDA-supply = <&reg_3p3v>;
+					VDDIO-supply = <&reg_3p3v>;
+
+				};
+
+				pcf8563: rtc at 51 {
+					compatible = "phg,pcf8563";
+					reg = <0x51>;
+				};
+			};
+
+			duart: serial at 80074000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&duart_pins_a>;
+				status = "okay";
+			};
+
+			auart0: serial at 8006a000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&auart0_pins_a>;
+				status = "okay";
+			};
+
+			auart1: serial at 8006c000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&auart1_2pins_a>;
+				status = "okay";
+			};
+
+			auart2: serial at 8006e000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&auart2_2pins_a>;
+				status = "okay";
+			};
+
+			auart3: serial at 80070000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&auart3_2pins_a>;
+				status = "okay";
+			};
+		};
+	};
+
+	ahb at 80080000 {
+		mac0: ethernet at 800f0000 {
+			phy-mode = "rmii";
+			pinctrl-names = "default";
+			pinctrl-0 = <&mac0_pins_a>;
+			status = "okay";
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+
+		reg_3p3v: 3p3v {
+			compatible = "regulator-fixed";
+			regulator-name = "3P3V";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			regulator-always-on;
+		};
+	};
+
+	sound {
+		compatible = "fsl,imx28-evk-sgtl5000",
+			     "fsl,mxs-audio-sgtl5000";
+		model = "imx28-evk-sgtl5000";
+		saif-controllers = <&saif0 &saif1>;
+		audio-codec = <&sgtl5000>;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		user {
+			label = "Heartbeat";
+			gpios = <&gpio3 28 0>;
+			linux,default-trigger = "heartbeat";
+		};
+	};
+};
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 895a072..8595977 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -243,6 +243,28 @@
 					fsl,pull-up = <0>;
 				};
 
+				auart1_2pins_a: auart1-2pins at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x3040 /* MX28_PAD_AUART1_RX__AUART1_RX */
+						0x3050 /* MX28_PAD_AUART1_TX__AUART1_TX */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
+				auart2_2pins_a: auart2-2pins at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x2101 /* MX28_PAD_SSP2_SCK__AUART2_RX */
+						0x2111 /* MX28_PAD_SSP2_MOSI__AUART2_TX */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
 				auart3_pins_a: auart3 at 0 {
 					reg = <0>;
 					fsl,pinmux-ids = <
@@ -256,6 +278,17 @@
 					fsl,pull-up = <0>;
 				};
 
+				auart3_2pins_a: auart3-2pins at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x2121 /* MX28_PAD_SSP2_MISO__AUART3_RX */
+						0x2131 /* MX28_PAD_SSP2_SS0__AUART3_TX */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
 				mac0_pins_a: mac0 at 0 {
 					reg = <0>;
 					fsl,pinmux-ids = <
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index d3fc8ba..d0bf414 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -16,9 +16,11 @@
 #include <linux/init.h>
 #include <linux/init.h>
 #include <linux/irqdomain.h>
+#include <linux/micrel_phy.h>
 #include <linux/mxsfb.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
+#include <linux/phy.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <mach/common.h>
@@ -233,6 +235,21 @@ static void __init m28evk_init(void)
 	mxsfb_pdata.ld_intf_width = STMLCDIF_18BIT;
 }
 
+static int apx4devkit_phy_fixup(struct phy_device *phy)
+{
+	phy->dev_flags |= MICREL_PHY_50MHZ_CLK;
+	return 0;
+}
+
+static void __init apx4devkit_init(void)
+{
+	enable_clk_enet_out();
+
+	if (IS_BUILTIN(CONFIG_PHYLIB))
+		phy_register_fixup_for_uid(PHY_ID_KS8051, MICREL_PHY_ID_MASK,
+					   apx4devkit_phy_fixup);
+}
+
 static void __init mxs_machine_init(void)
 {
 	if (of_machine_is_compatible("fsl,imx28-evk"))
@@ -241,6 +258,8 @@ static void __init mxs_machine_init(void)
 		imx23_evk_init();
 	else if (of_machine_is_compatible("denx,m28evk"))
 		m28evk_init();
+	else if (of_machine_is_compatible("bluegiga,apx4devkit"))
+		apx4devkit_init();
 
 	of_platform_populate(NULL, of_default_bus_match_table,
 			     mxs_auxdata_lookup, NULL);
@@ -254,6 +273,7 @@ static const char *imx23_dt_compat[] __initdata = {
 };
 
 static const char *imx28_dt_compat[] __initdata = {
+	"bluegiga,apx4devkit",
 	"crystalfontz,cfa10036",
 	"denx,m28evk",
 	"fsl,imx28-evk",
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [PATCH v2 5/7] ARM: mxs: convert tx28 board to device tree
  2012-07-10  5:36 [PATCH v2 0/7] Convert mxs board files to device tree Shawn Guo
                   ` (3 preceding siblings ...)
  2012-07-10  5:36 ` [PATCH v2 4/7] ARM: mxs: convert apx4devkit " Shawn Guo
@ 2012-07-10  5:36 ` Shawn Guo
  2012-07-10 15:37   ` Shawn Guo
  2012-07-10  5:36 ` [PATCH v2 6/7] ARM: mxs: convert stmp378x_devb " Shawn Guo
                   ` (3 subsequent siblings)
  8 siblings, 1 reply; 20+ messages in thread
From: Shawn Guo @ 2012-07-10  5:36 UTC (permalink / raw)
  To: linux-arm-kernel

FEC support is missing because we need to find a proper way to rewrite
tx28_add_fec0 for device tree boot.

Cc: Lothar Wa?mann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/imx28.dtsi |   36 ++++++++++++++++++
 arch/arm/boot/dts/tx28.dts   |   82 ++++++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-mxs/mach-mxs.c |    5 ++-
 3 files changed, 122 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/boot/dts/tx28.dts

diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 8595977..e906ec1 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -186,6 +186,19 @@
 					fsl,pull-up = <0>;
 				};
 
+				duart_4pins_a: duart-4pins at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x3022 /* MX28_PAD_AUART0_CTS__DUART_RX */
+						0x3032 /* MX28_PAD_AUART0_RTS__DUART_TX */
+						0x3002 /* MX28_PAD_AUART0_RX__DUART_CTS */
+						0x3012 /* MX28_PAD_AUART0_TX__DUART_RTS */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
 				gpmi_pins_a: gpmi-nand at 0 {
 					reg = <0>;
 					fsl,pinmux-ids = <
@@ -243,6 +256,19 @@
 					fsl,pull-up = <0>;
 				};
 
+				auart1_pins_a: auart1 at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x3040 /* MX28_PAD_AUART1_RX__AUART1_RX */
+						0x3050 /* MX28_PAD_AUART1_TX__AUART1_TX */
+						0x3060 /* MX28_PAD_AUART1_CTS__AUART1_CTS */
+						0x3070 /* MX28_PAD_AUART1_RTS__AUART1_RTS */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
 				auart1_2pins_a: auart1-2pins at 0 {
 					reg = <0>;
 					fsl,pinmux-ids = <
@@ -407,6 +433,16 @@
 					fsl,pull-up = <1>;
 				};
 
+				pwm0_pins_a: pwm0 at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x3100 /* MX28_PAD_PWM0__PWM_0 */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
 				pwm2_pins_a: pwm2 at 0 {
 					reg = <0>;
 					fsl,pinmux-ids = <
diff --git a/arch/arm/boot/dts/tx28.dts b/arch/arm/boot/dts/tx28.dts
new file mode 100644
index 0000000..f64073b
--- /dev/null
+++ b/arch/arm/boot/dts/tx28.dts
@@ -0,0 +1,82 @@
+/dts-v1/;
+/include/ "imx28.dtsi"
+
+/ {
+	model = "Ka-Ro electronics TX28 module";
+	compatible = "karo,tx28", "fsl,imx28";
+
+	memory {
+		reg = <0x40000000 0x08000000>;
+	};
+
+	apb at 80000000 {
+		apbh at 80000000 {
+			ssp0: ssp at 80010000 {
+				compatible = "fsl,imx28-mmc";
+				pinctrl-names = "default";
+				pinctrl-0 = <&mmc0_4bit_pins_a
+					     &mmc0_cd_cfg
+					     &mmc0_sck_cfg>;
+				bus-width = <4>;
+				status = "okay";
+			};
+		};
+
+		apbx at 80040000 {
+			i2c0: i2c at 80058000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&i2c0_pins_a>;
+				status = "okay";
+
+				ds1339: rtc at 68 {
+					compatible = "mxim,ds1339";
+					reg = <0x68>;
+				};
+			};
+
+			pwm: pwm at 80064000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pwm0_pins_a>;
+				status = "okay";
+			};
+
+			duart: serial at 80074000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&duart_4pins_a>;
+				status = "okay";
+			};
+
+			auart1: serial at 8006c000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&auart1_pins_a>;
+				status = "okay";
+			};
+		};
+	};
+
+	ahb at 80080000 {
+		mac0: ethernet at 800f0000 {
+			phy-mode = "rmii";
+			pinctrl-names = "default";
+			pinctrl-0 = <&mac0_pins_a>;
+			status = "okay";
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		user {
+			label = "Heartbeat";
+			gpios = <&gpio4 10 0>;
+			linux,default-trigger = "heartbeat";
+		};
+	};
+
+	backlight {
+		compatible = "pwm-backlight";
+		pwms = <&pwm 0 5000000>;
+		brightness-levels = <0 4 8 16 32 64 128 255>;
+		default-brightness-level = <6>;
+	};
+};
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index d0bf414..c1e02ae 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -12,8 +12,9 @@
 
 #include <linux/clk.h>
 #include <linux/clkdev.h>
+#include <linux/delay.h>
 #include <linux/err.h>
-#include <linux/init.h>
+#include <linux/gpio.h>
 #include <linux/init.h>
 #include <linux/irqdomain.h>
 #include <linux/micrel_phy.h>
@@ -24,6 +25,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <mach/common.h>
+#include <mach/mxs.h>
 
 static struct fb_videomode mx23evk_video_modes[] = {
 	{
@@ -277,6 +279,7 @@ static const char *imx28_dt_compat[] __initdata = {
 	"crystalfontz,cfa10036",
 	"denx,m28evk",
 	"fsl,imx28-evk",
+	"karo,tx28",
 	"fsl,imx28",
 	NULL,
 };
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [PATCH v2 6/7] ARM: mxs: convert stmp378x_devb board to device tree
  2012-07-10  5:36 [PATCH v2 0/7] Convert mxs board files to device tree Shawn Guo
                   ` (4 preceding siblings ...)
  2012-07-10  5:36 ` [PATCH v2 5/7] ARM: mxs: convert tx28 " Shawn Guo
@ 2012-07-10  5:36 ` Shawn Guo
  2012-07-10  5:36 ` [PATCH v2 7/7] ARM: mxs: add dtb-y target into Makefile.boot Shawn Guo
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 20+ messages in thread
From: Shawn Guo @ 2012-07-10  5:36 UTC (permalink / raw)
  To: linux-arm-kernel

The enc28j60 spi device does not get converted to dts file, because
there is no mxs spi driver on mainline so far.  The enc28j60 spi
in mach-stmp378x_devb.c does not work anyway.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/stmp378x_devb.dts |   78 +++++++++++++++++++++++++++++++++++
 arch/arm/mach-mxs/mach-mxs.c        |    1 +
 2 files changed, 79 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/boot/dts/stmp378x_devb.dts

diff --git a/arch/arm/boot/dts/stmp378x_devb.dts b/arch/arm/boot/dts/stmp378x_devb.dts
new file mode 100644
index 0000000..757a327
--- /dev/null
+++ b/arch/arm/boot/dts/stmp378x_devb.dts
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ *
+ * 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
+ */
+
+/dts-v1/;
+/include/ "imx23.dtsi"
+
+/ {
+	model = "Freescale STMP378x Development Board";
+	compatible = "fsl,stmp378x-devb", "fsl,imx23";
+
+	memory {
+		reg = <0x40000000 0x04000000>;
+	};
+
+	apb at 80000000 {
+		apbh at 80000000 {
+			ssp0: ssp at 80010000 {
+				compatible = "fsl,imx23-mmc";
+				pinctrl-names = "default";
+				pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;
+				bus-width = <4>;
+				wp-gpios = <&gpio1 30 0>;
+				vmmc-supply = <&reg_vddio_sd0>;
+				status = "okay";
+			};
+
+			pinctrl at 80018000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&hog_pins_a>;
+
+				hog_pins_a: hog-gpios at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x11d3 /* MX23_PAD_PWM3__GPIO_1_29 */
+						0x11e3 /* MX23_PAD_PWM4__GPIO_1_30 */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+			};
+		};
+
+		apbx at 80040000 {
+			auart0: serial at 8006c000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&auart0_pins_a>;
+				status = "okay";
+			};
+
+			duart: serial at 80070000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&duart_pins_a>;
+				status = "okay";
+			};
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+
+		reg_vddio_sd0: vddio-sd0 {
+			compatible = "regulator-fixed";
+			regulator-name = "vddio-sd0";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			gpio = <&gpio1 29 0>;
+		};
+	};
+};
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index c1e02ae..b3239e2 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -269,6 +269,7 @@ static void __init mxs_machine_init(void)
 
 static const char *imx23_dt_compat[] __initdata = {
 	"fsl,imx23-evk",
+	"fsl,stmp378x_devb"
 	"olimex,imx23-olinuxino",
 	"fsl,imx23",
 	NULL,
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [PATCH v2 7/7] ARM: mxs: add dtb-y target into Makefile.boot
  2012-07-10  5:36 [PATCH v2 0/7] Convert mxs board files to device tree Shawn Guo
                   ` (5 preceding siblings ...)
  2012-07-10  5:36 ` [PATCH v2 6/7] ARM: mxs: convert stmp378x_devb " Shawn Guo
@ 2012-07-10  5:36 ` Shawn Guo
  2012-07-10  5:38 ` [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree Shawn Guo
  2012-07-10  5:39 ` [PATCH v2 6/7] ARM: mxs: convert stmp378x_devb " Shawn Guo
  8 siblings, 0 replies; 20+ messages in thread
From: Shawn Guo @ 2012-07-10  5:36 UTC (permalink / raw)
  To: linux-arm-kernel

Add dtb-y target into Makefile.boot, so that "make ARCH=arm dtbs" can
build out all the dtbs listed there.  It's very useful for build-testing
all the <board>.dts when imx28.dtsi changes.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/mach-mxs/Makefile.boot |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-mxs/Makefile.boot b/arch/arm/mach-mxs/Makefile.boot
index 07b11fe..58733cc 100644
--- a/arch/arm/mach-mxs/Makefile.boot
+++ b/arch/arm/mach-mxs/Makefile.boot
@@ -1 +1,10 @@
 zreladdr-y += 0x40008000
+
+dtb-y += apx4devkit.dtb \
+	 cfa10036.dtb \
+	 imx23-evk.dtb \
+	 imx23-olinuxino.dtb \
+	 imx28-evk.dtb \
+	 m28evk.dtb \
+	 stmp378x_devb.dtb \
+	 tx28.dtb \
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree
  2012-07-10  5:36 [PATCH v2 0/7] Convert mxs board files to device tree Shawn Guo
                   ` (6 preceding siblings ...)
  2012-07-10  5:36 ` [PATCH v2 7/7] ARM: mxs: add dtb-y target into Makefile.boot Shawn Guo
@ 2012-07-10  5:38 ` Shawn Guo
  2012-07-10  5:39 ` [PATCH v2 6/7] ARM: mxs: convert stmp378x_devb " Shawn Guo
  8 siblings, 0 replies; 20+ messages in thread
From: Shawn Guo @ 2012-07-10  5:38 UTC (permalink / raw)
  To: linux-arm-kernel

From: Marek Vasut <marex@denx.de>

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/imx28.dtsi |   11 ++
 arch/arm/boot/dts/m28evk.dts |  210 ++++++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-mxs/mach-mxs.c |   41 ++++++++-
 3 files changed, 258 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/boot/dts/m28evk.dts

diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 02e778b..895a072 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -232,6 +232,17 @@
 					fsl,pull-up = <0>;
 				};
 
+				auart0_2pins_a: auart0-2pins at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x3000 /* MX28_PAD_AUART0_RX__AUART0_RX */
+						0x3010 /* MX28_PAD_AUART0_TX__AUART0_TX */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
 				auart3_pins_a: auart3 at 0 {
 					reg = <0>;
 					fsl,pinmux-ids = <
diff --git a/arch/arm/boot/dts/m28evk.dts b/arch/arm/boot/dts/m28evk.dts
new file mode 100644
index 0000000..f3acdfa
--- /dev/null
+++ b/arch/arm/boot/dts/m28evk.dts
@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2012 Marek Vasut <marex@denx.de>
+ *
+ * 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
+ */
+
+/dts-v1/;
+/include/ "imx28.dtsi"
+
+/ {
+	model = "DENX M28EVK";
+	compatible = "denx,m28evk", "fsl,imx28";
+
+	memory {
+		reg = <0x40000000 0x08000000>;
+	};
+
+	apb at 80000000 {
+		apbh at 80000000 {
+			gpmi-nand at 8000c000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
+				status = "okay";
+
+				partition at 0 {
+					label = "bootloader";
+					reg = <0x00000000 0x00300000>;
+					read-only;
+				};
+
+				partition at 1 {
+					label = "environment";
+					reg = <0x00300000 0x00080000>;
+				};
+
+				partition at 2 {
+					label = "redundant-environment";
+					reg = <0x00380000 0x00080000>;
+				};
+
+				partition at 3 {
+					label = "kernel";
+					reg = <0x00400000 0x00400000>;
+				};
+
+				partition at 4 {
+					label = "filesystem";
+					reg = <0x00800000 0x0f800000>;
+				};
+			};
+
+			ssp0: ssp at 80010000 {
+				compatible = "fsl,imx28-mmc";
+				pinctrl-names = "default";
+				pinctrl-0 = <&mmc0_8bit_pins_a
+					     &mmc0_cd_cfg
+					     &mmc0_sck_cfg>;
+				bus-width = <8>;
+				wp-gpios = <&gpio3 10 1>;
+				status = "okay";
+			};
+
+			pinctrl at 80018000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&hog_pins_a>;
+
+				hog_pins_a: hog-gpios at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x30a3 /* MX28_PAD_AUART2_CTS__GPIO_3_10 */
+						0x30b3 /* MX28_PAD_AUART2_RTS__GPIO_3_11 */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
+				lcdif_pins_m28: lcdif-m28 at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x11e0 /* MX28_PAD_LCD_DOTCLK__LCD_DOTCLK */
+						0x11f0 /* MX28_PAD_LCD_ENABLE__LCD_ENABLE */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+			};
+
+			lcdif at 80030000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&lcdif_24bit_pins_a
+					     &lcdif_pins_m28>;
+				status = "okay";
+			};
+
+			can0: can at 80032000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&can0_pins_a>;
+				status = "okay";
+			};
+
+			can1: can at 80034000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&can1_pins_a>;
+				status = "okay";
+			};
+		};
+
+		apbx at 80040000 {
+			saif0: saif at 80042000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&saif0_pins_a>;
+				status = "okay";
+			};
+
+			saif1: saif at 80046000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&saif1_pins_a>;
+				fsl,saif-master = <&saif0>;
+				status = "okay";
+			};
+
+			i2c0: i2c at 80058000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&i2c0_pins_a>;
+				status = "okay";
+
+				sgtl5000: codec at 0a {
+					compatible = "fsl,sgtl5000";
+					reg = <0x0a>;
+					VDDA-supply = <&reg_3p3v>;
+					VDDIO-supply = <&reg_3p3v>;
+
+				};
+
+				eeprom: eeprom at 51 {
+					compatible = "atmel,24c128";
+					reg = <0x51>;
+					pagesize = <32>;
+				};
+
+				rtc: rtc at 68 {
+					compatible = "stm,mt41t62";
+					reg = <0x68>;
+				};
+			};
+
+			duart: serial at 80074000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&duart_pins_a>;
+				status = "okay";
+			};
+
+			auart0: serial at 8006a000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&auart0_2pins_a>;
+				status = "okay";
+			};
+
+			auart3: serial at 80070000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&auart3_pins_a>;
+				status = "okay";
+			};
+		};
+	};
+
+	ahb at 80080000 {
+		mac0: ethernet at 800f0000 {
+			phy-mode = "rmii";
+			pinctrl-names = "default";
+			pinctrl-0 = <&mac0_pins_a>;
+			phy-reset-gpios = <&gpio3 11 0>;
+			status = "okay";
+		};
+
+		mac1: ethernet at 800f4000 {
+			phy-mode = "rmii";
+			pinctrl-names = "default";
+			pinctrl-0 = <&mac1_pins_a>;
+			status = "okay";
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+
+		reg_3p3v: 3p3v {
+			compatible = "regulator-fixed";
+			regulator-name = "3P3V";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			regulator-always-on;
+		};
+	};
+
+	sound {
+		compatible = "fsl,imx28-evk-sgtl5000",
+			     "fsl,mxs-audio-sgtl5000";
+		model = "imx28-evk-sgtl5000";
+		saif-controllers = <&saif0 &saif1>;
+		audio-codec = <&sgtl5000>;
+	};
+};
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 7bbb961..d3fc8ba 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -59,6 +59,23 @@ static struct fb_videomode mx28evk_video_modes[] = {
 	},
 };
 
+static struct fb_videomode m28evk_video_modes[] = {
+	{
+		.name		= "Ampire AM-800480R2TMQW-T01H",
+		.refresh	= 60,
+		.xres		= 800,
+		.yres		= 480,
+		.pixclock	= 30066, /* picosecond (33.26 MHz) */
+		.left_margin	= 0,
+		.right_margin	= 256,
+		.upper_margin	= 0,
+		.lower_margin	= 45,
+		.hsync_len	= 1,
+		.vsync_len	= 1,
+		.sync		= FB_SYNC_DATA_ENABLE_HIGH_ACT,
+	},
+};
+
 static struct mxsfb_platform_data mxsfb_pdata __initdata;
 
 static struct of_dev_auxdata mxs_auxdata_lookup[] __initdata = {
@@ -186,15 +203,17 @@ static void __init imx23_evk_init(void)
 	mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT;
 }
 
-static void __init imx28_evk_init(void)
+static inline void enable_clk_enet_out(void)
 {
-	struct clk *clk;
+	struct clk *clk = clk_get_sys("enet_out", NULL);
 
-	/* Enable fec phy clock */
-	clk = clk_get_sys("enet_out", NULL);
 	if (!IS_ERR(clk))
 		clk_prepare_enable(clk);
+}
 
+static void __init imx28_evk_init(void)
+{
+	enable_clk_enet_out();
 	update_fec_mac_prop(OUI_FSL);
 
 	mxsfb_pdata.mode_list = mx28evk_video_modes;
@@ -203,12 +222,25 @@ static void __init imx28_evk_init(void)
 	mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT;
 }
 
+static void __init m28evk_init(void)
+{
+	enable_clk_enet_out();
+	update_fec_mac_prop(OUI_DENX);
+
+	mxsfb_pdata.mode_list = m28evk_video_modes;
+	mxsfb_pdata.mode_count = ARRAY_SIZE(m28evk_video_modes);
+	mxsfb_pdata.default_bpp = 16;
+	mxsfb_pdata.ld_intf_width = STMLCDIF_18BIT;
+}
+
 static void __init mxs_machine_init(void)
 {
 	if (of_machine_is_compatible("fsl,imx28-evk"))
 		imx28_evk_init();
 	else if (of_machine_is_compatible("fsl,imx23-evk"))
 		imx23_evk_init();
+	else if (of_machine_is_compatible("denx,m28evk"))
+		m28evk_init();
 
 	of_platform_populate(NULL, of_default_bus_match_table,
 			     mxs_auxdata_lookup, NULL);
@@ -223,6 +255,7 @@ static const char *imx23_dt_compat[] __initdata = {
 
 static const char *imx28_dt_compat[] __initdata = {
 	"crystalfontz,cfa10036",
+	"denx,m28evk",
 	"fsl,imx28-evk",
 	"fsl,imx28",
 	NULL,
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [PATCH v2 6/7] ARM: mxs: convert stmp378x_devb board to device tree
  2012-07-10  5:36 [PATCH v2 0/7] Convert mxs board files to device tree Shawn Guo
                   ` (7 preceding siblings ...)
  2012-07-10  5:38 ` [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree Shawn Guo
@ 2012-07-10  5:39 ` Shawn Guo
  8 siblings, 0 replies; 20+ messages in thread
From: Shawn Guo @ 2012-07-10  5:39 UTC (permalink / raw)
  To: linux-arm-kernel

The enc28j60 spi device does not get converted to dts file, because
there is no mxs spi driver on mainline so far.  The enc28j60 spi
in mach-stmp378x_devb.c does not work anyway.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/stmp378x_devb.dts |   78 +++++++++++++++++++++++++++++++++++
 arch/arm/mach-mxs/mach-mxs.c        |    1 +
 2 files changed, 79 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/boot/dts/stmp378x_devb.dts

diff --git a/arch/arm/boot/dts/stmp378x_devb.dts b/arch/arm/boot/dts/stmp378x_devb.dts
new file mode 100644
index 0000000..757a327
--- /dev/null
+++ b/arch/arm/boot/dts/stmp378x_devb.dts
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ *
+ * 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
+ */
+
+/dts-v1/;
+/include/ "imx23.dtsi"
+
+/ {
+	model = "Freescale STMP378x Development Board";
+	compatible = "fsl,stmp378x-devb", "fsl,imx23";
+
+	memory {
+		reg = <0x40000000 0x04000000>;
+	};
+
+	apb at 80000000 {
+		apbh at 80000000 {
+			ssp0: ssp at 80010000 {
+				compatible = "fsl,imx23-mmc";
+				pinctrl-names = "default";
+				pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;
+				bus-width = <4>;
+				wp-gpios = <&gpio1 30 0>;
+				vmmc-supply = <&reg_vddio_sd0>;
+				status = "okay";
+			};
+
+			pinctrl at 80018000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&hog_pins_a>;
+
+				hog_pins_a: hog-gpios at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x11d3 /* MX23_PAD_PWM3__GPIO_1_29 */
+						0x11e3 /* MX23_PAD_PWM4__GPIO_1_30 */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+			};
+		};
+
+		apbx at 80040000 {
+			auart0: serial at 8006c000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&auart0_pins_a>;
+				status = "okay";
+			};
+
+			duart: serial at 80070000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&duart_pins_a>;
+				status = "okay";
+			};
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+
+		reg_vddio_sd0: vddio-sd0 {
+			compatible = "regulator-fixed";
+			regulator-name = "vddio-sd0";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			gpio = <&gpio1 29 0>;
+		};
+	};
+};
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index c1e02ae..b3239e2 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -269,6 +269,7 @@ static void __init mxs_machine_init(void)
 
 static const char *imx23_dt_compat[] __initdata = {
 	"fsl,imx23-evk",
+	"fsl,stmp378x_devb"
 	"olimex,imx23-olinuxino",
 	"fsl,imx23",
 	NULL,
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree
  2012-07-10  5:36 ` [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree Shawn Guo
@ 2012-07-10  7:20   ` Marek Vasut
  2012-07-10  7:24     ` Shawn Guo
  2012-07-10 15:23     ` Shawn Guo
  0 siblings, 2 replies; 20+ messages in thread
From: Marek Vasut @ 2012-07-10  7:20 UTC (permalink / raw)
  To: linux-arm-kernel

Dear Shawn Guo,

> From: Marek Vasut <marex@denx.de>
> 
[...]

> +	sound {
> +		compatible = "fsl,imx28-evk-sgtl5000",

imx28-evk ? ;-)

> +			     "fsl,mxs-audio-sgtl5000";
> +		model = "imx28-evk-sgtl5000";
> +		saif-controllers = <&saif0 &saif1>;
> +		audio-codec = <&sgtl5000>;
> +	};
> +};

Otherwise, add my Acked-by: Marek Vasut <marex@denx.de> so if it gets broken 
now, the blame falls on my head ;-)

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree
  2012-07-10  7:20   ` Marek Vasut
@ 2012-07-10  7:24     ` Shawn Guo
  2012-07-10  8:32       ` Marek Vasut
  2012-07-10 15:23     ` Shawn Guo
  1 sibling, 1 reply; 20+ messages in thread
From: Shawn Guo @ 2012-07-10  7:24 UTC (permalink / raw)
  To: linux-arm-kernel

On 10 July 2012 15:20, Marek Vasut <marex@denx.de> wrote:
> Dear Shawn Guo,
>
>> From: Marek Vasut <marex@denx.de>
>>
> [...]
>
>> +     sound {
>> +             compatible = "fsl,imx28-evk-sgtl5000",
>
> imx28-evk ? ;-)
>
Will fix it, as well as apx4devkit.dts.

>> +                          "fsl,mxs-audio-sgtl5000";
>> +             model = "imx28-evk-sgtl5000";
>> +             saif-controllers = <&saif0 &saif1>;
>> +             audio-codec = <&sgtl5000>;
>> +     };
>> +};
>
> Otherwise, add my Acked-by: Marek Vasut <marex@denx.de> so if it gets broken
> now, the blame falls on my head ;-)
>
I'm much relieved now.

Regards,
Shawn

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree
  2012-07-10  7:24     ` Shawn Guo
@ 2012-07-10  8:32       ` Marek Vasut
  0 siblings, 0 replies; 20+ messages in thread
From: Marek Vasut @ 2012-07-10  8:32 UTC (permalink / raw)
  To: linux-arm-kernel

Dear Shawn Guo,

> On 10 July 2012 15:20, Marek Vasut <marex@denx.de> wrote:
> > Dear Shawn Guo,
> > 
> >> From: Marek Vasut <marex@denx.de>
> > 
> > [...]
> > 
> >> +     sound {
> >> +             compatible = "fsl,imx28-evk-sgtl5000",
> > 
> > imx28-evk ? ;-)
> 
> Will fix it, as well as apx4devkit.dts.
> 
> >> +                          "fsl,mxs-audio-sgtl5000";
> >> +             model = "imx28-evk-sgtl5000";
> >> +             saif-controllers = <&saif0 &saif1>;
> >> +             audio-codec = <&sgtl5000>;
> >> +     };
> >> +};
> > 
> > Otherwise, add my Acked-by: Marek Vasut <marex@denx.de> so if it gets
> > broken now, the blame falls on my head ;-)
> 
> I'm much relieved now.

Heh ;-)

> Regards,
> Shawn

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree
  2012-07-10  7:20   ` Marek Vasut
  2012-07-10  7:24     ` Shawn Guo
@ 2012-07-10 15:23     ` Shawn Guo
  2012-07-10 15:37       ` Marek Vasut
  1 sibling, 1 reply; 20+ messages in thread
From: Shawn Guo @ 2012-07-10 15:23 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Jul 10, 2012 at 09:20:03AM +0200, Marek Vasut wrote:
> Dear Shawn Guo,
> 
> > From: Marek Vasut <marex@denx.de>
> > 
> [...]
> 
> > +	sound {
> > +		compatible = "fsl,imx28-evk-sgtl5000",
> 
> imx28-evk ? ;-)
> 
Fixed as below.

Regards,
Shawn

---8<---

diff --git a/arch/arm/boot/dts/apx4devkit.dts b/arch/arm/boot/dts/apx4devkit.dts
index a670a90..04664bc 100644
--- a/arch/arm/boot/dts/apx4devkit.dts
+++ b/arch/arm/boot/dts/apx4devkit.dts
@@ -124,9 +124,9 @@
        };

        sound {
-               compatible = "fsl,imx28-evk-sgtl5000",
+               compatible = "bluegiga,apx4devkit-sgtl5000",
                             "fsl,mxs-audio-sgtl5000";
-               model = "imx28-evk-sgtl5000";
+               model = "apx4devkit-sgtl5000";
                saif-controllers = <&saif0 &saif1>;
                audio-codec = <&sgtl5000>;
        };
diff --git a/arch/arm/boot/dts/m28evk.dts b/arch/arm/boot/dts/m28evk.dts
index f3acdfa..183a3fd 100644
--- a/arch/arm/boot/dts/m28evk.dts
+++ b/arch/arm/boot/dts/m28evk.dts
@@ -201,9 +201,9 @@
        };

        sound {
-               compatible = "fsl,imx28-evk-sgtl5000",
+               compatible = "denx,m28evk-sgtl5000",
                             "fsl,mxs-audio-sgtl5000";
-               model = "imx28-evk-sgtl5000";
+               model = "m28evk-sgtl5000";
                saif-controllers = <&saif0 &saif1>;
                audio-codec = <&sgtl5000>;
        };

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [PATCH v2 5/7] ARM: mxs: convert tx28 board to device tree
  2012-07-10  5:36 ` [PATCH v2 5/7] ARM: mxs: convert tx28 " Shawn Guo
@ 2012-07-10 15:37   ` Shawn Guo
  0 siblings, 0 replies; 20+ messages in thread
From: Shawn Guo @ 2012-07-10 15:37 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Jul 10, 2012 at 01:36:25PM +0800, Shawn Guo wrote:
> diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
> index d0bf414..c1e02ae 100644
> --- a/arch/arm/mach-mxs/mach-mxs.c
> +++ b/arch/arm/mach-mxs/mach-mxs.c
> @@ -12,8 +12,9 @@
>  
>  #include <linux/clk.h>
>  #include <linux/clkdev.h>
> +#include <linux/delay.h>
>  #include <linux/err.h>
> -#include <linux/init.h>
> +#include <linux/gpio.h>
>  #include <linux/init.h>
>  #include <linux/irqdomain.h>
>  #include <linux/micrel_phy.h>
> @@ -24,6 +25,7 @@
>  #include <asm/mach/arch.h>
>  #include <asm/mach/time.h>
>  #include <mach/common.h>
> +#include <mach/mxs.h>
>  
With tx28_init dropped, these header changes shouldn't be here any more.

Regards,
Shawn

>  static struct fb_videomode mx23evk_video_modes[] = {
>  	{
> @@ -277,6 +279,7 @@ static const char *imx28_dt_compat[] __initdata = {
>  	"crystalfontz,cfa10036",
>  	"denx,m28evk",
>  	"fsl,imx28-evk",
> +	"karo,tx28",
>  	"fsl,imx28",
>  	NULL,
>  };
> -- 
> 1.7.5.4
> 
> 

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree
  2012-07-10 15:23     ` Shawn Guo
@ 2012-07-10 15:37       ` Marek Vasut
  2012-07-10 15:45         ` Shawn Guo
  0 siblings, 1 reply; 20+ messages in thread
From: Marek Vasut @ 2012-07-10 15:37 UTC (permalink / raw)
  To: linux-arm-kernel

Dear Shawn Guo,

> On Tue, Jul 10, 2012 at 09:20:03AM +0200, Marek Vasut wrote:
> > Dear Shawn Guo,
> > 
> > > From: Marek Vasut <marex@denx.de>
> > 
> > [...]
> > 
> > > +	sound {
> > > +		compatible = "fsl,imx28-evk-sgtl5000",
> > 
> > imx28-evk ? ;-)

Good on my end.

> Fixed as below.
> 
> Regards,
> Shawn

[...]

> diff --git a/arch/arm/boot/dts/m28evk.dts b/arch/arm/boot/dts/m28evk.dts

Just a suggestion -- why not name all the imx28-based boards' DTS files "imx28-
<board>.dts" ? In this case imx28-m28evk.dts , it'd make it obvious where this 
board fits.

[...]

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree
  2012-07-10 15:37       ` Marek Vasut
@ 2012-07-10 15:45         ` Shawn Guo
  2012-07-10 15:51           ` Marek Vasut
  0 siblings, 1 reply; 20+ messages in thread
From: Shawn Guo @ 2012-07-10 15:45 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Jul 10, 2012 at 05:37:15PM +0200, Marek Vasut wrote:
> > diff --git a/arch/arm/boot/dts/m28evk.dts b/arch/arm/boot/dts/m28evk.dts
> 
> Just a suggestion -- why not name all the imx28-based boards' DTS files "imx28-
> <board>.dts" ? In this case imx28-m28evk.dts , it'd make it obvious where this 
> board fits.

Because the name scheme is simply <boardname>.dts rather than
imx28-<boardname>.dts.  Also the name of imx28-m28evk and imx28-tx28
look a little redundant on "28".

-- 
Regards,
Shawn

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree
  2012-07-10 15:45         ` Shawn Guo
@ 2012-07-10 15:51           ` Marek Vasut
  2012-07-10 16:08             ` Shawn Guo
  0 siblings, 1 reply; 20+ messages in thread
From: Marek Vasut @ 2012-07-10 15:51 UTC (permalink / raw)
  To: linux-arm-kernel

Dear Shawn Guo,

> On Tue, Jul 10, 2012 at 05:37:15PM +0200, Marek Vasut wrote:
> > > diff --git a/arch/arm/boot/dts/m28evk.dts
> > > b/arch/arm/boot/dts/m28evk.dts
> > 
> > Just a suggestion -- why not name all the imx28-based boards' DTS files
> > "imx28- <board>.dts" ? In this case imx28-m28evk.dts , it'd make it
> > obvious where this board fits.
> 
> Because the name scheme is simply <boardname>.dts rather than
> imx28-<boardname>.dts.  Also the name of imx28-m28evk and imx28-tx28
> look a little redundant on "28".

But at least it's quite consistent and it's easy to locate your board since you 
usually know the cpu type. If you shove in just <boardname>.dts, it'll soon 
become horrible mess.

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree
  2012-07-10 15:51           ` Marek Vasut
@ 2012-07-10 16:08             ` Shawn Guo
  2012-07-10 16:26               ` Marek Vasut
  0 siblings, 1 reply; 20+ messages in thread
From: Shawn Guo @ 2012-07-10 16:08 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Jul 10, 2012 at 05:51:12PM +0200, Marek Vasut wrote:
> But at least it's quite consistent and it's easy to locate your board since you 
> usually know the cpu type. If you shove in just <boardname>.dts, it'll soon 
> become horrible mess.
> 
Ok, I could send a follow-up patch to rename the files.  But the
compatible string of the board will stay as the board name.

-- 
Regards,
Shawn

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree
  2012-07-10 16:08             ` Shawn Guo
@ 2012-07-10 16:26               ` Marek Vasut
  0 siblings, 0 replies; 20+ messages in thread
From: Marek Vasut @ 2012-07-10 16:26 UTC (permalink / raw)
  To: linux-arm-kernel

Dear Shawn Guo,

> On Tue, Jul 10, 2012 at 05:51:12PM +0200, Marek Vasut wrote:
> > But at least it's quite consistent and it's easy to locate your board
> > since you usually know the cpu type. If you shove in just
> > <boardname>.dts, it'll soon become horrible mess.
> 
> Ok, I could send a follow-up patch to rename the files.  But the
> compatible string of the board will stay as the board name.

The compatible string is all right, my concern is just the mess in the file 
names. Look at imx{51,53,6q}, kirkwood, tegra20, ... let's make it nicely at the 
begining, it's just a matter of simple git mv and git commit --amend ;-)

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2012-07-10 16:26 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-10  5:36 [PATCH v2 0/7] Convert mxs board files to device tree Shawn Guo
2012-07-10  5:36 ` [PATCH v2 1/7] ARM: dts: imx28: move extra gpmi-nand pins into board dts Shawn Guo
2012-07-10  5:36 ` [PATCH v2 2/7] ARM: dts: imx28: move lcdif control " Shawn Guo
2012-07-10  5:36 ` [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree Shawn Guo
2012-07-10  7:20   ` Marek Vasut
2012-07-10  7:24     ` Shawn Guo
2012-07-10  8:32       ` Marek Vasut
2012-07-10 15:23     ` Shawn Guo
2012-07-10 15:37       ` Marek Vasut
2012-07-10 15:45         ` Shawn Guo
2012-07-10 15:51           ` Marek Vasut
2012-07-10 16:08             ` Shawn Guo
2012-07-10 16:26               ` Marek Vasut
2012-07-10  5:36 ` [PATCH v2 4/7] ARM: mxs: convert apx4devkit " Shawn Guo
2012-07-10  5:36 ` [PATCH v2 5/7] ARM: mxs: convert tx28 " Shawn Guo
2012-07-10 15:37   ` Shawn Guo
2012-07-10  5:36 ` [PATCH v2 6/7] ARM: mxs: convert stmp378x_devb " Shawn Guo
2012-07-10  5:36 ` [PATCH v2 7/7] ARM: mxs: add dtb-y target into Makefile.boot Shawn Guo
2012-07-10  5:38 ` [PATCH v2 3/7] ARM: mxs: convert m28evk board to device tree Shawn Guo
2012-07-10  5:39 ` [PATCH v2 6/7] ARM: mxs: convert stmp378x_devb " Shawn Guo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.