aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier.martinez@collabora.co.uk>2016-10-21 06:43:35 -0400
committerTony Lindgren <tony@atomide.com>2016-11-10 17:32:33 -0500
commit6a6e640bc191d1d026fd09c4d8688259aa6d373f (patch)
treeaf731cbdde271509fb9828e062d34b89b4ca905e
parentb7b23ffcf7d8fac66e9976329a75e8f9bbee2419 (diff)
ARM: OMAP2+: Remove legacy board-flash.c
Legacy board files in mach-omap2 used the helper functions board_{nor,nand,onenand}_init() to initialize the flash devices attached to the GPMC. With Device Tree booting the initialization is handled by the GPMC driver gpmc_probe_*_child() functions so this code is not needed anymore now that OMAP2+ is DT-only. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat
-rw-r--r--arch/arm/mach-omap2/Makefile4
-rw-r--r--arch/arm/mach-omap2/board-flash.c242
-rw-r--r--arch/arm/mach-omap2/board-flash.h56
3 files changed, 0 insertions, 302 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index e6bf09a5c987..7634dff46e29 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -232,10 +232,6 @@ obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o
232 232
233# Platform specific device init code 233# Platform specific device init code
234 234
235omap-flash-$(CONFIG_MTD_NAND_OMAP2) := board-flash.o
236omap-flash-$(CONFIG_MTD_ONENAND_OMAP2) := board-flash.o
237obj-y += $(omap-flash-y) $(omap-flash-m)
238
239omap-hsmmc-$(CONFIG_MMC_OMAP_HS) := hsmmc.o 235omap-hsmmc-$(CONFIG_MMC_OMAP_HS) := hsmmc.o
240obj-y += $(omap-hsmmc-m) $(omap-hsmmc-y) 236obj-y += $(omap-hsmmc-m) $(omap-hsmmc-y)
241 237
diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c
deleted file mode 100644
index 2188dc30e232..000000000000
--- a/arch/arm/mach-omap2/board-flash.c
+++ /dev/null
@@ -1,242 +0,0 @@
1/*
2 * board-flash.c
3 * Modified from mach-omap2/board-3430sdp-flash.c
4 *
5 * Copyright (C) 2009 Nokia Corporation
6 * Copyright (C) 2009 Texas Instruments
7 *
8 * Vimal Singh <vimalsingh@ti.com>
9 *
10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License version 2 as
12 * published by the Free Software Foundation.
13 */
14
15#include <linux/kernel.h>
16#include <linux/omap-gpmc.h>
17#include <linux/platform_device.h>
18#include <linux/mtd/physmap.h>
19#include <linux/io.h>
20
21#include <linux/platform_data/mtd-nand-omap2.h>
22#include <linux/platform_data/mtd-onenand-omap2.h>
23
24#include "soc.h"
25#include "common.h"
26#include "board-flash.h"
27
28#define REG_FPGA_REV 0x10
29#define REG_FPGA_DIP_SWITCH_INPUT2 0x60
30#define MAX_SUPPORTED_GPMC_CONFIG 3
31
32#define DEBUG_BASE 0x08000000 /* debug board */
33
34/* various memory sizes */
35#define FLASH_SIZE_SDPV1 SZ_64M /* NOR flash (64 Meg aligned) */
36#define FLASH_SIZE_SDPV2 SZ_128M /* NOR flash (256 Meg aligned) */
37
38static struct physmap_flash_data board_nor_data = {
39 .width = 2,
40};
41
42static struct resource board_nor_resource = {
43 .flags = IORESOURCE_MEM,
44};
45
46static struct platform_device board_nor_device = {
47 .name = "physmap-flash",
48 .id = 0,
49 .dev = {
50 .platform_data = &board_nor_data,
51 },
52 .num_resources = 1,
53 .resource = &board_nor_resource,
54};
55
56static void
57__init board_nor_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs)
58{
59 int err;
60
61 board_nor_data.parts = nor_parts;
62 board_nor_data.nr_parts = nr_parts;
63
64 /* Configure start address and size of NOR device */
65 if (omap_rev() >= OMAP3430_REV_ES1_0) {
66 err = gpmc_cs_request(cs, FLASH_SIZE_SDPV2 - 1,
67 (unsigned long *)&board_nor_resource.start);
68 board_nor_resource.end = board_nor_resource.start
69 + FLASH_SIZE_SDPV2 - 1;
70 } else {
71 err = gpmc_cs_request(cs, FLASH_SIZE_SDPV1 - 1,
72 (unsigned long *)&board_nor_resource.start);
73 board_nor_resource.end = board_nor_resource.start
74 + FLASH_SIZE_SDPV1 - 1;
75 }
76 if (err < 0) {
77 pr_err("NOR: Can't request GPMC CS\n");
78 return;
79 }
80 if (platform_device_register(&board_nor_device) < 0)
81 pr_err("Unable to register NOR device\n");
82}
83
84#if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)
85static struct omap_onenand_platform_data board_onenand_data = {
86 .dma_channel = -1, /* disable DMA in OMAP OneNAND driver */
87};
88
89void
90__init board_onenand_init(struct mtd_partition *onenand_parts,
91 u8 nr_parts, u8 cs)
92{
93 board_onenand_data.cs = cs;
94 board_onenand_data.parts = onenand_parts;
95 board_onenand_data.nr_parts = nr_parts;
96
97 gpmc_onenand_init(&board_onenand_data);
98}
99#endif /* IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2) */
100
101#if IS_ENABLED(CONFIG_MTD_NAND_OMAP2)
102
103/* Note that all values in this struct are in nanoseconds */
104struct gpmc_timings nand_default_timings[1] = {
105 {
106 .sync_clk = 0,
107
108 .cs_on = 0,
109 .cs_rd_off = 36,
110 .cs_wr_off = 36,
111
112 .we_on = 6,
113 .oe_on = 6,
114
115 .adv_on = 6,
116 .adv_rd_off = 24,
117 .adv_wr_off = 36,
118
119 .we_off = 30,
120 .oe_off = 48,
121
122 .access = 54,
123 .rd_cycle = 72,
124 .wr_cycle = 72,
125
126 .wr_access = 30,
127 .wr_data_mux_bus = 0,
128 },
129};
130
131static struct omap_nand_platform_data board_nand_data;
132
133void
134__init board_nand_init(struct mtd_partition *nand_parts, u8 nr_parts, u8 cs,
135 int nand_type, struct gpmc_timings *gpmc_t)
136{
137 board_nand_data.cs = cs;
138 board_nand_data.parts = nand_parts;
139 board_nand_data.nr_parts = nr_parts;
140 board_nand_data.devsize = nand_type;
141
142 board_nand_data.ecc_opt = OMAP_ECC_HAM1_CODE_SW;
143 gpmc_nand_init(&board_nand_data, gpmc_t);
144}
145#endif /* IS_ENABLED(CONFIG_MTD_NAND_OMAP2) */
146
147/**
148 * get_gpmc0_type - Reads the FPGA DIP_SWITCH_INPUT_REGISTER2 to get
149 * the various cs values.
150 */
151static u8 get_gpmc0_type(void)
152{
153 u8 cs = 0;
154 void __iomem *fpga_map_addr;
155
156 fpga_map_addr = ioremap(DEBUG_BASE, 4096);
157 if (!fpga_map_addr)
158 return -ENOMEM;
159
160 if (!(readw_relaxed(fpga_map_addr + REG_FPGA_REV)))
161 /* we dont have an DEBUG FPGA??? */
162 /* Depend on #defines!! default to strata boot return param */
163 goto unmap;
164
165 /* S8-DIP-OFF = 1, S8-DIP-ON = 0 */
166 cs = readw_relaxed(fpga_map_addr + REG_FPGA_DIP_SWITCH_INPUT2) & 0xf;
167
168 /* ES2.0 SDP's onwards 4 dip switches are provided for CS */
169 if (omap_rev() >= OMAP3430_REV_ES1_0)
170 /* change (S8-1:4=DS-2:0) to (S8-4:1=DS-2:0) */
171 cs = ((cs & 8) >> 3) | ((cs & 4) >> 1) |
172 ((cs & 2) << 1) | ((cs & 1) << 3);
173 else
174 /* change (S8-1:3=DS-2:0) to (S8-3:1=DS-2:0) */
175 cs = ((cs & 4) >> 2) | (cs & 2) | ((cs & 1) << 2);
176unmap:
177 iounmap(fpga_map_addr);
178 return cs;
179}
180
181/**
182 * board_flash_init - Identify devices connected to GPMC and register.
183 *
184 * @return - void.
185 */
186void __init board_flash_init(struct flash_partitions partition_info[],
187 char chip_sel_board[][GPMC_CS_NUM], int nand_type)
188{
189 u8 cs = 0;
190 u8 norcs = GPMC_CS_NUM + 1;
191 u8 nandcs = GPMC_CS_NUM + 1;
192 u8 onenandcs = GPMC_CS_NUM + 1;
193 u8 idx;
194 unsigned char *config_sel = NULL;
195
196 /* REVISIT: Is this return correct idx for 2430 SDP?
197 * for which cs configuration matches for 2430 SDP?
198 */
199 idx = get_gpmc0_type();
200 if (idx >= MAX_SUPPORTED_GPMC_CONFIG) {
201 pr_err("%s: Invalid chip select: %d\n", __func__, cs);
202 return;
203 }
204 config_sel = (unsigned char *)(chip_sel_board[idx]);
205
206 while (cs < GPMC_CS_NUM) {
207 switch (config_sel[cs]) {
208 case PDC_NOR:
209 if (norcs > GPMC_CS_NUM)
210 norcs = cs;
211 break;
212 case PDC_NAND:
213 if (nandcs > GPMC_CS_NUM)
214 nandcs = cs;
215 break;
216 case PDC_ONENAND:
217 if (onenandcs > GPMC_CS_NUM)
218 onenandcs = cs;
219 break;
220 }
221 cs++;
222 }
223
224 if (norcs > GPMC_CS_NUM)
225 pr_err("NOR: Unable to find configuration in GPMC\n");
226 else
227 board_nor_init(partition_info[0].parts,
228 partition_info[0].nr_parts, norcs);
229
230 if (onenandcs > GPMC_CS_NUM)
231 pr_err("OneNAND: Unable to find configuration in GPMC\n");
232 else
233 board_onenand_init(partition_info[1].parts,
234 partition_info[1].nr_parts, onenandcs);
235
236 if (nandcs > GPMC_CS_NUM)
237 pr_err("NAND: Unable to find configuration in GPMC\n");
238 else
239 board_nand_init(partition_info[2].parts,
240 partition_info[2].nr_parts, nandcs,
241 nand_type, nand_default_timings);
242}
diff --git a/arch/arm/mach-omap2/board-flash.h b/arch/arm/mach-omap2/board-flash.h
deleted file mode 100644
index 8b39eec07318..000000000000
--- a/arch/arm/mach-omap2/board-flash.h
+++ /dev/null
@@ -1,56 +0,0 @@
1/*
2 * board-sdp.h
3 *
4 * Information structures for SDP-specific board config data
5 *
6 * Copyright (C) 2009 Nokia Corporation
7 * Copyright (C) 2009 Texas Instruments
8 *
9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License version 2 as
11 * published by the Free Software Foundation.
12 */
13#include <linux/mtd/mtd.h>
14#include <linux/mtd/partitions.h>
15
16#define PDC_NOR 1
17#define PDC_NAND 2
18#define PDC_ONENAND 3
19#define DBG_MPDB 4
20
21struct flash_partitions {
22 struct mtd_partition *parts;
23 int nr_parts;
24};
25
26#if IS_ENABLED(CONFIG_MTD_NAND_OMAP2) || IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)
27extern void board_flash_init(struct flash_partitions [],
28 char chip_sel[][GPMC_CS_NUM], int nand_type);
29#else
30static inline void board_flash_init(struct flash_partitions part[],
31 char chip_sel[][GPMC_CS_NUM], int nand_type)
32{
33}
34#endif
35
36#if IS_ENABLED(CONFIG_MTD_NAND_OMAP2)
37extern void board_nand_init(struct mtd_partition *nand_parts,
38 u8 nr_parts, u8 cs, int nand_type, struct gpmc_timings *gpmc_t);
39extern struct gpmc_timings nand_default_timings[];
40#else
41static inline void board_nand_init(struct mtd_partition *nand_parts,
42 u8 nr_parts, u8 cs, int nand_type, struct gpmc_timings *gpmc_t)
43{
44}
45#define nand_default_timings NULL
46#endif
47
48#if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)
49extern void board_onenand_init(struct mtd_partition *nand_parts,
50 u8 nr_parts, u8 cs);
51#else
52static inline void board_onenand_init(struct mtd_partition *nand_parts,
53 u8 nr_parts, u8 cs)
54{
55}
56#endif
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-23 19:28:35 -0400