From: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 11/13] mxc nand: Let driver detect IP revision
Date: Mon, 13 Aug 2012 22:50:42 +0200 (CEST) [thread overview]
Message-ID: <716411359.2375004.1344891042122.JavaMail.root@advansee.com> (raw)
In-Reply-To: <1580773374.2374979.1344890876408.JavaMail.root@advansee.com>
There is no reason to have board configs to select the NFC IP revision. Just let
the driver detect it. BTW, remove broken NFC IP revision configs from board
config files.
Signed-off-by: Beno?t Th?baudeau <benoit.thebaudeau@advansee.com>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
---
.../include/configs/flea3.h | 1 -
.../include/configs/mx35pdk.h | 1 -
.../include/configs/tx25.h | 1 -
.../include/fsl_nfc.h | 8 +++-----
4 files changed, 3 insertions(+), 8 deletions(-)
diff --git u-boot-4d3c95f.orig/include/configs/flea3.h u-boot-4d3c95f/include/configs/flea3.h
index 46939d4..43cadbc 100644
--- u-boot-4d3c95f.orig/include/configs/flea3.h
+++ u-boot-4d3c95f/include/configs/flea3.h
@@ -221,7 +221,6 @@
* NAND FLASH driver setup
*/
#define CONFIG_NAND_MXC
-#define CONFIG_NAND_MXC_V1_1
#define CONFIG_MXC_NAND_REGS_BASE (NFC_BASE_ADDR)
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE (NFC_BASE_ADDR)
diff --git u-boot-4d3c95f.orig/include/configs/mx35pdk.h u-boot-4d3c95f/include/configs/mx35pdk.h
index 6eb5da5..93a9dd7 100644
--- u-boot-4d3c95f.orig/include/configs/mx35pdk.h
+++ u-boot-4d3c95f/include/configs/mx35pdk.h
@@ -239,7 +239,6 @@
* NAND FLASH driver setup
*/
#define CONFIG_NAND_MXC
-#define CONFIG_NAND_MXC_V1_1
#define CONFIG_MXC_NAND_REGS_BASE (NFC_BASE_ADDR)
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE (NFC_BASE_ADDR)
diff --git u-boot-4d3c95f.orig/include/configs/tx25.h u-boot-4d3c95f/include/configs/tx25.h
index 6821528..870e863 100644
--- u-boot-4d3c95f.orig/include/configs/tx25.h
+++ u-boot-4d3c95f/include/configs/tx25.h
@@ -108,7 +108,6 @@
/* NAND */
#define CONFIG_NAND_MXC
-#define CONFIG_NAND_MXC_V1_1
#define CONFIG_MXC_NAND_REGS_BASE (0xBB000000)
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE (0xBB000000)
diff --git u-boot-4d3c95f.orig/include/fsl_nfc.h u-boot-4d3c95f/include/fsl_nfc.h
index c248cef..6618089 100644
--- u-boot-4d3c95f.orig/include/fsl_nfc.h
+++ u-boot-4d3c95f/include/fsl_nfc.h
@@ -42,10 +42,12 @@
*/
#if defined(CONFIG_MX27) || defined(CONFIG_MX31)
#define MXC_NFC_V1
+#define is_mxc_nfc_11() 0
#elif defined(CONFIG_MX25) || defined(CONFIG_MX35)
#define MXC_NFC_V1_1
+#define is_mxc_nfc_11() 1
#else
-#warning "MXC NFC version not defined"
+#error "MXC NFC implementation not supported"
#endif
#if defined(MXC_NFC_V1)
@@ -53,14 +55,10 @@
#define NAND_MXC_SPARE_BUF_SIZE 16
#define NAND_MXC_REG_OFFSET 0xe00
#define NAND_MXC_2K_MULTI_CYCLE
-#define is_mxc_nfc_11() 0
#elif defined(MXC_NFC_V1_1)
#define NAND_MXC_NR_BUFS 8
#define NAND_MXC_SPARE_BUF_SIZE 64
#define NAND_MXC_REG_OFFSET 0x1e00
-#define is_mxc_nfc_11() 1
-#else
-#error "define CONFIG_NAND_MXC_VXXX to use the mxc nand driver"
#endif
struct fsl_nfc_regs {
next prev parent reply other threads:[~2012-08-13 20:50 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-13 20:47 [U-Boot] [PATCH 00/13] mxc nand: Add support for i.MX5 Benoît Thébaudeau
2012-08-13 20:48 ` [U-Boot] [PATCH 01/13] mxc nand: Merge mtd and spl register definitions Benoît Thébaudeau
2012-08-14 8:37 ` Stefano Babic
2012-08-14 10:15 ` Benoît Thébaudeau
2012-08-14 10:46 ` Stefano Babic
2012-08-14 11:13 ` Benoît Thébaudeau
2012-08-14 14:02 ` Stefano Babic
2012-08-14 14:29 ` Benoît Thébaudeau
2012-08-15 18:11 ` Benoît Thébaudeau
2012-08-16 7:27 ` Stefano Babic
2012-08-14 16:01 ` Scott Wood
2012-08-13 20:48 ` [U-Boot] [PATCH 02/13] mxc nand: cosmectic: Light cleanup Benoît Thébaudeau
2012-08-14 8:41 ` Stefano Babic
2012-08-13 20:48 ` [U-Boot] [PATCH 03/13] spl mxc nand: Merge duplicated code Benoît Thébaudeau
2012-08-14 9:25 ` Stefano Babic
2012-08-13 20:49 ` [U-Boot] [PATCH 04/13] spl mxc nand: Remove " Benoît Thébaudeau
2012-08-13 20:49 ` [U-Boot] [PATCH 05/13] spl mxc nand: Set symmetric mode Benoît Thébaudeau
2012-08-13 20:49 ` [U-Boot] [PATCH 06/13] mxc nand: Access all ecc_status_result fields Benoît Thébaudeau
2012-09-18 0:39 ` Scott Wood
2012-09-18 0:50 ` Scott Wood
2012-08-13 20:49 ` [U-Boot] [PATCH 07/13] spl mxc nand: Fix broken boot for correctable ECC errors Benoît Thébaudeau
2012-08-13 20:50 ` [U-Boot] [PATCH 08/13] mtd mxc nand: Use _mxc_nand_enable_hwecc() Benoît Thébaudeau
2012-08-14 8:50 ` Stefano Babic
2012-08-14 10:04 ` Benoît Thébaudeau
2012-08-13 20:50 ` [U-Boot] [PATCH 09/13] mtd mxc nand: Fix ECC state after read_page_raw_syndrome() Benoît Thébaudeau
2012-08-13 20:50 ` [U-Boot] [PATCH 10/13] mtd mxc nand: Merge init functions Benoît Thébaudeau
2012-08-13 20:50 ` Benoît Thébaudeau [this message]
2012-08-14 9:28 ` [U-Boot] [PATCH 11/13] mxc nand: Let driver detect IP revision Stefano Babic
2012-08-13 20:50 ` [U-Boot] [PATCH 12/13] mxc nand: Homogenize IP revisions with Linux Benoît Thébaudeau
2012-08-13 20:51 ` [U-Boot] [PATCH 13/13] mxc nand: Add support for i.MX5 Benoît Thébaudeau
2012-08-13 21:04 ` Troy Kisky
2012-08-13 21:06 ` Troy Kisky
2012-08-21 21:04 ` [U-Boot] [PATCH v2 " Benoît Thébaudeau
2012-08-21 21:21 ` Scott Wood
2012-09-18 0:36 ` Scott Wood
2012-09-18 18:11 ` Tom Rini
2012-11-15 22:22 ` Scott Wood
2012-11-16 20:15 ` Benoît Thébaudeau
2012-11-16 20:18 ` Scott Wood
2012-11-16 20:19 ` Scott Wood
2012-11-16 20:28 ` Benoît Thébaudeau
2012-11-17 0:01 ` Scott Wood
2012-11-17 1:43 ` Benoît Thébaudeau
2012-11-20 23:03 ` Scott Wood
2012-11-20 23:31 ` Benoît Thébaudeau
2012-11-17 18:37 ` Fabio Estevam
2012-11-20 20:33 ` Matt Sealey
2012-09-18 1:01 ` Scott Wood
2012-09-18 10:18 ` Benoît Thébaudeau
2012-09-18 1:19 ` [U-Boot] [PATCH 00/13] " Scott Wood
2013-01-07 13:02 ` Marek Vasut
2013-01-07 13:37 ` Benoît Thébaudeau
2013-01-07 13:47 ` Marek Vasut
2013-01-08 0:49 ` Scott Wood
2013-01-08 6:59 ` Marek Vasut
2013-01-07 14:36 ` Fabio Estevam
2013-01-07 15:08 ` Marek Vasut
2013-01-07 15:30 ` Benoît Thébaudeau
2013-01-07 15:33 ` Marek Vasut
2013-01-07 16:42 ` Marek Vasut
2013-01-07 16:55 ` Benoît Thébaudeau
2013-01-08 7:15 ` Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=716411359.2375004.1344891042122.JavaMail.root@advansee.com \
--to=benoit.thebaudeau@advansee.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox