ARM: nomadik: switch over to using the FSMC driver

PATCH New Linus Walleij 5 participants 7 messages Oct 4, 2012 – Oct 11, 2012

Subsystems (5)

Arm (32-bit) Arm sub-architectures Memory technology devices (MTD) Common clk +1 more subsystems

lore

Share & tools

lore

Linus Walleij

author

2012-10-04 07:28 UTC #0 lore raw

PATCH 1/2 ARM: nomadik: switch over to using the FSMC driver

The Nomadik NAND driver is really just a subset of the existing FSMC driver, so let's switch over to using that driver instead, since it handles more variants of this chip. The callbacks for setting up the chip is doing stuff now handled by the FSMC driver.

Cc Alessandro Rubini <[email protected]>

Signed-off-by Linus Walleij <[email protected]>

---
I'm requesting Mike Turquette's ACK on this patch so I can merge it through ARM SoC.

---
 arch/arm/configs/nhk8815_defconfig        |  2 +-
 arch/arm/mach-nomadik/board-nhk8815.c     | 64 ++++++++++++++-----------------
 arch/arm/mach-nomadik/include/mach/fsmc.h | 29 --------------
 drivers/clk/clk-nomadik.c                 |  1 +
 4 files changed, 30 insertions(+), 66 deletions(-)
 delete mode 100644 arch/arm/mach-nomadik/include/mach/fsmc.h

arch/arm/configs/nhk8815_defconfig +1 -1

index bf123c5..9a8adfd 100644
@@ -58,7 +58,7 @@ CONFIG_MTD_BLOCK=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND_VERIFY_WRITE=y
-CONFIG_MTD_NAND_NOMADIK=y
+CONFIG_MTD_NAND_FSMC=y
 CONFIG_MTD_ONENAND=y
 CONFIG_MTD_ONENAND_VERIFY_WRITE=y
 CONFIG_MTD_ONENAND_GENERIC=y

arch/arm/mach-nomadik/board-nhk8815.c +28 ~~-36~~

97 lines not on this page · raw message

arch/arm/mach-nomadik/include/mach/fsmc.h deleted +0 ~~-29~~

deleted file mode 100644
index 8c2c051..0000000
@@ -1,29 +0,0 @@
-
-/* Definitions for the Nomadik FSMC "Flexible Static Memory controller" */
-
-#ifndef __ASM_ARCH_FSMC_H
-#define __ASM_ARCH_FSMC_H
-
-#include <mach/hardware.h>
-/*
- * Register list
- */
-
-/* bus control reg. and bus timing reg. for CS0..CS3 */
-#define FSMC_BCR(x)     (NOMADIK_FSMC_VA + (x << 3))
-#define FSMC_BTR(x)     (NOMADIK_FSMC_VA + (x << 3) + 0x04)
-
-/* PC-card and NAND:
- * PCR = control register
- * PMEM = memory timing
- * PATT = attribute timing
- * PIO = I/O timing
- * PECCR = ECC result
- */
-#define FSMC_PCR(x)     (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x00)
-#define FSMC_PMEM(x)    (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x08)
-#define FSMC_PATT(x)    (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x0c)
-#define FSMC_PIO(x)     (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x10)
-#define FSMC_PECCR(x)   (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x14)
-
-#endif /* __ASM_ARCH_FSMC_H */

drivers/clk/clk-nomadik.c +1 -0

index 517a8ff..6b4c70f 100644
@@ -20,6 +20,7 @@ void __init nomadik_clk_init(void)
 	clk_register_clkdev(clk, NULL, "gpio.2");
 	clk_register_clkdev(clk, NULL, "gpio.3");
 	clk_register_clkdev(clk, NULL, "rng");
+	clk_register_clkdev(clk, NULL, "fsmc-nand");
 
 	/*
 	 * The 2.4 MHz TIMCLK reference clock is active@boot time, this is

Signature · 1 line

1.7.11.4

Linus Walleij

author

2012-10-05 12:52 UTC #1 lore raw

PATCH 1/2 ARM: nomadik: switch over to using the FSMC driver

Quoted 11 lines · Linus Walleij

The Nomadik NAND driver is really just a subset of the existing FSMC driver, so let's switch over to using that driver instead, since it handles more variants of this chip. The callbacks for setting up the chip is doing stuff now handled by the FSMC driver.
Cc Alessandro Rubini <[email protected]>
Signed-off-by Linus Walleij <[email protected]>
---
I'm requesting Mike Turquette's ACK on this patch so I can merge it through ARM SoC.

Still requesting Mike's ACK, but not for merging through ARM SoC but through MTD.

If you apply Jean-Christophe's patch first (please do that) I will send a v2 of this patch set to be applied onto MTD as well (should be OK).

Yours,
Linus Walleij

Alessandro Rubini

2012-10-05 12:58 UTC #2 lore raw

PATCH 1/2 ARM: nomadik: switch over to using the FSMC driver

Quoted 7 lines

Quoted 4 lines
The Nomadik NAND driver is really just a subset of the existing FSMC driver,
Cc Alessandro Rubini <[email protected]>
Still requesting Mike's ACK, but not for merging through ARM SoC but through MTD.

Oh, and please get mine too. Sorry for not noticing the message, busy times...

I'm pretty sure there was no fsmc driver back then. But clearly something coming from the vendor and used on several boards is better then something made by an external consultant for a specific evaluation board. So ok to ditch my nand driver.

Acked-by Alessandro Rubini <[email protected]>

Mike Turquette

2012-10-11 23:49 UTC #3 lore raw

PATCH 1/2 ARM: nomadik: switch over to using the FSMC driver

In reply to Linus Walleij

Quoting Linus Walleij (2012-10-05 05:52:06)

Quoted 8 lines · Linus Walleij

Quoted 7 lines
The Nomadik NAND driver is really just a subset of the existing FSMC driver, so let's switch over to using that driver instead, since it handles more variants of this chip. The callbacks for setting up the chip is doing stuff now handled by the FSMC driver.

Quoted 9 lines

Quoted 5 lines
Cc Alessandro Rubini <[email protected]>
Signed-off-by Linus Walleij <[email protected]>
---
I'm requesting Mike Turquette's ACK on this patch so I can merge it through ARM SoC.
Still requesting Mike's ACK, but not for merging through ARM SoC but through MTD.

Sorry for the late response but I just returned from vacation. Might be too late but:

Acked-by Mike Turquette <[email protected]>

Thanks,
Mike

Quoted 6 lines

If you apply Jean-Christophe's patch first (please do that) I will send a v2 of this patch set to be applied onto MTD as well (should be OK).
Yours,
Linus Walleij

Artem Bityutskiy

2012-10-11 11:07 UTC #4 lore raw

PATCH 1/2 ARM: nomadik: switch over to using the FSMC driver

In reply to Linus Walleij

Quoted 8 lines · Linus Walleij

The Nomadik NAND driver is really just a subset of the existing FSMC driver, so let's switch over to using that driver instead, since it handles more variants of this chip. The callbacks for setting up the chip is doing stuff now handled by the FSMC driver.
Cc Alessandro Rubini <[email protected]>
Signed-off-by Linus Walleij <[email protected]>

Pushed both to l2-mtd.git, thanks!

Signature · 9 lines

Best Regards,
Artem Bityutskiy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121011/fdb275c4/attachment-0001.sig>

Jean-Christophe PLAGNIOL-VILLARD

2012-10-11 18:04 UTC #5 lore raw

PATCH 1/2 ARM: nomadik: switch over to using the FSMC driver

Quoted 11 lines · Artem Bityutskiy

Quoted 8 lines · Linus Walleij
The Nomadik NAND driver is really just a subset of the existing FSMC driver, so let's switch over to using that driver instead, since it handles more variants of this chip. The callbacks for setting up the chip is doing stuff now handled by the FSMC driver.
Cc Alessandro Rubini <[email protected]>
Signed-off-by Linus Walleij <[email protected]>
Pushed both to l2-mtd.git, thanks!

wait on this one Linus said he will send an other version based on my patch for fmsc

Best Regards,
J.

Quoted 11 lines

Signature · 10 lines

-- 
Best Regards,
Artem Bityutskiy



_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Linus Walleij

author

2012-10-11 22:20 UTC #6 lore raw

PATCH 1/2 ARM: nomadik: switch over to using the FSMC driver

Quoted 6 lines · Jean-Christophe PLAGNIOL-VILLARD

Quoted 2 lines · Artem Bityutskiy
Pushed both to l2-mtd.git, thanks!
wait on this one Linus said he will send an other version based on my patch for fmsc

I made a fix-up patch instead, that's simpler I guess... mailing out now.

Thanks,
Linus Walleij