diff options
-rw-r--r-- | arch/arm/mach-omap2/Makefile | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap2/gpmc-nand.c | 154 | ||||
-rw-r--r-- | include/linux/omap-gpmc.h | 11 |
3 files changed, 0 insertions, 168 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 093458b62c8d..c89757abb0ae 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
@@ -241,6 +241,3 @@ obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o | |||
241 | 241 | ||
242 | onenand-$(CONFIG_MTD_ONENAND_OMAP2) := gpmc-onenand.o | 242 | onenand-$(CONFIG_MTD_ONENAND_OMAP2) := gpmc-onenand.o |
243 | obj-y += $(onenand-m) $(onenand-y) | 243 | obj-y += $(onenand-m) $(onenand-y) |
244 | |||
245 | nand-$(CONFIG_MTD_NAND_OMAP2) := gpmc-nand.o | ||
246 | obj-y += $(nand-m) $(nand-y) | ||
diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c deleted file mode 100644 index f6ac027f3c3b..000000000000 --- a/arch/arm/mach-omap2/gpmc-nand.c +++ /dev/null | |||
@@ -1,154 +0,0 @@ | |||
1 | /* | ||
2 | * gpmc-nand.c | ||
3 | * | ||
4 | * Copyright (C) 2009 Texas Instruments | ||
5 | * Vimal Singh <vimalsingh@ti.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | #include <linux/kernel.h> | ||
13 | #include <linux/platform_device.h> | ||
14 | #include <linux/io.h> | ||
15 | #include <linux/omap-gpmc.h> | ||
16 | #include <linux/mtd/nand.h> | ||
17 | #include <linux/platform_data/mtd-nand-omap2.h> | ||
18 | |||
19 | #include <asm/mach/flash.h> | ||
20 | |||
21 | #include "soc.h" | ||
22 | |||
23 | /* minimum size for IO mapping */ | ||
24 | #define NAND_IO_SIZE 4 | ||
25 | |||
26 | static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt) | ||
27 | { | ||
28 | /* platforms which support all ECC schemes */ | ||
29 | if (soc_is_am33xx() || soc_is_am43xx() || cpu_is_omap44xx() || | ||
30 | soc_is_omap54xx() || soc_is_dra7xx()) | ||
31 | return 1; | ||
32 | |||
33 | if (ecc_opt == OMAP_ECC_BCH4_CODE_HW_DETECTION_SW || | ||
34 | ecc_opt == OMAP_ECC_BCH8_CODE_HW_DETECTION_SW) { | ||
35 | if (cpu_is_omap24xx()) | ||
36 | return 0; | ||
37 | else if (cpu_is_omap3630() && (GET_OMAP_REVISION() == 0)) | ||
38 | return 0; | ||
39 | else | ||
40 | return 1; | ||
41 | } | ||
42 | |||
43 | /* OMAP3xxx do not have ELM engine, so cannot support ECC schemes | ||
44 | * which require H/W based ECC error detection */ | ||
45 | if ((cpu_is_omap34xx() || cpu_is_omap3630()) && | ||
46 | ((ecc_opt == OMAP_ECC_BCH4_CODE_HW) || | ||
47 | (ecc_opt == OMAP_ECC_BCH8_CODE_HW))) | ||
48 | return 0; | ||
49 | |||
50 | /* legacy platforms support only HAM1 (1-bit Hamming) ECC scheme */ | ||
51 | if (ecc_opt == OMAP_ECC_HAM1_CODE_HW || | ||
52 | ecc_opt == OMAP_ECC_HAM1_CODE_SW) | ||
53 | return 1; | ||
54 | else | ||
55 | return 0; | ||
56 | } | ||
57 | |||
58 | /* This function will go away once the device-tree convertion is complete */ | ||
59 | static void gpmc_set_legacy(struct omap_nand_platform_data *gpmc_nand_data, | ||
60 | struct gpmc_settings *s) | ||
61 | { | ||
62 | /* Enable RD PIN Monitoring Reg */ | ||
63 | if (gpmc_nand_data->dev_ready) { | ||
64 | s->wait_on_read = true; | ||
65 | s->wait_on_write = true; | ||
66 | } | ||
67 | |||
68 | if (gpmc_nand_data->devsize == NAND_BUSWIDTH_16) | ||
69 | s->device_width = GPMC_DEVWIDTH_16BIT; | ||
70 | else | ||
71 | s->device_width = GPMC_DEVWIDTH_8BIT; | ||
72 | } | ||
73 | |||
74 | int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data, | ||
75 | struct gpmc_timings *gpmc_t) | ||
76 | { | ||
77 | int err = 0; | ||
78 | struct gpmc_settings s; | ||
79 | struct platform_device *pdev; | ||
80 | struct resource gpmc_nand_res[] = { | ||
81 | { .flags = IORESOURCE_MEM, }, | ||
82 | { .flags = IORESOURCE_IRQ, }, | ||
83 | { .flags = IORESOURCE_IRQ, }, | ||
84 | }; | ||
85 | |||
86 | BUG_ON(gpmc_nand_data->cs >= GPMC_CS_NUM); | ||
87 | |||
88 | err = gpmc_cs_request(gpmc_nand_data->cs, NAND_IO_SIZE, | ||
89 | (unsigned long *)&gpmc_nand_res[0].start); | ||
90 | if (err < 0) { | ||
91 | pr_err("omap2-gpmc: Cannot request GPMC CS %d, error %d\n", | ||
92 | gpmc_nand_data->cs, err); | ||
93 | return err; | ||
94 | } | ||
95 | gpmc_nand_res[0].end = gpmc_nand_res[0].start + NAND_IO_SIZE - 1; | ||
96 | gpmc_nand_res[1].start = gpmc_get_client_irq(GPMC_IRQ_FIFOEVENTENABLE); | ||
97 | gpmc_nand_res[2].start = gpmc_get_client_irq(GPMC_IRQ_COUNT_EVENT); | ||
98 | |||
99 | memset(&s, 0, sizeof(struct gpmc_settings)); | ||
100 | gpmc_set_legacy(gpmc_nand_data, &s); | ||
101 | |||
102 | s.device_nand = true; | ||
103 | |||
104 | if (gpmc_t) { | ||
105 | err = gpmc_cs_set_timings(gpmc_nand_data->cs, gpmc_t, &s); | ||
106 | if (err < 0) { | ||
107 | pr_err("omap2-gpmc: Unable to set gpmc timings: %d\n", | ||
108 | err); | ||
109 | return err; | ||
110 | } | ||
111 | } | ||
112 | |||
113 | err = gpmc_cs_program_settings(gpmc_nand_data->cs, &s); | ||
114 | if (err < 0) | ||
115 | goto out_free_cs; | ||
116 | |||
117 | err = gpmc_configure(GPMC_CONFIG_WP, 0); | ||
118 | if (err < 0) | ||
119 | goto out_free_cs; | ||
120 | |||
121 | if (!gpmc_hwecc_bch_capable(gpmc_nand_data->ecc_opt)) { | ||
122 | pr_err("omap2-nand: Unsupported NAND ECC scheme selected\n"); | ||
123 | err = -EINVAL; | ||
124 | goto out_free_cs; | ||
125 | } | ||
126 | |||
127 | |||
128 | pdev = platform_device_alloc("omap2-nand", gpmc_nand_data->cs); | ||
129 | if (pdev) { | ||
130 | err = platform_device_add_resources(pdev, gpmc_nand_res, | ||
131 | ARRAY_SIZE(gpmc_nand_res)); | ||
132 | if (!err) | ||
133 | pdev->dev.platform_data = gpmc_nand_data; | ||
134 | } else { | ||
135 | err = -ENOMEM; | ||
136 | } | ||
137 | if (err) | ||
138 | goto out_free_pdev; | ||
139 | |||
140 | err = platform_device_add(pdev); | ||
141 | if (err) { | ||
142 | dev_err(&pdev->dev, "Unable to register NAND device\n"); | ||
143 | goto out_free_pdev; | ||
144 | } | ||
145 | |||
146 | return 0; | ||
147 | |||
148 | out_free_pdev: | ||
149 | platform_device_put(pdev); | ||
150 | out_free_cs: | ||
151 | gpmc_cs_free(gpmc_nand_data->cs); | ||
152 | |||
153 | return err; | ||
154 | } | ||
diff --git a/include/linux/omap-gpmc.h b/include/linux/omap-gpmc.h index e821a3132a3e..fd0de00c0d77 100644 --- a/include/linux/omap-gpmc.h +++ b/include/linux/omap-gpmc.h | |||
@@ -76,17 +76,6 @@ struct gpmc_timings; | |||
76 | struct omap_nand_platform_data; | 76 | struct omap_nand_platform_data; |
77 | struct omap_onenand_platform_data; | 77 | struct omap_onenand_platform_data; |
78 | 78 | ||
79 | #if IS_ENABLED(CONFIG_MTD_NAND_OMAP2) | ||
80 | extern int gpmc_nand_init(struct omap_nand_platform_data *d, | ||
81 | struct gpmc_timings *gpmc_t); | ||
82 | #else | ||
83 | static inline int gpmc_nand_init(struct omap_nand_platform_data *d, | ||
84 | struct gpmc_timings *gpmc_t) | ||
85 | { | ||
86 | return 0; | ||
87 | } | ||
88 | #endif | ||
89 | |||
90 | #if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2) | 79 | #if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2) |
91 | extern int gpmc_onenand_init(struct omap_onenand_platform_data *d); | 80 | extern int gpmc_onenand_init(struct omap_onenand_platform_data *d); |
92 | #else | 81 | #else |