[PATCH 0/3] mx25: NAND support

[PATCH 0/3] mx25: NAND support

[Baruch Siach]

This patch series add support for NAND chips on the i.MX25 platform, using the 
recently merged support for this platform in the mxc_nand driver.

I tested this code on the i.MX25 PDK platform.

Baruch Siach (3):
  mtd: mxc_nand: add MX25 to Kconfig
  mx25: add NAND support
  mx25pdk: add NAND device support

 arch/arm/mach-mx25/devices.c          |   20 ++++++++++++++++++++
 arch/arm/mach-mx25/devices.h          |    1 +
 arch/arm/mach-mx25/mx25pdk.c          |    7 +++++++
 arch/arm/plat-mxc/include/mach/mx25.h |    2 ++
 drivers/mtd/nand/Kconfig              |    2 +-
 5 files changed, 31 insertions(+), 1 deletions(-)

[PATCH 1/3] mtd: mxc_nand: add MX25 to Kconfig

[Baruch Siach]

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 drivers/mtd/nand/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 677cd53..4f99274 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -444,7 +444,7 @@ config MTD_NAND_FSL_UPM
 
 config MTD_NAND_MXC
 	tristate "MXC NAND support"
-	depends on ARCH_MX2 || ARCH_MX3
+	depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3
 	help
 	  This enables the driver for the NAND flash controller on the
 	  MXC processors.
-- 
1.6.5

[PATCH 2/3] mx25: add NAND support

[Baruch Siach]

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 arch/arm/mach-mx25/devices.c          |   20 ++++++++++++++++++++
 arch/arm/mach-mx25/devices.h          |    1 +
 arch/arm/plat-mxc/include/mach/mx25.h |    2 ++
 3 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-mx25/devices.c b/arch/arm/mach-mx25/devices.c
index 9fdeea1..dd40697 100644
--- a/arch/arm/mach-mx25/devices.c
+++ b/arch/arm/mach-mx25/devices.c
@@ -438,3 +438,23 @@ struct platform_device mx25_fec_device = {
 	.num_resources	= ARRAY_SIZE(mx25_fec_resources),
 	.resource	= mx25_fec_resources,
 };
+
+static struct resource mxc_nand_resources[] = {
+	{
+		.start	= MX25_NFC_BASE_ADDR,
+		.end	= MX25_NFC_BASE_ADDR + 0x1fff,
+		.flags	= IORESOURCE_MEM,
+	},
+	{
+		.start	= MX25_INT_NANDFC,
+		.end	= MX25_INT_NANDFC,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device mxc_nand_device = {
+	.name		= "mxc_nand",
+	.id		= 0,
+	.num_resources	= ARRAY_SIZE(mxc_nand_resources),
+	.resource	= mxc_nand_resources,
+};
diff --git a/arch/arm/mach-mx25/devices.h b/arch/arm/mach-mx25/devices.h
index fe5420f..8f55300 100644
--- a/arch/arm/mach-mx25/devices.h
+++ b/arch/arm/mach-mx25/devices.h
@@ -18,3 +18,4 @@ extern struct platform_device mxc_i2c_device0;
 extern struct platform_device mxc_i2c_device1;
 extern struct platform_device mxc_i2c_device2;
 extern struct platform_device mx25_fec_device;
+extern struct platform_device mxc_nand_device;
diff --git a/arch/arm/plat-mxc/include/mach/mx25.h b/arch/arm/plat-mxc/include/mach/mx25.h
index 854e2dc..58e0bd3 100644
--- a/arch/arm/plat-mxc/include/mach/mx25.h
+++ b/arch/arm/plat-mxc/include/mach/mx25.h
@@ -42,7 +42,9 @@
 #define UART2_BASE_ADDR			0x43f94000
 
 #define MX25_FEC_BASE_ADDR		0x50038000
+#define MX25_NFC_BASE_ADDR		0xbb000000
 
 #define MX25_INT_FEC	57
+#define MX25_INT_NANDFC	33
 
 #endif /* __MACH_MX25_H__ */
-- 
1.6.5

[PATCH 3/3] mx25pdk: add NAND device support

[Baruch Siach]

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 arch/arm/mach-mx25/mx25pdk.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-mx25/mx25pdk.c b/arch/arm/mach-mx25/mx25pdk.c
index 921bc99..c8b1d3b 100644
--- a/arch/arm/mach-mx25/mx25pdk.c
+++ b/arch/arm/mach-mx25/mx25pdk.c
@@ -77,6 +77,12 @@ static void __init mx25pdk_fec_reset(void)
 	gpio_set_value(FEC_RESET_B_GPIO, 1);
 }
 
+static struct mxc_nand_platform_data mx25pdk_nand_board_info = {
+	.width		= 1,
+	.hw_ecc		= 1,
+	.flash_bbt	= 1,
+};
+
 static void __init mx25pdk_init(void)
 {
 	mxc_iomux_v3_setup_multiple_pads(mx25pdk_pads,
@@ -84,6 +90,7 @@ static void __init mx25pdk_init(void)
 
 	mxc_register_device(&mxc_uart_device0, &uart_pdata);
 	mxc_register_device(&mxc_usbh2, NULL);
+	mxc_register_device(&mxc_nand_device, &mx25pdk_nand_board_info);
 
 	mx25pdk_fec_reset();
 	mxc_register_device(&mx25_fec_device, &mx25_fec_pdata);
-- 
1.6.5

[PATCH 0/3] mx25: NAND support

[Sascha Hauer]

On Thu, Jan 14, 2010 at 11:24:12AM +0200, Baruch Siach wrote:
> This patch series add support for NAND chips on the i.MX25 platform, using the 
> recently merged support for this platform in the mxc_nand driver.
> 
> I tested this code on the i.MX25 PDK platform.
> 
> Baruch Siach (3):
>   mtd: mxc_nand: add MX25 to Kconfig
>   mx25: add NAND support
>   mx25pdk: add NAND device support

Ok, added to mxc-master.

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 |

[PATCH 0/3] mx25: NAND support

[Baruch Siach]

Hi Sascha,

On Thu, Jan 14, 2010 at 11:24:40AM +0100, Sascha Hauer wrote:
> On Thu, Jan 14, 2010 at 11:24:12AM +0200, Baruch Siach wrote:
> > This patch series add support for NAND chips on the i.MX25 platform, using the 
> > recently merged support for this platform in the mxc_nand driver.
> > 
> > I tested this code on the i.MX25 PDK platform.
> > 
> > Baruch Siach (3):
> >   mtd: mxc_nand: add MX25 to Kconfig
> >   mx25: add NAND support
> >   mx25pdk: add NAND device support
> 
> Ok, added to mxc-master.

Should these patches be visible in the mxc-master of the imx/linux-2.6.git 
tree? I don't see them there.

baruch

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[PATCH 0/3] mx25: NAND support

[Sascha Hauer]

On Thu, Jan 21, 2010 at 03:47:16PM +0200, Baruch Siach wrote:
> Hi Sascha,
> 
> On Thu, Jan 14, 2010 at 11:24:40AM +0100, Sascha Hauer wrote:
> > On Thu, Jan 14, 2010 at 11:24:12AM +0200, Baruch Siach wrote:
> > > This patch series add support for NAND chips on the i.MX25 platform, using the 
> > > recently merged support for this platform in the mxc_nand driver.
> > > 
> > > I tested this code on the i.MX25 PDK platform.
> > > 
> > > Baruch Siach (3):
> > >   mtd: mxc_nand: add MX25 to Kconfig
> > >   mx25: add NAND support
> > >   mx25pdk: add NAND device support
> > 
> > Ok, added to mxc-master.
> 
> Should these patches be visible in the mxc-master of the imx/linux-2.6.git 
> tree? I don't see them there.

I forgot to push. Try again please.

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 |