Patchwork [U-Boot,4/7] mxc_nand: add support for i.MX35 processor

login
register
mail settings
Submitter Stefano Babic
Date Jan. 14, 2011, 1:35 p.m.
Message ID <1295012124-15551-4-git-send-email-sbabic@denx.de>
Download mbox | patch
Permalink /patch/78905/
State Accepted
Commit 58c758fe5a632e955c94f203f245bd79a64f9bbc
Delegated to: Stefano Babic
Headers show

Comments

Stefano Babic - Jan. 14, 2011, 1:35 p.m.
Signed-off-by: Stefano Babic <sbabic@denx.de>
---
 drivers/mtd/nand/mxc_nand.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Scott Wood - Jan. 14, 2011, 6:33 p.m.
On Fri, 14 Jan 2011 14:35:21 +0100
Stefano Babic <sbabic@denx.de> wrote:

> Signed-off-by: Stefano Babic <sbabic@denx.de>
> ---
>  drivers/mtd/nand/mxc_nand.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

Acked-by: Scott Wood <scottwood@freescale.com>

-Scott

Patch

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index ec71cfc..2a8dd7e 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -22,7 +22,7 @@ 
 #include <nand.h>
 #include <linux/err.h>
 #include <asm/io.h>
-#if defined(CONFIG_MX25) || defined(CONFIG_MX27)
+#if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX35)
 #include <asm/arch/imx-regs.h>
 #endif
 
@@ -50,7 +50,7 @@ 
  */
 #if defined(CONFIG_MX31) || defined(CONFIG_MX27)
 #define MXC_NFC_V1
-#elif defined(CONFIG_MX25)
+#elif defined(CONFIG_MX25) || defined(CONFIG_MX35)
 #define MXC_NFC_V1_1
 #else
 #warning "MXC NFC version not defined"
@@ -265,7 +265,7 @@  static int is_16bit_nand(void)
 	else
 		return 0;
 }
-#elif defined(CONFIG_MX25)
+#elif defined(CONFIG_MX25) || defined(CONFIG_MX35)
 static int is_16bit_nand(void)
 {
 	struct ccm_regs *ccm =