Skip to contentSkip to conversation

mtd: nand: davinci: add header file for driver definitions

PATCH Superseded Ivan Khoronzhuk 2 participants 3 messages May 29, 2014 – Jun 6, 2014

Subsystems (3)
Arm (32-bit) Memory technology devices (MTD) NAND flash

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Ivan Khoronzhuk

author
#0 lore raw

PATCH v2 1/1 mtd: nand: davinci: add header file for driver definitions

The definitions inside emif_defs.h concern davinci nand driver and should be in it's header. So create header file for davinci nand driver and move definitions from emif_defs.h to it.

Acked-by Vitaly Andrianov <[email protected]>
Signed-off-by Ivan Khoronzhuk <[email protected]>
---
 arch/arm/cpu/armv7/keystone/aemif.c            |  2 +-
 arch/arm/include/asm/arch-keystone/emif_defs.h | 73 --------------------------
 arch/arm/include/asm/arch-keystone/nand_defs.h | 23 --------
 board/ti/k2hk_evm/board.c                      |  1 -
 drivers/mtd/nand/davinci_nand.c                |  3 +-
 drivers/mtd/nand/davinci_nand.h                | 66 +++++++++++++++++++++++
 6 files changed, 68 insertions(+), 100 deletions(-)
 delete mode 100644 arch/arm/include/asm/arch-keystone/emif_defs.h
 delete mode 100644 arch/arm/include/asm/arch-keystone/nand_defs.h
 create mode 100644 drivers/mtd/nand/davinci_nand.h
arch/arm/cpu/armv7/keystone/aemif.c +1 -1
index 9b26886..9ba1549 100644
@@ -10,7 +10,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
-#include <asm/arch/emif_defs.h>
+#include <../drivers/mtd/nand/davinci_nand.h>
 
 #define AEMIF_CFG_SELECT_STROBE(v)	((v) ? 1 << 31 : 0)
 #define AEMIF_CFG_EXTEND_WAIT(v)	((v) ? 1 << 30 : 0)
arch/arm/include/asm/arch-keystone/emif_defs.h deleted +0 -73

73 lines not on this page · raw message

arch/arm/include/asm/arch-keystone/nand_defs.h deleted +0 -23
deleted file mode 100644
index 58417db..0000000
@@ -1,23 +0,0 @@
-/*
- * nand driver definitions to re-use davinci nand driver on Keystone2
- *
- * (C) Copyright 2012-2014
- *     Texas Instruments Incorporated, <www.ti.com>
- * (C) Copyright 2007 Sergey Kubushyn <[email protected]>
- *
- * SPDX-License-Identifier:     GPL-2.0+
- */
-#ifndef _NAND_DEFS_H_
-#define _NAND_DEFS_H_
-
-#include <asm/arch/hardware.h>
-#include <linux/mtd/nand.h>
-
-#define MASK_CLE         0x4000
-#define	MASK_ALE         0x2000
-
-#define NAND_READ_START  0x00
-#define NAND_READ_END    0x30
-#define NAND_STATUS      0x70
-
-#endif
board/ti/k2hk_evm/board.c +0 -1
index dc39139..53f26b2 100644
@@ -16,7 +16,6 @@
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
-#include <asm/arch/nand_defs.h>
 #include <asm/arch/emac_defs.h>
 #include <asm/arch/psc_defs.h>
drivers/mtd/nand/davinci_nand.c +1 -2
index 75b03a7..bacf1f1 100644
@@ -32,8 +32,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <nand.h>
-#include <asm/arch/nand_defs.h>
-#include <asm/arch/emif_defs.h>
+#include "davinci_nand.h"
 
 /* Definitions for 4-bit hardware ECC */
 #define NAND_TIMEOUT			10240
drivers/mtd/nand/davinci_nand.h new file +66 -0

66 lines not on this page · raw message

Signature · 1 line
1.8.3.2
#1 lore raw

PATCH v2 1/1 mtd: nand: davinci: add header file for driver definitions

Quoted 6 lines · Ivan Khoronzhuk

The definitions inside emif_defs.h concern davinci nand driver and should be in it's header. So create header file for davinci nand driver and move definitions from emif_defs.h to it.

Acked-by Vitaly Andrianov <[email protected]>
Signed-off-by Ivan Khoronzhuk <[email protected]>
Quoted 11 lines
---
 arch/arm/cpu/armv7/keystone/aemif.c            |  2 +-
 arch/arm/include/asm/arch-keystone/emif_defs.h | 73 --------------------------
 arch/arm/include/asm/arch-keystone/nand_defs.h | 23 --------
 board/ti/k2hk_evm/board.c                      |  1 -
 drivers/mtd/nand/davinci_nand.c                |  3 +-
 drivers/mtd/nand/davinci_nand.h                | 66 +++++++++++++++++++++++
 6 files changed, 68 insertions(+), 100 deletions(-)
 delete mode 100644 arch/arm/include/asm/arch-keystone/emif_defs.h
 delete mode 100644 arch/arm/include/asm/arch-keystone/nand_defs.h
 create mode 100644 drivers/mtd/nand/davinci_nand.h

This breaks building a bunch of davinci platforms. Further, we should put the new header file under arch/arm/include/asm/ti-common/ not drivers/mtd/nand/. Can you please update things and reconcile arch/arm/include/asm/arch-davinci/emif_defs.h with these new changes? Thanks.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140606/f9570180/attachment.pgp>
author
#2 lore raw

PATCH v2 1/1 mtd: nand: davinci: add header file for driver definitions

Quoted 19 lines · Tom Rini
Quoted 14 lines · Ivan Khoronzhuk

The definitions inside emif_defs.h concern davinci nand driver and should be in it's header. So create header file for davinci nand driver and move definitions from emif_defs.h to it.

Acked-by Vitaly Andrianov <[email protected]>
Signed-off-by Ivan Khoronzhuk <[email protected]>
---
  arch/arm/cpu/armv7/keystone/aemif.c            |  2 +-
  arch/arm/include/asm/arch-keystone/emif_defs.h | 73 --------------------------
  arch/arm/include/asm/arch-keystone/nand_defs.h | 23 --------
  board/ti/k2hk_evm/board.c                      |  1 -
  drivers/mtd/nand/davinci_nand.c                |  3 +-
  drivers/mtd/nand/davinci_nand.h                | 66 +++++++++++++++++++++++
  6 files changed, 68 insertions(+), 100 deletions(-)
Quoted 3 lines

delete mode 100644 arch/arm/include/asm/arch-keystone/emif_defs.h delete mode 100644 arch/arm/include/asm/arch-keystone/nand_defs.h create mode 100644 drivers/mtd/nand/davinci_nand.h

Quoted 6 lines

This breaks building a bunch of davinci platforms. Further, we should put the new header file under arch/arm/include/asm/ti-common/ not drivers/mtd/nand/. Can you please update things and reconcile arch/arm/include/asm/arch-davinci/emif_defs.h with these new changes? Thanks.

Yes..I will repost new patch.
Thanks!

Signature · 2 lines
Regards,
Ivan Khoronzhuk