Skip to contentSkip to conversation

m25p80: re-import it againt mtd_add_host

PATCH Applied Jean-Christophe PLAGNIOL-VILLARD 2 participants 11 messages Oct 31, 2012 – Nov 20, 2012

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover m25p80: re-import it againt mtd_add_host

Hi,

so we now create the cdev via mtd

This will also simplify sync with linux

to avoid the m25p8000 or m25p00 the cdev is still named name m25p and the drivers m25p80

sync with linux too

this patch series is agianst mtd_dataflash support

The following changes since commit 9428c386f876fa3a8871eeea4725a805cea5c367:

mtd: add dataflash support (2012-10-31 04:48:39 +0800)

are available in the git repository at:

git://git.jcrosoft.org/barebox.git delivery/m25p80

for you to fetch changes up to 35b8b98230dbcfe25973d5ed52a874027b4f3f05:

m25p80: sync flash support with the kernel (2012-10-31 04:51:08 +0800)

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (2):
m25p80: re-import it againt mtd_add_host
m25p80: sync flash support with the kernel

 arch/arm/boards/freescale-mx6-sabrelite/board.c |    2 +-
 drivers/mtd/devices/Kconfig                     |   27 ++++++++++++
 drivers/mtd/devices/Makefile                    |    1 +
 drivers/{nor => mtd/devices}/m25p80.c           |  512 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------
 drivers/nor/Kconfig                             |   27 ------------
 drivers/nor/Makefile                            |    1 -
 drivers/nor/m25p80.h                            |   84 ------------------------------------
 include/linux/mtd/cfi.h                         |   65 ++++++++++++++++++++++++++++
 8 files changed, 371 insertions(+), 348 deletions(-)
 rename drivers/{nor => mtd/devices}/m25p80.c (65%)
 delete mode 100644 drivers/nor/m25p80.h
 create mode 100644 include/linux/mtd/cfi.h

Best Regards,
J.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

#2 lore raw

PATCH 2/2 m25p80: sync flash support with the kernel

In reply to Jean-Christophe PLAGNIOL-VILLARD
---
 drivers/mtd/devices/m25p80.c |   42 +++++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)
