]> git.sur5r.net Git - u-boot/commitdiff
mtd: nand: omap: move omap_elm.h from arch/arm/include/asm to drivers/mtd/nand
authorpekon gupta <pekon@ti.com>
Fri, 22 Nov 2013 11:23:30 +0000 (16:53 +0530)
committerScott Wood <scottwood@freescale.com>
Tue, 4 Mar 2014 23:23:54 +0000 (17:23 -0600)
omap_elm.h is a generic header used by OMAP ELM driver for all TI platfoms.
Hence this file should be present in generic folder instead of architecture
specific include folder.
Build tested using: ./MAKEALL -s am33xx -s omap3 -s omap4 -s omap5

Signed-off-by: Pekon Gupta <pekon@ti.com>
arch/arm/include/asm/omap_elm.h [deleted file]
drivers/mtd/nand/omap_elm.c
drivers/mtd/nand/omap_gpmc.c
include/linux/mtd/omap_elm.h [new file with mode: 0644]

diff --git a/arch/arm/include/asm/omap_elm.h b/arch/arm/include/asm/omap_elm.h
deleted file mode 100644 (file)
index 45454ea..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * (C) Copyright 2010-2011 Texas Instruments, <www.ti.com>
- * Mansoor Ahamed <mansoor.ahamed@ti.com>
- *
- * Derived from work done by Rohit Choraria <rohitkc@ti.com> for omap3
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-#ifndef __ASM_ARCH_ELM_H
-#define __ASM_ARCH_ELM_H
-/*
- * ELM Module Registers
- */
-
-/* ELM registers bit fields */
-#define ELM_SYSCONFIG_SOFTRESET_MASK                   (0x2)
-#define ELM_SYSCONFIG_SOFTRESET                        (0x2)
-#define ELM_SYSSTATUS_RESETDONE_MASK                   (0x1)
-#define ELM_SYSSTATUS_RESETDONE                        (0x1)
-#define ELM_LOCATION_CONFIG_ECC_BCH_LEVEL_MASK         (0x3)
-#define ELM_LOCATION_CONFIG_ECC_SIZE_MASK              (0x7FF0000)
-#define ELM_LOCATION_CONFIG_ECC_SIZE_POS               (16)
-#define ELM_SYNDROME_FRAGMENT_6_SYNDROME_VALID         (0x00010000)
-#define ELM_LOCATION_STATUS_ECC_CORRECTABLE_MASK       (0x100)
-#define ELM_LOCATION_STATUS_ECC_NB_ERRORS_MASK         (0x1F)
-
-#ifndef __ASSEMBLY__
-
-enum bch_level {
-       BCH_4_BIT = 0,
-       BCH_8_BIT,
-       BCH_16_BIT
-};
-
-
-/* BCH syndrome registers */
-struct syndrome {
-       u32 syndrome_fragment_x[7];     /* 0x400, 0x404.... 0x418 */
-       u8 res1[36];                    /* 0x41c */
-};
-
-/* BCH error status & location register */
-struct location {
-       u32 location_status;            /* 0x800 */
-       u8 res1[124];                   /* 0x804 */
-       u32 error_location_x[16];       /* 0x880.... */
-       u8 res2[64];                    /* 0x8c0 */
-};
-
-/* BCH ELM register map - do not try to allocate memmory for this structure.
- * We have used plenty of reserved variables to fill the slots in the ELM
- * register memory map.
- * Directly initialize the struct pointer to ELM base address.
- */
-struct elm {
-       u32 rev;                                /* 0x000 */
-       u8 res1[12];                            /* 0x004 */
-       u32 sysconfig;                          /* 0x010 */
-       u32 sysstatus;                          /* 0x014 */
-       u32 irqstatus;                          /* 0x018 */
-       u32 irqenable;                          /* 0x01c */
-       u32 location_config;                    /* 0x020 */
-       u8 res2[92];                            /* 0x024 */
-       u32 page_ctrl;                          /* 0x080 */
-       u8 res3[892];                           /* 0x084 */
-       struct  syndrome syndrome_fragments[8]; /* 0x400 */
-       u8 res4[512];                           /* 0x600 */
-       struct location  error_location[8];     /* 0x800 */
-};
-
-int elm_check_error(u8 *syndrome, u32 nibbles, u32 *error_count,
-               u32 *error_locations);
-int elm_config(enum bch_level level);
-void elm_reset(void);
-void elm_init(void);
-#endif /* __ASSEMBLY__ */
-#endif /* __ASM_ARCH_ELM_H */
index 55a631deb4a5f2ba728585fe336aa8fd03e44d2c..47b1f1bfe27b0dbbb50efa32363fc1f58c93b04d 100644 (file)
@@ -17,7 +17,7 @@
 #include <asm/io.h>
 #include <asm/errno.h>
 #include <linux/mtd/omap_gpmc.h>
-#include <asm/omap_elm.h>
+#include <linux/mtd/omap_elm.h>
 #include <asm/arch/hardware.h>
 
 #define ELM_DEFAULT_POLY (0)
index 452e40f04ef5301bbc547b3b5cddf8123d730e3d..881a63618c3205786fbc866b5b2b3d90af240024 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/bch.h>
 #include <linux/compiler.h>
 #include <nand.h>
-#include <asm/omap_elm.h>
+#include <linux/mtd/omap_elm.h>
 
 #define BADBLOCK_MARKER_LENGTH 2
 #define SECTOR_BYTES           512
diff --git a/include/linux/mtd/omap_elm.h b/include/linux/mtd/omap_elm.h
new file mode 100644 (file)
index 0000000..45454ea
--- /dev/null
@@ -0,0 +1,77 @@
+/*
+ * (C) Copyright 2010-2011 Texas Instruments, <www.ti.com>
+ * Mansoor Ahamed <mansoor.ahamed@ti.com>
+ *
+ * Derived from work done by Rohit Choraria <rohitkc@ti.com> for omap3
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+#ifndef __ASM_ARCH_ELM_H
+#define __ASM_ARCH_ELM_H
+/*
+ * ELM Module Registers
+ */
+
+/* ELM registers bit fields */
+#define ELM_SYSCONFIG_SOFTRESET_MASK                   (0x2)
+#define ELM_SYSCONFIG_SOFTRESET                        (0x2)
+#define ELM_SYSSTATUS_RESETDONE_MASK                   (0x1)
+#define ELM_SYSSTATUS_RESETDONE                        (0x1)
+#define ELM_LOCATION_CONFIG_ECC_BCH_LEVEL_MASK         (0x3)
+#define ELM_LOCATION_CONFIG_ECC_SIZE_MASK              (0x7FF0000)
+#define ELM_LOCATION_CONFIG_ECC_SIZE_POS               (16)
+#define ELM_SYNDROME_FRAGMENT_6_SYNDROME_VALID         (0x00010000)
+#define ELM_LOCATION_STATUS_ECC_CORRECTABLE_MASK       (0x100)
+#define ELM_LOCATION_STATUS_ECC_NB_ERRORS_MASK         (0x1F)
+
+#ifndef __ASSEMBLY__
+
+enum bch_level {
+       BCH_4_BIT = 0,
+       BCH_8_BIT,
+       BCH_16_BIT
+};
+
+
+/* BCH syndrome registers */
+struct syndrome {
+       u32 syndrome_fragment_x[7];     /* 0x400, 0x404.... 0x418 */
+       u8 res1[36];                    /* 0x41c */
+};
+
+/* BCH error status & location register */
+struct location {
+       u32 location_status;            /* 0x800 */
+       u8 res1[124];                   /* 0x804 */
+       u32 error_location_x[16];       /* 0x880.... */
+       u8 res2[64];                    /* 0x8c0 */
+};
+
+/* BCH ELM register map - do not try to allocate memmory for this structure.
+ * We have used plenty of reserved variables to fill the slots in the ELM
+ * register memory map.
+ * Directly initialize the struct pointer to ELM base address.
+ */
+struct elm {
+       u32 rev;                                /* 0x000 */
+       u8 res1[12];                            /* 0x004 */
+       u32 sysconfig;                          /* 0x010 */
+       u32 sysstatus;                          /* 0x014 */
+       u32 irqstatus;                          /* 0x018 */
+       u32 irqenable;                          /* 0x01c */
+       u32 location_config;                    /* 0x020 */
+       u8 res2[92];                            /* 0x024 */
+       u32 page_ctrl;                          /* 0x080 */
+       u8 res3[892];                           /* 0x084 */
+       struct  syndrome syndrome_fragments[8]; /* 0x400 */
+       u8 res4[512];                           /* 0x600 */
+       struct location  error_location[8];     /* 0x800 */
+};
+
+int elm_check_error(u8 *syndrome, u32 nibbles, u32 *error_count,
+               u32 *error_locations);
+int elm_config(enum bch_level level);
+void elm_reset(void);
+void elm_init(void);
+#endif /* __ASSEMBLY__ */
+#endif /* __ASM_ARCH_ELM_H */