drivers/mtd/devices/m25p80.c +33 -9
index b4ac045..428d126 100644
@@ -622,6 +622,7 @@ static const struct spi_device_id m25p_ids[] = {
 	{ "at25fs040",  INFO(0x1f6604, 0, 64 * 1024,   8, SECT_4K) },
 
 	{ "at25df041a", INFO(0x1f4401, 0, 64 * 1024,   8, SECT_4K) },
+	{ "at25df321a", INFO(0x1f4701, 0, 64 * 1024,  64, SECT_4K) },
 	{ "at25df641",  INFO(0x1f4800, 0, 64 * 1024, 128, SECT_4K) },
 
 	{ "at26f004",   INFO(0x1f0400, 0, 64 * 1024,  8, SECT_4K) },
@@ -629,19 +630,29 @@ static const struct spi_device_id m25p_ids[] = {
 	{ "at26df161a", INFO(0x1f4601, 0, 64 * 1024, 32, SECT_4K) },
 	{ "at26df321",  INFO(0x1f4700, 0, 64 * 1024, 64, SECT_4K) },
 
+	{ "at45db081d", INFO(0x1f2500, 0, 64 * 1024, 16, SECT_4K) },
+
 	/* EON -- en25xxx */
 	{ "en25f32", INFO(0x1c3116, 0, 64 * 1024,  64, SECT_4K) },
 	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
+	{ "en25q32b", INFO(0x1c3016, 0, 64 * 1024,  64, 0) },
 	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
+	{ "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) },
+
+	/* Everspin */
+	{ "mr25h256", CAT25_INFO(  32 * 1024, 1, 256, 2) },
 
 	/* Intel/Numonyx -- xxxs33b */
 	{ "160s33b",  INFO(0x898911, 0, 64 * 1024,  32, 0) },
 	{ "320s33b",  INFO(0x898912, 0, 64 * 1024,  64, 0) },
 	{ "640s33b",  INFO(0x898913, 0, 64 * 1024, 128, 0) },
+	{ "n25q064",  INFO(0x20ba17, 0, 64 * 1024, 128, 0) },
 
 	/* Macronix */
+	{ "mx25l2005a",  INFO(0xc22012, 0, 64 * 1024,   4, SECT_4K) },
 	{ "mx25l4005a",  INFO(0xc22013, 0, 64 * 1024,   8, SECT_4K) },
 	{ "mx25l8005",   INFO(0xc22014, 0, 64 * 1024,  16, 0) },
+	{ "mx25l1606e",  INFO(0xc22015, 0, 64 * 1024,  32, SECT_4K) },
 	{ "mx25l3205d",  INFO(0xc22016, 0, 64 * 1024,  64, 0) },
 	{ "mx25l6405d",  INFO(0xc22017, 0, 64 * 1024, 128, 0) },
 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
@@ -649,19 +660,28 @@ static const struct spi_device_id m25p_ids[] = {
 	{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
 	{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
 
+	/* Micron */
+	{ "n25q128",  INFO(0x20ba18, 0, 64 * 1024, 256, 0) },
+	{ "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) },
+
 	/* Spansion -- single (large) sector size only, at least
 	 * for the chips listed here (without boot sectors).
 	 */
+	{ "s25sl032p",  INFO(0x010215, 0x4d00,  64 * 1024,  64, 0) },
+	{ "s25sl064p",  INFO(0x010216, 0x4d00,  64 * 1024, 128, 0) },
+	{ "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, 0) },
+	{ "s25fl256s1", INFO(0x010219, 0x4d01,  64 * 1024, 512, 0) },
+	{ "s25fl512s",  INFO(0x010220, 0x4d00, 256 * 1024, 256, 0) },
+	{ "s70fl01gs",  INFO(0x010221, 0x4d00, 256 * 1024, 256, 0) },
+	{ "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024,  64, 0) },
+	{ "s25sl12801", INFO(0x012018, 0x0301,  64 * 1024, 256, 0) },
+	{ "s25fl129p0", INFO(0x012018, 0x4d00, 256 * 1024,  64, 0) },
+	{ "s25fl129p1", INFO(0x012018, 0x4d01,  64 * 1024, 256, 0) },
 	{ "s25sl004a",  INFO(0x010212,      0,  64 * 1024,   8, 0) },
 	{ "s25sl008a",  INFO(0x010213,      0,  64 * 1024,  16, 0) },
 	{ "s25sl016a",  INFO(0x010214,      0,  64 * 1024,  32, 0) },
 	{ "s25sl032a",  INFO(0x010215,      0,  64 * 1024,  64, 0) },
-	{ "s25sl032p",  INFO(0x010215, 0x4d00,  64 * 1024,  64, SECT_4K) },
 	{ "s25sl064a",  INFO(0x010216,      0,  64 * 1024, 128, 0) },
-	{ "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024,  64, 0) },
-	{ "s25sl12801", INFO(0x012018, 0x0301,  64 * 1024, 256, 0) },
-	{ "s25fl129p0", INFO(0x012018, 0x4d00, 256 * 1024,  64, 0) },
-	{ "s25fl129p1", INFO(0x012018, 0x4d01,  64 * 1024, 256, 0) },
 	{ "s25fl016k",  INFO(0xef4015,      0,  64 * 1024,  32, SECT_4K) },
 	{ "s25fl064k",  INFO(0xef4017,      0,  64 * 1024, 128, SECT_4K) },
 
@@ -685,6 +705,7 @@ static const struct spi_device_id m25p_ids[] = {
 	{ "m25p32",  INFO(0x202016,  0,  64 * 1024,  64, 0) },
 	{ "m25p64",  INFO(0x202017,  0,  64 * 1024, 128, 0) },
 	{ "m25p128", INFO(0x202018,  0, 256 * 1024,  64, 0) },
+	{ "n25q032", INFO(0x20ba16,  0,  64 * 1024,  64, 0) },
 
 	{ "m25p05-nonjedec",  INFO(0, 0,  32 * 1024,   2, 0) },
 	{ "m25p10-nonjedec",  INFO(0, 0,  32 * 1024,   4, 0) },
@@ -700,10 +721,14 @@ static const struct spi_device_id m25p_ids[] = {
 	{ "m45pe80", INFO(0x204014,  0, 64 * 1024,   16, 0) },
 	{ "m45pe16", INFO(0x204015,  0, 64 * 1024,   32, 0) },
 
+	{ "m25pe20", INFO(0x208012,  0, 64 * 1024,  4,       0) },
 	{ "m25pe80", INFO(0x208014,  0, 64 * 1024, 16,       0) },
 	{ "m25pe16", INFO(0x208015,  0, 64 * 1024, 32, SECT_4K) },
 
-	{ "m25px64", INFO(0x207117,  0, 64 * 1024, 128, 0) },
+	{ "m25px32",    INFO(0x207116,  0, 64 * 1024, 64, SECT_4K) },
+	{ "m25px32-s0", INFO(0x207316,  0, 64 * 1024, 64, SECT_4K) },
+	{ "m25px32-s1", INFO(0x206316,  0, 64 * 1024, 64, SECT_4K) },
+	{ "m25px64",    INFO(0x207117,  0, 64 * 1024, 128, 0) },
 
 	/* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */
 	{ "w25x10", INFO(0xef3011, 0, 64 * 1024,  2,  SECT_4K) },
@@ -713,8 +738,10 @@ static const struct spi_device_id m25p_ids[] = {
 	{ "w25x16", INFO(0xef3015, 0, 64 * 1024,  32, SECT_4K) },
 	{ "w25x32", INFO(0xef3016, 0, 64 * 1024,  64, SECT_4K) },
 	{ "w25q32", INFO(0xef4016, 0, 64 * 1024,  64, SECT_4K) },
+	{ "w25q32dw", INFO(0xef6016, 0, 64 * 1024,  64, SECT_4K) },
 	{ "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
 	{ "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
+	{ "w25q80", INFO(0xef5014, 0, 64 * 1024,  16, SECT_4K) },
 
 	/* Catalyst / On Semiconductor -- non-JEDEC */
 	{ "cat25c11", CAT25_INFO(  16, 8, 16, 1) },
@@ -722,9 +749,6 @@ static const struct spi_device_id m25p_ids[] = {
 	{ "cat25c09", CAT25_INFO( 128, 8, 32, 2) },
 	{ "cat25c17", CAT25_INFO( 256, 8, 32, 2) },
 	{ "cat25128", CAT25_INFO(2048, 8, 64, 2) },
-
-	/* Micron */
-	{ "n25q128", INFO(0x20ba18, 0, 64 * 1024, 256, 0) },
 	{ },
 };
 
Signature · 7 lines
1.7.10.4


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#1 lore raw

PATCH 1/2 m25p80: re-import it againt mtd_add_host

In reply to Jean-Christophe PLAGNIOL-VILLARD

so we now create the cdev via mtd

This will also simplify sync with linux

to avoid the m25p8000 or m25p00 the cdev is still named name m25p and the drivers m25p80

---
 arch/arm/boards/freescale-mx6-sabrelite/board.c |    2 +-
 drivers/mtd/devices/Kconfig                     |   27 ++
 drivers/mtd/devices/Makefile                    |    1 +
 drivers/{nor => mtd/devices}/m25p80.c           |  470 ++++++++++++-----------
 drivers/nor/Kconfig                             |   27 --
 drivers/nor/Makefile                            |    1 -
 drivers/nor/m25p80.h                            |   84 ----
 include/linux/mtd/cfi.h                         |   65 ++++
 8 files changed, 338 insertions(+), 339 deletions(-)
 rename drivers/{nor => mtd/devices}/m25p80.c (69%)
 delete mode 100644 drivers/nor/m25p80.h
 create mode 100644 include/linux/mtd/cfi.h
arch/arm/boards/freescale-mx6-sabrelite/board.c +1 -1
index 25402d7..1c1ae56 100644
@@ -209,7 +209,7 @@ static struct spi_imx_master sabrelite_spi_0_data = {
 
 static const struct spi_board_info sabrelite_spi_board_info[] = {
 	{
-		.name = "m25p",
+		.name = "m25p80",
 		.max_speed_hz = 40000000,
 		.bus_num = 0,
 		.chip_select = 0,
drivers/mtd/devices/Kconfig +27 -0
index e956921..679ea80 100644
@@ -19,6 +19,33 @@ config MTD_DATAFLASH_WRITE_VERIFY
 	  device thinks the write was successful, a bit could have been
 	  flipped accidentally due to device wear or something else.
 
+config MTD_M25P80
+	tristate "Support most SPI Flash chips (AT26DF, M25P, W25X, ...)"
+	depends on SPI
+	help
+	  This enables access to most modern SPI flash chips, used for
+	  program and data storage.   Series supported include Atmel AT26DF,
+	  Spansion S25SL, SST 25VF, ST M25P, and Winbond W25X.  Other chips
+	  are supported as well.  See the driver source for the current list,
+	  or to add other chips.
+
+	  Note that the original DataFlash chips (AT45 series, not AT26DF),
+	  need an entirely different driver.
+
+	  Set up your spi devices with the right board-specific platform data,
+	  if you want to specify device partitioning or to use a device which
+	  doesn't support the JEDEC ID instruction.
+
+config MTD_SST25L
+	tristate "Support SST25L (non JEDEC) SPI Flash chips"
+	depends on MTD_M25P80
+	help
+	  This enables access to the non JEDEC SST25L SPI flash chips, used
+	  for program and data storage.
+
+	  Set up your spi devices with the right board-specific platform data,
+	  if you want to specify device partitioning.
+
 config MTD_DOCG3
 	bool "M-Systems Disk-On-Chip G3"
 	select BCH
drivers/mtd/devices/Makefile +1 -0
index d7e27d1..bf1f8a9 100644
@@ -4,3 +4,4 @@
 
 obj-$(CONFIG_MTD_DATAFLASH)	+= mtd_dataflash.o
 obj-$(CONFIG_MTD_DOCG3)		+= docg3.o
+obj-$(CONFIG_MTD_M25P80)	+= m25p80.o
drivers/mtd/devices/m25p80.c renamed from drivers/nor/m25p80.c +244 -226

751 lines not on this page · raw message

drivers/nor/Kconfig +0 -27
index 8652d27..a3c0223 100644
@@ -56,31 +56,4 @@ config CFI_BUFFER_WRITE
 
 endif
 
-config MTD_M25P80
-	tristate "SPI Flash chips (AT26DF, M25P, W25X, ...)"
-	depends on SPI
-	help
-	  This enables access to most modern SPI flash chips, used for
-	  program and data storage.   Series supported include Atmel AT26DF,
-	  Spansion S25SL, SST 25VF, ST M25P, and Winbond W25X.  Other chips
-	  are supported as well.  See the driver source for the current list,
-	  or to add other chips.
-
-	  Note that the original DataFlash chips (AT45 series, not AT26DF),
-	  need an entirely different driver.
-
-	  Set up your spi devices with the right board-specific platform data,
-	  if you want to specify device partitioning or to use a device which
-	  doesn't support the JEDEC ID instruction.
-
-config MTD_SST25L
-	tristate "Support SST25L (non JEDEC) SPI Flash chips"
-	depends on MTD_M25P80
-	help
-	  This enables access to the non JEDEC SST25L SPI flash chips, used
-	  for program and data storage.
-
-	  Set up your spi devices with the right board-specific platform data,
-	  if you want to specify device partitioning.
-
 endmenu
drivers/nor/Makefile +0 -1
index d676c55..d255043 100644
@@ -1,5 +1,4 @@
 obj-$(CONFIG_DRIVER_CFI) += cfi_flash.o
 obj-$(CONFIG_DRIVER_CFI_INTEL) += cfi_flash_intel.o
 obj-$(CONFIG_DRIVER_CFI_AMD) += cfi_flash_amd.o
-obj-$(CONFIG_MTD_M25P80) += m25p80.o
 
drivers/nor/m25p80.h deleted +0 -84

84 lines not on this page · raw message

include/linux/mtd/cfi.h new file +65 -0

65 lines not on this page · raw message

Signature · 7 lines
1.7.10.4


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#3 lore raw
In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 13 lines · Jean-Christophe PLAGNIOL-VILLARD

Hi,

so we now create the cdev via mtd

This will also simplify sync with linux

to avoid the m25p8000 or m25p00 the cdev is still named name m25p and the drivers m25p80

sync with linux too

this patch series is agianst mtd_dataflash support

Quoted 7 lines

The following changes since commit 9428c386f876fa3a8871eeea4725a805cea5c367:

mtd: add dataflash support (2012-10-31 04:48:39 +0800)

are available in the git repository at:

git://git.jcrosoft.org/barebox.git delivery/m25p80

Sometimes I get the feeling that you do this only to break other peoples setup:

barebox@Sabre Lite:/ saveenv
saving environment
prefetch abort

pc : [<00000004>]    lr : [<4fc099eb>]

sp : 4bbff8e0 ip : 00000000 fp : 00000000
r10: 00000000 r9 : 00000000 r8 : 00000000
r7 : 00080000 r6 : 4bbff8e0 r5 : 00080000 r4 : 4bc0bc68
r3 : 00000000 r2 : 00080000 r1 : 00000000 r0 : 4bc0bc68
Flags: nZCv IRQs off FIQs off Mode SVC_32
[<4fc099eb>] (mtd_erase+0x2b/0x60) from [<4fc157cd>] (devfs_erase+0x41/0x54) [<4fc157cd>] (devfs_erase+0x41/0x54) from [<4fc1716f>] (erase+0x6f/0x8c) [<4fc1716f>] (erase+0x6f/0x8c) from [<4fc0e307>] (do_saveenv+0x7b/0x100) [<4fc0e307>] (do_saveenv+0x7b/0x100) from [<4fc0588d>] (execute_command+0x21/0x4c) [<4fc0588d>] (execute_command+0x21/0x4c) from [<4fc0317d>] (run_list_real+0x629/0x704) [<4fc0317d>] (run_list_real+0x629/0x704) from [<4fc03339>] (parse_stream_outer+0xe1/0x190) [<4fc03339>] (parse_stream_outer+0xe1/0x190) from [<4fc0357b>] (run_shell+0x23/0x54) [<4fc0357b>] (run_shell+0x23/0x54) from [<4fc0588d>] (execute_command+0x21/0x4c) [<4fc0588d>] (execute_command+0x21/0x4c) from [<4fc0317d>] (run_list_real+0x629/0x704) [<4fc0317d>] (run_list_real+0x629/0x704) from [<4fc02e1d>] (run_list_real+0x2c9/0x704)

[<4fc1b37d>] (unwind_backtrace+0x1/0x64) from [<4fc0f635>] (panic+0x1d/0x2c) [<4fc0f635>] (panic+0x1d/0x2c) from [<4fc1b761>] (do_exception+0xd/0x10) [<4fc1b761>] (do_exception+0xd/0x10) from [<4fc1b7a5>] (do_prefetch_abort+0x11/0x14) [<4fc1b7a5>] (do_prefetch_abort+0x11/0x14) from [<4fc1b510>] (prefetch_abort+0x50/0x60)

This is because you haven't provided a mtd->block_isbad callback. Instead we have an empty m25p_oob0 device for a flash which cannot have bad blocks at all. Have you ever done basic tests with this driver? This really does not motivate me to take a 40k patch.

Sascha

Signature · 9 lines
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 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#4 lore raw
Quoted 16 lines · Sascha Hauer
Quoted 15 lines · Jean-Christophe PLAGNIOL-VILLARD

Hi,

so we now create the cdev via mtd

This will also simplify sync with linux

to avoid the m25p8000 or m25p00 the cdev is still named name m25p and the drivers m25p80

sync with linux too

this patch series is agianst mtd_dataflash support

The following changes since commit 9428c386f876fa3a8871eeea4725a805cea5c367:

Quoted 8 lines
Quoted 5 lines

mtd: add dataflash support (2012-10-31 04:48:39 +0800)

are available in the git repository at:

git://git.jcrosoft.org/barebox.git delivery/m25p80

Sometimes I get the feeling that you do this only to break other peoples setup:

I forget to include a fix from my next

I send it and re pushed the brnach

The following changes since commit 9bd9176fdafac1566107da3f3a0ed55094907d91:

mtd: dataflash: fix spi_transfer init (2012-11-01 02:22:22 +0800)

are available in the git repository at:

git://git.jcrosoft.org/barebox.git delivery/m25p80

for you to fetch changes up to 3b672b01bb8bba0c61886bdcb85b70009673372d:

m25p80: sync flash support with the kernel (2012-11-01 02:22:28 +0800)

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (3):
mtd: introduce mtd_block_isbad
m25p80: re-import it againt mtd_add_host
m25p80: sync flash support with the kernel

 arch/arm/boards/freescale-mx6-sabrelite/board.c |    2 +-
 drivers/mtd/core.c                              |   13 +++++-
 drivers/mtd/devices/Kconfig                     |   27 ++++++++++++
 drivers/mtd/devices/Makefile                    |    1 +
 drivers/{nor => mtd/devices}/m25p80.c           |  512 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------
 drivers/mtd/mtdraw.c                            |    2 +-
 drivers/mtd/partition.c                         |    2 +-
 drivers/mtd/ubi/io.c                            |    2 +-
 drivers/nor/Kconfig                             |   27 ------------
 drivers/nor/Makefile                            |    1 -
 drivers/nor/m25p80.h                            |   84 ------------------------------------
 include/linux/mtd/cfi.h                         |   65 ++++++++++++++++++++++++++++
 include/linux/mtd/mtd.h                         |    2 +
 13 files changed, 387 insertions(+), 353 deletions(-)
 rename drivers/{nor => mtd/devices}/m25p80.c (65%)
 delete mode 100644 drivers/nor/m25p80.h
 create mode 100644 include/linux/mtd/cfi.h

Best Regards,
J.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

#5 lore raw

PATCH 1/1 mtd: introduce mtd_block_isbad

In reply to Jean-Christophe PLAGNIOL-VILLARD

this allow to do not provide block_isbad at mtd driver level as example spi flash

---
 drivers/mtd/core.c      |   13 +++++++++++--
 drivers/mtd/mtdraw.c    |    2 +-
 drivers/mtd/partition.c |    2 +-
 drivers/mtd/ubi/io.c    |    2 +-
 include/linux/mtd/mtd.h |    2 ++
 5 files changed, 16 insertions(+), 5 deletions(-)
drivers/mtd/core.c +11 -2
index 7c323a1..0139851 100644
@@ -30,6 +30,15 @@
 
 static LIST_HEAD(mtd_register_hooks);
 
+int mtd_block_isbad(struct mtd_info *mtd, loff_t ofs)
+{
+	if (!mtd->block_isbad)
+		return 0;
+	if (ofs < 0 || ofs > mtd->size)
+		return -EINVAL;
+	return mtd->block_isbad(mtd, ofs);
+}
+
 static 	ssize_t mtd_read(struct cdev *cdev, void* buf, size_t count,
 			  loff_t _offset, ulong flags)
 {
@@ -130,7 +139,7 @@ int mtd_ioctl(struct cdev *cdev, int request, void *buf)
 	switch (request) {
 	case MEMGETBADBLOCK:
 		dev_dbg(cdev->dev, "MEMGETBADBLOCK: 0x%08llx\n", *offset);
-		ret = mtd->block_isbad(mtd, *offset);
+		ret = mtd_block_isbad(mtd, *offset);
 		break;
 #ifdef CONFIG_MTD_WRITE
 	case MEMSETBADBLOCK:
@@ -189,7 +198,7 @@ static int mtd_erase(struct cdev *cdev, size_t count, loff_t offset)
 	while (count > 0) {
 		dev_dbg(cdev->dev, "erase %d %d\n", erase.addr, erase.len);
 
-		ret = mtd->block_isbad(mtd, erase.addr);
+		ret = mtd_block_isbad(mtd, erase.addr);
 		if (ret > 0) {
 			printf("Skipping bad block at 0x%08x\n", erase.addr);
 		} else {
drivers/mtd/mtdraw.c +1 -1
index 079575c..ec77692 100644
@@ -241,7 +241,7 @@ static int mtdraw_erase(struct cdev *cdev, size_t count, loff_t _offset)
 	while (count > 0) {
 		debug("erase %d %d\n", erase.addr, erase.len);
 
-		ret = mtd->block_isbad(mtd, erase.addr);
+		ret = mtd_block_isbad(mtd, erase.addr);
 		if (ret > 0) {
 			printf("Skipping bad block at 0x%08x\n", erase.addr);
 		} else {
drivers/mtd/partition.c +1 -1
index df2eb40..85f486d 100644
@@ -71,7 +71,7 @@ static int mtd_part_block_isbad(struct mtd_info *mtd, loff_t ofs)
 	if (ofs >= mtd->size)
 		return -EINVAL;
 	ofs += part->offset;
-	return part->master->block_isbad(part->master, ofs);
+	return mtd_block_isbad(part->master, ofs);
 }
 
 static int mtd_part_block_markbad(struct mtd_info *mtd, loff_t ofs)
drivers/mtd/ubi/io.c +1 -1
index da38837..e3598b9 100644
@@ -513,7 +513,7 @@ int ubi_io_is_bad(const struct ubi_device *ubi, int pnum)
 	if (ubi->bad_allowed) {
 		int ret;
 
-		ret = mtd->block_isbad(mtd, (loff_t)pnum * ubi->peb_size);
+		ret = mtd_block_isbad(mtd, (loff_t)pnum * ubi->peb_size);
 		if (ret < 0)
 			ubi_err("error %d while checking if PEB %d is bad",
 				ret, pnum);
include/linux/mtd/mtd.h +2 -0
index 71d3c6f..5db884c 100644
@@ -251,6 +251,8 @@ static inline void mtd_erase_callback(struct erase_info *instr)
 }
 #endif
 
+int mtd_block_isbad(struct mtd_info *mtd, loff_t ofs);
+
 /*
  * Debugging macro and defines
  */
Signature · 7 lines
1.7.10.4


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#6 lore raw
In reply to Jean-Christophe PLAGNIOL-VILLARD

ping

work on next

Quoted 43 lines · Jean-Christophe PLAGNIOL-VILLARD

Hi,

so we now create the cdev via mtd

This will also simplify sync with linux

to avoid the m25p8000 or m25p00 the cdev is still named name m25p and the drivers m25p80

sync with linux too

this patch series is agianst mtd_dataflash support

The following changes since commit 9428c386f876fa3a8871eeea4725a805cea5c367:

mtd: add dataflash support (2012-10-31 04:48:39 +0800)

are available in the git repository at:

git://git.jcrosoft.org/barebox.git delivery/m25p80

for you to fetch changes up to 35b8b98230dbcfe25973d5ed52a874027b4f3f05:

m25p80: sync flash support with the kernel (2012-10-31 04:51:08 +0800)

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (2):
m25p80: re-import it againt mtd_add_host
m25p80: sync flash support with the kernel

 arch/arm/boards/freescale-mx6-sabrelite/board.c |    2 +-
 drivers/mtd/devices/Kconfig                     |   27 ++++++++++++
 drivers/mtd/devices/Makefile                    |    1 +
 drivers/{nor => mtd/devices}/m25p80.c           |  512 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------
 drivers/nor/Kconfig                             |   27 ------------
 drivers/nor/Makefile                            |    1 -
 drivers/nor/m25p80.h                            |   84 ------------------------------------
 include/linux/mtd/cfi.h                         |   65 ++++++++++++++++++++++++++++
 8 files changed, 371 insertions(+), 348 deletions(-)
 rename drivers/{nor => mtd/devices}/m25p80.c (65%)
 delete mode 100644 drivers/nor/m25p80.h
 create mode 100644 include/linux/mtd/cfi.h
Quoted 7 lines

Best Regards,
J.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

#7 lore raw

HI,

just retested on master on sam9x5ek work fine

can you check on sabrelite too

Best Regards,
J.

Quoted 55 lines · Jean-Christophe PLAGNIOL-VILLARD

ping

work on next

Quoted 43 lines · Jean-Christophe PLAGNIOL-VILLARD

Hi,

so we now create the cdev via mtd

This will also simplify sync with linux

to avoid the m25p8000 or m25p00 the cdev is still named name m25p and the drivers m25p80

sync with linux too

this patch series is agianst mtd_dataflash support

The following changes since commit 9428c386f876fa3a8871eeea4725a805cea5c367:

mtd: add dataflash support (2012-10-31 04:48:39 +0800)

are available in the git repository at:

git://git.jcrosoft.org/barebox.git delivery/m25p80

for you to fetch changes up to 35b8b98230dbcfe25973d5ed52a874027b4f3f05:

m25p80: sync flash support with the kernel (2012-10-31 04:51:08 +0800)

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (2):
m25p80: re-import it againt mtd_add_host
m25p80: sync flash support with the kernel

 arch/arm/boards/freescale-mx6-sabrelite/board.c |    2 +-
 drivers/mtd/devices/Kconfig                     |   27 ++++++++++++
 drivers/mtd/devices/Makefile                    |    1 +
 drivers/{nor => mtd/devices}/m25p80.c           |  512 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------
 drivers/nor/Kconfig                             |   27 ------------
 drivers/nor/Makefile                            |    1 -
 drivers/nor/m25p80.h                            |   84 ------------------------------------
 include/linux/mtd/cfi.h                         |   65 ++++++++++++++++++++++++++++
 8 files changed, 371 insertions(+), 348 deletions(-)
 rename drivers/{nor => mtd/devices}/m25p80.c (65%)
 delete mode 100644 drivers/nor/m25p80.h
 create mode 100644 include/linux/mtd/cfi.h
Quoted 7 lines

Best Regards,
J.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Quoted 4 lines

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Applied
#8 lore raw
In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 24 lines · Jean-Christophe PLAGNIOL-VILLARD

ping

work on next

Quoted 20 lines · Jean-Christophe PLAGNIOL-VILLARD

Hi,

so we now create the cdev via mtd

This will also simplify sync with linux

to avoid the m25p8000 or m25p00 the cdev is still named name m25p and the drivers m25p80

sync with linux too

this patch series is agianst mtd_dataflash support

The following changes since commit 9428c386f876fa3a8871eeea4725a805cea5c367:

mtd: add dataflash support (2012-10-31 04:48:39 +0800)

are available in the git repository at:

git://git.jcrosoft.org/barebox.git delivery/m25p80

Applied, thanks

Sascha

Quoted 36 lines
Quoted 23 lines

for you to fetch changes up to 35b8b98230dbcfe25973d5ed52a874027b4f3f05:

m25p80: sync flash support with the kernel (2012-10-31 04:51:08 +0800)

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (2):
m25p80: re-import it againt mtd_add_host
m25p80: sync flash support with the kernel

 arch/arm/boards/freescale-mx6-sabrelite/board.c |    2 +-
 drivers/mtd/devices/Kconfig                     |   27 ++++++++++++
 drivers/mtd/devices/Makefile                    |    1 +
 drivers/{nor => mtd/devices}/m25p80.c           |  512 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------
 drivers/nor/Kconfig                             |   27 ------------
 drivers/nor/Makefile                            |    1 -
 drivers/nor/m25p80.h                            |   84 ------------------------------------
 include/linux/mtd/cfi.h                         |   65 ++++++++++++++++++++++++++++
 8 files changed, 371 insertions(+), 348 deletions(-)
 rename drivers/{nor => mtd/devices}/m25p80.c (65%)
 delete mode 100644 drivers/nor/m25p80.h
 create mode 100644 include/linux/mtd/cfi.h
Quoted 7 lines

Best Regards,
J.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Signature · 9 lines
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 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#9 lore raw
Quoted 20 lines · Sascha Hauer
Quoted 19 lines · Jean-Christophe PLAGNIOL-VILLARD

ping

work on next

Quoted 15 lines · Jean-Christophe PLAGNIOL-VILLARD

Hi,

so we now create the cdev via mtd

This will also simplify sync with linux

to avoid the m25p8000 or m25p00 the cdev is still named name m25p and the drivers m25p80

sync with linux too

this patch series is agianst mtd_dataflash support

The following changes since commit 9428c386f876fa3a8871eeea4725a805cea5c367:

Quoted 7 lines
Quoted 5 lines
Quoted 5 lines

mtd: add dataflash support (2012-10-31 04:48:39 +0800)

are available in the git repository at:

git://git.jcrosoft.org/barebox.git delivery/m25p80

Applied, thanks

can we have this one on master it's there for a while

Best Regards,
J.

Quoted 34 lines

Sascha

Quoted 31 lines
Quoted 30 lines

for you to fetch changes up to 35b8b98230dbcfe25973d5ed52a874027b4f3f05:

m25p80: sync flash support with the kernel (2012-10-31 04:51:08 +0800)

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (2):
m25p80: re-import it againt mtd_add_host
m25p80: sync flash support with the kernel

 arch/arm/boards/freescale-mx6-sabrelite/board.c |    2 +-
 drivers/mtd/devices/Kconfig                     |   27 ++++++++++++
 drivers/mtd/devices/Makefile                    |    1 +
 drivers/{nor => mtd/devices}/m25p80.c           |  512 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------
 drivers/nor/Kconfig                             |   27 ------------
 drivers/nor/Makefile                            |    1 -
 drivers/nor/m25p80.h                            |   84 ------------------------------------
 include/linux/mtd/cfi.h                         |   65 ++++++++++++++++++++++++++++
 8 files changed, 371 insertions(+), 348 deletions(-)
 rename drivers/{nor => mtd/devices}/m25p80.c (65%)
 delete mode 100644 drivers/nor/m25p80.h
 create mode 100644 include/linux/mtd/cfi.h

Best Regards,
J.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Quoted 11 lines
Quoted 5 lines

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Signature · 4 lines
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 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

#10 lore raw
Quoted 21 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 20 lines · Sascha Hauer
Quoted 19 lines · Jean-Christophe PLAGNIOL-VILLARD

ping

work on next

Quoted 15 lines · Jean-Christophe PLAGNIOL-VILLARD

Hi,

so we now create the cdev via mtd

This will also simplify sync with linux

to avoid the m25p8000 or m25p00 the cdev is still named name m25p and the drivers m25p80

sync with linux too

this patch series is agianst mtd_dataflash support

The following changes since commit 9428c386f876fa3a8871eeea4725a805cea5c367:

Quoted 8 lines
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines

mtd: add dataflash support (2012-10-31 04:48:39 +0800)

are available in the git repository at:

git://git.jcrosoft.org/barebox.git delivery/m25p80

Applied, thanks

can we have this one on master it's there for a while

And I need on sam9x5ek to have the spi flash

with 2012.12 we will do an official release on linux4sam

Best Regards,
J.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox