aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/mach-sa1100/Kconfig4
-rw-r--r--arch/arm/mach-sa1100/assabet.c39
-rw-r--r--arch/arm/mach-sa1100/cerf.c18
-rw-r--r--arch/arm/mach-sa1100/clock.c2
-rw-r--r--arch/arm/mach-sa1100/generic.c44
-rw-r--r--arch/arm/mach-sa1100/generic.h8
-rw-r--r--arch/arm/mach-sa1100/h3xxx.c17
-rw-r--r--arch/arm/mach-sa1100/include/mach/assabet.h6
-rw-r--r--arch/arm/mach-sa1100/nanoengine.c23
-rw-r--r--arch/arm/mach-sa1100/shannon.c38
-rw-r--r--arch/arm/mach-sa1100/simpad.c11
-rw-r--r--drivers/pcmcia/Makefile4
-rw-r--r--drivers/pcmcia/sa1100_assabet.c100
-rw-r--r--drivers/pcmcia/sa1100_cerf.c86
-rw-r--r--drivers/pcmcia/sa1100_generic.c115
-rw-r--r--drivers/pcmcia/sa1100_generic.h4
-rw-r--r--drivers/pcmcia/sa1100_h3600.c16
-rw-r--r--drivers/pcmcia/sa1100_nanoengine.c133
-rw-r--r--drivers/pcmcia/sa1100_shannon.c104
-rw-r--r--drivers/pcmcia/sa1100_simpad.c12
20 files changed, 307 insertions, 477 deletions
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig
index 07df3a59b13f..fde7ef1ab192 100644
--- a/arch/arm/mach-sa1100/Kconfig
+++ b/arch/arm/mach-sa1100/Kconfig
@@ -6,6 +6,8 @@ config SA1100_ASSABET
6 bool "Assabet" 6 bool "Assabet"
7 select ARM_SA1110_CPUFREQ 7 select ARM_SA1110_CPUFREQ
8 select GPIO_REG 8 select GPIO_REG
9 select REGULATOR
10 select REGULATOR_FIXED_VOLTAGE
9 help 11 help
10 Say Y here if you are using the Intel(R) StrongARM(R) SA-1110 12 Say Y here if you are using the Intel(R) StrongARM(R) SA-1110
11 Microprocessor Development Board (also known as the Assabet). 13 Microprocessor Development Board (also known as the Assabet).
@@ -137,6 +139,8 @@ config SA1100_PLEB
137config SA1100_SHANNON 139config SA1100_SHANNON
138 bool "Shannon" 140 bool "Shannon"
139 select ARM_SA1100_CPUFREQ 141 select ARM_SA1100_CPUFREQ
142 select REGULATOR
143 select REGULATOR_FIXED_VOLTAGE
140 help 144 help
141 The Shannon (also known as a Tuxscreen, and also as a IS2630) was a 145 The Shannon (also known as a Tuxscreen, and also as a IS2630) was a
142 limited edition webphone produced by Philips. The Shannon is a SA1100 146 limited edition webphone produced by Philips. The Shannon is a SA1100
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index f68241d995f2..575ec085cffa 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -14,8 +14,11 @@
14#include <linux/module.h> 14#include <linux/module.h>
15#include <linux/errno.h> 15#include <linux/errno.h>
16#include <linux/gpio/gpio-reg.h> 16#include <linux/gpio/gpio-reg.h>
17#include <linux/gpio/machine.h>
17#include <linux/ioport.h> 18#include <linux/ioport.h>
18#include <linux/platform_data/sa11x0-serial.h> 19#include <linux/platform_data/sa11x0-serial.h>
20#include <linux/regulator/fixed.h>
21#include <linux/regulator/machine.h>
19#include <linux/serial_core.h> 22#include <linux/serial_core.h>
20#include <linux/platform_device.h> 23#include <linux/platform_device.h>
21#include <linux/mfd/ucb1x00.h> 24#include <linux/mfd/ucb1x00.h>
@@ -445,6 +448,29 @@ static struct resource neponset_resources[] = {
445}; 448};
446#endif 449#endif
447 450
451static struct gpiod_lookup_table assabet_cf_gpio_table = {
452 .dev_id = "sa11x0-pcmcia.1",
453 .table = {
454 GPIO_LOOKUP("gpio", 21, "ready", GPIO_ACTIVE_HIGH),
455 GPIO_LOOKUP("gpio", 22, "detect", GPIO_ACTIVE_LOW),
456 GPIO_LOOKUP("gpio", 24, "bvd2", GPIO_ACTIVE_HIGH),
457 GPIO_LOOKUP("gpio", 25, "bvd1", GPIO_ACTIVE_HIGH),
458 GPIO_LOOKUP("assabet", 1, "reset", GPIO_ACTIVE_HIGH),
459 GPIO_LOOKUP("assabet", 7, "bus-enable", GPIO_ACTIVE_LOW),
460 { },
461 },
462};
463
464static struct regulator_consumer_supply assabet_cf_vcc_consumers[] = {
465 REGULATOR_SUPPLY("vcc", "sa11x0-pcmcia.1"),
466};
467
468static struct fixed_voltage_config assabet_cf_vcc_pdata __initdata = {
469 .supply_name = "cf-power",
470 .microvolts = 3300000,
471 .enable_high = 1,
472};
473
448static void __init assabet_init(void) 474static void __init assabet_init(void)
449{ 475{
450 /* 476 /*
@@ -490,6 +516,11 @@ static void __init assabet_init(void)
490 platform_device_register_simple("neponset", 0, 516 platform_device_register_simple("neponset", 0,
491 neponset_resources, ARRAY_SIZE(neponset_resources)); 517 neponset_resources, ARRAY_SIZE(neponset_resources));
492#endif 518#endif
519 } else {
520 sa11x0_register_fixed_regulator(0, &assabet_cf_vcc_pdata,
521 assabet_cf_vcc_consumers,
522 ARRAY_SIZE(assabet_cf_vcc_consumers));
523
493 } 524 }
494 525
495#ifndef ASSABET_PAL_VIDEO 526#ifndef ASSABET_PAL_VIDEO
@@ -501,6 +532,9 @@ static void __init assabet_init(void)
501 ARRAY_SIZE(assabet_flash_resources)); 532 ARRAY_SIZE(assabet_flash_resources));
502 sa11x0_register_irda(&assabet_irda_data); 533 sa11x0_register_irda(&assabet_irda_data);
503 sa11x0_register_mcp(&assabet_mcp_data); 534 sa11x0_register_mcp(&assabet_mcp_data);
535
536 if (!machine_has_neponset())
537 sa11x0_register_pcmcia(1, &assabet_cf_gpio_table);
504} 538}
505 539
506/* 540/*
@@ -768,6 +802,7 @@ fs_initcall(assabet_leds_init);
768 802
769void __init assabet_init_irq(void) 803void __init assabet_init_irq(void)
770{ 804{
805 unsigned int assabet_gpio_base;
771 u32 def_val; 806 u32 def_val;
772 807
773 sa1100_init_irq(); 808 sa1100_init_irq();
@@ -782,7 +817,9 @@ void __init assabet_init_irq(void)
782 * 817 *
783 * This must precede any driver calls to BCR_set() or BCR_clear(). 818 * This must precede any driver calls to BCR_set() or BCR_clear().
784 */ 819 */
785 assabet_init_gpio((void *)&ASSABET_BCR, def_val); 820 assabet_gpio_base = assabet_init_gpio((void *)&ASSABET_BCR, def_val);
821
822 assabet_cf_vcc_pdata.gpio = assabet_gpio_base + 0;
786} 823}
787 824
788MACHINE_START(ASSABET, "Intel-Assabet") 825MACHINE_START(ASSABET, "Intel-Assabet")
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c
index 2d25ececb415..b2a4b41626ef 100644
--- a/arch/arm/mach-sa1100/cerf.c
+++ b/arch/arm/mach-sa1100/cerf.c
@@ -11,6 +11,7 @@
11 */ 11 */
12 12
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/gpio/machine.h>
14#include <linux/kernel.h> 15#include <linux/kernel.h>
15#include <linux/tty.h> 16#include <linux/tty.h>
16#include <linux/platform_data/sa11x0-serial.h> 17#include <linux/platform_data/sa11x0-serial.h>
@@ -45,6 +46,19 @@ static struct platform_device cerfuart2_device = {
45 .resource = cerfuart2_resources, 46 .resource = cerfuart2_resources,
46}; 47};
47 48
49/* Compact Flash */
50static struct gpiod_lookup_table cerf_cf_gpio_table = {
51 .dev_id = "sa11x0-pcmcia.1",
52 .table = {
53 GPIO_LOOKUP("gpio", 19, "bvd2", GPIO_ACTIVE_HIGH),
54 GPIO_LOOKUP("gpio", 20, "bvd1", GPIO_ACTIVE_HIGH),
55 GPIO_LOOKUP("gpio", 21, "reset", GPIO_ACTIVE_HIGH),
56 GPIO_LOOKUP("gpio", 22, "ready", GPIO_ACTIVE_HIGH),
57 GPIO_LOOKUP("gpio", 23, "detect", GPIO_ACTIVE_LOW),
58 { },
59 },
60};
61
48/* LEDs */ 62/* LEDs */
49struct gpio_led cerf_gpio_leds[] = { 63struct gpio_led cerf_gpio_leds[] = {
50 { 64 {
@@ -151,9 +165,6 @@ static void __init cerf_map_io(void)
151 sa1100_register_uart(0, 3); 165 sa1100_register_uart(0, 3);
152 sa1100_register_uart(1, 2); /* disable this and the uart2 device for sa1100_fir */ 166 sa1100_register_uart(1, 2); /* disable this and the uart2 device for sa1100_fir */
153 sa1100_register_uart(2, 1); 167 sa1100_register_uart(2, 1);
154
155 /* set some GPDR bits here while it's safe */
156 GPDR |= CERF_GPIO_CF_RESET;
157} 168}
158 169
159static struct mcp_plat_data cerf_mcp_data = { 170static struct mcp_plat_data cerf_mcp_data = {
@@ -167,6 +178,7 @@ static void __init cerf_init(void)
167 platform_add_devices(cerf_devices, ARRAY_SIZE(cerf_devices)); 178 platform_add_devices(cerf_devices, ARRAY_SIZE(cerf_devices));
168 sa11x0_register_mtd(&cerf_flash_data, &cerf_flash_resource, 1); 179 sa11x0_register_mtd(&cerf_flash_data, &cerf_flash_resource, 1);
169 sa11x0_register_mcp(&cerf_mcp_data); 180 sa11x0_register_mcp(&cerf_mcp_data);
181 sa11x0_register_pcmcia(1, &cerf_cf_gpio_table);
170} 182}
171 183
172MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube") 184MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")
diff --git a/arch/arm/mach-sa1100/clock.c b/arch/arm/mach-sa1100/clock.c
index b2eb3d232e39..6199e87447ca 100644
--- a/arch/arm/mach-sa1100/clock.c
+++ b/arch/arm/mach-sa1100/clock.c
@@ -163,6 +163,8 @@ static struct clk_lookup sa11xx_clkregs[] = {
163 CLKDEV_INIT("sa1100-rtc", NULL, NULL), 163 CLKDEV_INIT("sa1100-rtc", NULL, NULL),
164 CLKDEV_INIT("sa11x0-fb", NULL, &clk_cpu), 164 CLKDEV_INIT("sa11x0-fb", NULL, &clk_cpu),
165 CLKDEV_INIT("sa11x0-pcmcia", NULL, &clk_cpu), 165 CLKDEV_INIT("sa11x0-pcmcia", NULL, &clk_cpu),
166 CLKDEV_INIT("sa11x0-pcmcia.0", NULL, &clk_cpu),
167 CLKDEV_INIT("sa11x0-pcmcia.1", NULL, &clk_cpu),
166 /* sa1111 names devices using internal offsets, PCMCIA is at 0x1800 */ 168 /* sa1111 names devices using internal offsets, PCMCIA is at 0x1800 */
167 CLKDEV_INIT("1800", NULL, &clk_cpu), 169 CLKDEV_INIT("1800", NULL, &clk_cpu),
168 CLKDEV_INIT(NULL, "OSTIMER0", &clk_36864), 170 CLKDEV_INIT(NULL, "OSTIMER0", &clk_36864),
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c
index 2eb00691b07d..7167ddf84a0e 100644
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@ -10,6 +10,7 @@
10 * published by the Free Software Foundation. 10 * published by the Free Software Foundation.
11 */ 11 */
12#include <linux/gpio.h> 12#include <linux/gpio.h>
13#include <linux/gpio/machine.h>
13#include <linux/module.h> 14#include <linux/module.h>
14#include <linux/kernel.h> 15#include <linux/kernel.h>
15#include <linux/init.h> 16#include <linux/init.h>
@@ -20,6 +21,8 @@
20#include <linux/ioport.h> 21#include <linux/ioport.h>
21#include <linux/platform_device.h> 22#include <linux/platform_device.h>
22#include <linux/reboot.h> 23#include <linux/reboot.h>
24#include <linux/regulator/fixed.h>
25#include <linux/regulator/machine.h>
23#include <linux/irqchip/irq-sa11x0.h> 26#include <linux/irqchip/irq-sa11x0.h>
24 27
25#include <video/sa1100fb.h> 28#include <video/sa1100fb.h>
@@ -232,11 +235,20 @@ void sa11x0_register_lcd(struct sa1100fb_mach_info *inf)
232 sa11x0_register_device(&sa11x0fb_device, inf); 235 sa11x0_register_device(&sa11x0fb_device, inf);
233} 236}
234 237
238static bool sa11x0pcmcia_legacy = true;
235static struct platform_device sa11x0pcmcia_device = { 239static struct platform_device sa11x0pcmcia_device = {
236 .name = "sa11x0-pcmcia", 240 .name = "sa11x0-pcmcia",
237 .id = -1, 241 .id = -1,
238}; 242};
239 243
244void sa11x0_register_pcmcia(int socket, struct gpiod_lookup_table *table)
245{
246 if (table)
247 gpiod_add_lookup_table(table);
248 platform_device_register_simple("sa11x0-pcmcia", socket, NULL, 0);
249 sa11x0pcmcia_legacy = false;
250}
251
240static struct platform_device sa11x0mtd_device = { 252static struct platform_device sa11x0mtd_device = {
241 .name = "sa1100-mtd", 253 .name = "sa1100-mtd",
242 .id = -1, 254 .id = -1,
@@ -311,7 +323,6 @@ static struct platform_device *sa11x0_devices[] __initdata = {
311 &sa11x0uart1_device, 323 &sa11x0uart1_device,
312 &sa11x0uart3_device, 324 &sa11x0uart3_device,
313 &sa11x0ssp_device, 325 &sa11x0ssp_device,
314 &sa11x0pcmcia_device,
315 &sa11x0rtc_device, 326 &sa11x0rtc_device,
316 &sa11x0dma_device, 327 &sa11x0dma_device,
317}; 328};
@@ -319,6 +330,12 @@ static struct platform_device *sa11x0_devices[] __initdata = {
319static int __init sa1100_init(void) 330static int __init sa1100_init(void)
320{ 331{
321 pm_power_off = sa1100_power_off; 332 pm_power_off = sa1100_power_off;
333
334 if (sa11x0pcmcia_legacy)
335 platform_device_register(&sa11x0pcmcia_device);
336
337 regulator_has_full_constraints();
338
322 return platform_add_devices(sa11x0_devices, ARRAY_SIZE(sa11x0_devices)); 339 return platform_add_devices(sa11x0_devices, ARRAY_SIZE(sa11x0_devices));
323} 340}
324 341
@@ -329,6 +346,31 @@ void __init sa11x0_init_late(void)
329 sa11x0_pm_init(); 346 sa11x0_pm_init();
330} 347}
331 348
349int __init sa11x0_register_fixed_regulator(int n,
350 struct fixed_voltage_config *cfg,
351 struct regulator_consumer_supply *supplies, unsigned num_supplies)
352{
353 struct regulator_init_data *id;
354
355 cfg->init_data = id = kzalloc(sizeof(*cfg->init_data), GFP_KERNEL);
356 if (!cfg->init_data)
357 return -ENOMEM;
358
359 if (cfg->gpio < 0)
360 id->constraints.always_on = 1;
361 id->constraints.name = cfg->supply_name;
362 id->constraints.min_uV = cfg->microvolts;
363 id->constraints.max_uV = cfg->microvolts;
364 id->constraints.valid_modes_mask = REGULATOR_MODE_NORMAL;
365 id->constraints.valid_ops_mask = REGULATOR_CHANGE_STATUS;
366 id->consumer_supplies = supplies;
367 id->num_consumer_supplies = num_supplies;
368
369 platform_device_register_resndata(NULL, "reg-fixed-voltage", n,
370 NULL, 0, cfg, sizeof(*cfg));
371 return 0;
372}
373
332/* 374/*
333 * Common I/O mapping: 375 * Common I/O mapping:
334 * 376 *
diff --git a/arch/arm/mach-sa1100/generic.h b/arch/arm/mach-sa1100/generic.h
index 97502922a15d..5f3cb52fa6ab 100644
--- a/arch/arm/mach-sa1100/generic.h
+++ b/arch/arm/mach-sa1100/generic.h
@@ -47,3 +47,11 @@ static inline int sa11x0_pm_init(void) { return 0; }
47#endif 47#endif
48 48
49int sa11xx_clk_init(void); 49int sa11xx_clk_init(void);
50
51struct gpiod_lookup_table;
52void sa11x0_register_pcmcia(int socket, struct gpiod_lookup_table *);
53
54struct fixed_voltage_config;
55struct regulator_consumer_supply;
56int sa11x0_register_fixed_regulator(int n, struct fixed_voltage_config *cfg,
57 struct regulator_consumer_supply *supplies, unsigned num_supplies);
diff --git a/arch/arm/mach-sa1100/h3xxx.c b/arch/arm/mach-sa1100/h3xxx.c
index b69e76614d5b..36a78b0c106f 100644
--- a/arch/arm/mach-sa1100/h3xxx.c
+++ b/arch/arm/mach-sa1100/h3xxx.c
@@ -11,6 +11,7 @@
11 */ 11 */
12 12
13#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <linux/gpio/machine.h>
14#include <linux/gpio.h> 15#include <linux/gpio.h>
15#include <linux/gpio_keys.h> 16#include <linux/gpio_keys.h>
16#include <linux/input.h> 17#include <linux/input.h>
@@ -264,8 +265,24 @@ static struct platform_device *h3xxx_devices[] = {
264 &h3xxx_micro_asic, 265 &h3xxx_micro_asic,
265}; 266};
266 267
268static struct gpiod_lookup_table h3xxx_pcmcia_gpio_table = {
269 .dev_id = "sa11x0-pcmcia",
270 .table = {
271 GPIO_LOOKUP("gpio", H3XXX_GPIO_PCMCIA_CD0,
272 "pcmcia0-detect", GPIO_ACTIVE_LOW),
273 GPIO_LOOKUP("gpio", H3XXX_GPIO_PCMCIA_IRQ0,
274 "pcmcia0-ready", GPIO_ACTIVE_HIGH),
275 GPIO_LOOKUP("gpio", H3XXX_GPIO_PCMCIA_CD1,
276 "pcmcia1-detect", GPIO_ACTIVE_LOW),
277 GPIO_LOOKUP("gpio", H3XXX_GPIO_PCMCIA_IRQ1,
278 "pcmcia1-ready", GPIO_ACTIVE_HIGH),
279 { },
280 },
281};
282
267void __init h3xxx_mach_init(void) 283void __init h3xxx_mach_init(void)
268{ 284{
285 gpiod_add_lookup_table(&h3xxx_pcmcia_gpio_table);
269 sa1100_register_uart_fns(&h3xxx_port_fns); 286 sa1100_register_uart_fns(&h3xxx_port_fns);
270 sa11x0_register_mtd(&h3xxx_flash_data, &h3xxx_flash_resource, 1); 287 sa11x0_register_mtd(&h3xxx_flash_data, &h3xxx_flash_resource, 1);
271 platform_add_devices(h3xxx_devices, ARRAY_SIZE(h3xxx_devices)); 288 platform_add_devices(h3xxx_devices, ARRAY_SIZE(h3xxx_devices));
diff --git a/arch/arm/mach-sa1100/include/mach/assabet.h b/arch/arm/mach-sa1100/include/mach/assabet.h
index 558b45323a2d..641a961653af 100644
--- a/arch/arm/mach-sa1100/include/mach/assabet.h
+++ b/arch/arm/mach-sa1100/include/mach/assabet.h
@@ -96,10 +96,4 @@ extern void assabet_uda1341_reset(int set);
96#define ASSABET_GPIO_BATT_LOW GPIO_GPIO (26) /* Low battery */ 96#define ASSABET_GPIO_BATT_LOW GPIO_GPIO (26) /* Low battery */
97#define ASSABET_GPIO_RCLK GPIO_GPIO (26) /* CCLK/2 */ 97#define ASSABET_GPIO_RCLK GPIO_GPIO (26) /* CCLK/2 */
98 98
99/* These are gpiolib GPIO numbers, not bitmasks */
100#define ASSABET_GPIO_CF_IRQ 21 /* CF IRQ */
101#define ASSABET_GPIO_CF_CD 22 /* CF CD */
102#define ASSABET_GPIO_CF_BVD2 24 /* CF BVD / IOSPKR */
103#define ASSABET_GPIO_CF_BVD1 25 /* CF BVD / IOSTSCHG */
104
105#endif 99#endif
diff --git a/arch/arm/mach-sa1100/nanoengine.c b/arch/arm/mach-sa1100/nanoengine.c
index f1cb3784d525..4d35258a7b32 100644
--- a/arch/arm/mach-sa1100/nanoengine.c
+++ b/arch/arm/mach-sa1100/nanoengine.c
@@ -12,6 +12,7 @@
12 */ 12 */
13 13
14#include <linux/init.h> 14#include <linux/init.h>
15#include <linux/gpio/machine.h>
15#include <linux/kernel.h> 16#include <linux/kernel.h>
16#include <linux/platform_data/sa11x0-serial.h> 17#include <linux/platform_data/sa11x0-serial.h>
17#include <linux/mtd/mtd.h> 18#include <linux/mtd/mtd.h>
@@ -99,8 +100,30 @@ static void __init nanoengine_map_io(void)
99 Ser2HSCR0 = 0; 100 Ser2HSCR0 = 0;
100} 101}
101 102
103static struct gpiod_lookup_table nanoengine_pcmcia0_gpio_table = {
104 .dev_id = "sa11x0-pcmcia.0",
105 .table = {
106 GPIO_LOOKUP("gpio", 11, "ready", GPIO_ACTIVE_HIGH),
107 GPIO_LOOKUP("gpio", 13, "detect", GPIO_ACTIVE_LOW),
108 GPIO_LOOKUP("gpio", 15, "reset", GPIO_ACTIVE_HIGH),
109 { },
110 },
111};
112
113static struct gpiod_lookup_table nanoengine_pcmcia1_gpio_table = {
114 .dev_id = "sa11x0-pcmcia.1",
115 .table = {
116 GPIO_LOOKUP("gpio", 12, "ready", GPIO_ACTIVE_HIGH),
117 GPIO_LOOKUP("gpio", 14, "detect", GPIO_ACTIVE_LOW),
118 GPIO_LOOKUP("gpio", 16, "reset", GPIO_ACTIVE_HIGH),
119 { },
120 },
121};
122
102static void __init nanoengine_init(void) 123static void __init nanoengine_init(void)
103{ 124{
125 sa11x0_register_pcmcia(0, &nanoengine_pcmcia0_gpio_table);
126 sa11x0_register_pcmcia(1, &nanoengine_pcmcia1_gpio_table);
104 sa11x0_register_mtd(&nanoengine_flash_data, nanoengine_flash_resources, 127 sa11x0_register_mtd(&nanoengine_flash_data, nanoengine_flash_resources,
105 ARRAY_SIZE(nanoengine_flash_resources)); 128 ARRAY_SIZE(nanoengine_flash_resources));
106} 129}
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c
index 856664c783d9..22f7fe0b809f 100644
--- a/arch/arm/mach-sa1100/shannon.c
+++ b/arch/arm/mach-sa1100/shannon.c
@@ -5,11 +5,14 @@
5 5
6#include <linux/init.h> 6#include <linux/init.h>
7#include <linux/device.h> 7#include <linux/device.h>
8#include <linux/gpio/machine.h>
8#include <linux/kernel.h> 9#include <linux/kernel.h>
9#include <linux/platform_data/sa11x0-serial.h> 10#include <linux/platform_data/sa11x0-serial.h>
10#include <linux/tty.h> 11#include <linux/tty.h>
11#include <linux/mtd/mtd.h> 12#include <linux/mtd/mtd.h>
12#include <linux/mtd/partitions.h> 13#include <linux/mtd/partitions.h>
14#include <linux/regulator/fixed.h>
15#include <linux/regulator/machine.h>
13 16
14#include <video/sa1100fb.h> 17#include <video/sa1100fb.h>
15 18
@@ -72,8 +75,43 @@ static struct sa1100fb_mach_info shannon_lcd_info = {
72 .lccr3 = LCCR3_ACBsDiv(512), 75 .lccr3 = LCCR3_ACBsDiv(512),
73}; 76};
74 77
78static struct gpiod_lookup_table shannon_pcmcia0_gpio_table = {
79 .dev_id = "sa11x0-pcmcia.0",
80 .table = {
81 GPIO_LOOKUP("gpio", 24, "detect", GPIO_ACTIVE_LOW),
82 GPIO_LOOKUP("gpio", 26, "ready", GPIO_ACTIVE_HIGH),
83 { },
84 },
85};
86
87static struct gpiod_lookup_table shannon_pcmcia1_gpio_table = {
88 .dev_id = "sa11x0-pcmcia.1",
89 .table = {
90 GPIO_LOOKUP("gpio", 25, "detect", GPIO_ACTIVE_LOW),
91 GPIO_LOOKUP("gpio", 27, "ready", GPIO_ACTIVE_HIGH),
92 { },
93 },
94};
95
96static struct regulator_consumer_supply shannon_cf_vcc_consumers[] = {
97 REGULATOR_SUPPLY("vcc", "sa11x0-pcmcia.0"),
98 REGULATOR_SUPPLY("vcc", "sa11x0-pcmcia.1"),
99};
100
101static struct fixed_voltage_config shannon_cf_vcc_pdata __initdata = {
102 .supply_name = "cf-power",
103 .microvolts = 3300000,
104 .enabled_at_boot = 1,
105 .gpio = -EINVAL,
106};
107
75static void __init shannon_init(void) 108static void __init shannon_init(void)
76{ 109{
110 sa11x0_register_fixed_regulator(0, &shannon_cf_vcc_pdata,
111 shannon_cf_vcc_consumers,
112 ARRAY_SIZE(shannon_cf_vcc_consumers));
113 sa11x0_register_pcmcia(0, &shannon_pcmcia0_gpio_table);
114 sa11x0_register_pcmcia(1, &shannon_pcmcia1_gpio_table);
77 sa11x0_ppc_configure_mcp(); 115 sa11x0_ppc_configure_mcp();
78 sa11x0_register_lcd(&shannon_lcd_info); 116 sa11x0_register_lcd(&shannon_lcd_info);
79 sa11x0_register_mtd(&shannon_flash_data, &shannon_flash_resource, 1); 117 sa11x0_register_mtd(&shannon_flash_data, &shannon_flash_resource, 1);
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
index 7d4feb8a49ac..ace010479eb6 100644
--- a/arch/arm/mach-sa1100/simpad.c
+++ b/arch/arm/mach-sa1100/simpad.c
@@ -4,6 +4,7 @@
4 */ 4 */
5 5
6#include <linux/module.h> 6#include <linux/module.h>
7#include <linux/gpio/machine.h>
7#include <linux/init.h> 8#include <linux/init.h>
8#include <linux/kernel.h> 9#include <linux/kernel.h>
9#include <linux/tty.h> 10#include <linux/tty.h>
@@ -364,6 +365,15 @@ static struct platform_device *devices[] __initdata = {
364 &simpad_i2c, 365 &simpad_i2c,
365}; 366};
366 367
368/* Compact Flash */
369static struct gpiod_lookup_table simpad_cf_gpio_table = {
370 .dev_id = "sa11x0-pcmcia",
371 .table = {
372 GPIO_LOOKUP("gpio", GPIO_CF_IRQ, "cf-ready", GPIO_ACTIVE_HIGH),
373 GPIO_LOOKUP("gpio", GPIO_CF_CD, "cf-detect", GPIO_ACTIVE_HIGH),
374 { },
375 },
376};
367 377
368 378
369static int __init simpad_init(void) 379static int __init simpad_init(void)
@@ -385,6 +395,7 @@ static int __init simpad_init(void)
385 395
386 pm_power_off = simpad_power_off; 396 pm_power_off = simpad_power_off;
387 397
398 sa11x0_register_pcmcia(-1, &simpad_cf_gpio_table);
388 sa11x0_ppc_configure_mcp(); 399 sa11x0_ppc_configure_mcp();
389 sa11x0_register_mtd(&simpad_flash_data, simpad_flash_resources, 400 sa11x0_register_mtd(&simpad_flash_data, simpad_flash_resources,
390 ARRAY_SIZE(simpad_flash_resources)); 401 ARRAY_SIZE(simpad_flash_resources));
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index f1f89ddb1bfd..28502bd159e0 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -43,13 +43,9 @@ sa1111_cs-$(CONFIG_SA1100_JORNADA720) += sa1111_jornada720.o
43sa1111_cs-$(CONFIG_ARCH_LUBBOCK) += sa1111_lubbock.o 43sa1111_cs-$(CONFIG_ARCH_LUBBOCK) += sa1111_lubbock.o
44 44
45sa1100_cs-y += sa1100_generic.o 45sa1100_cs-y += sa1100_generic.o
46sa1100_cs-$(CONFIG_SA1100_ASSABET) += sa1100_assabet.o
47sa1100_cs-$(CONFIG_SA1100_CERF) += sa1100_cerf.o
48sa1100_cs-$(CONFIG_SA1100_COLLIE) += pxa2xx_sharpsl.o 46sa1100_cs-$(CONFIG_SA1100_COLLIE) += pxa2xx_sharpsl.o
49sa1100_cs-$(CONFIG_SA1100_H3100) += sa1100_h3600.o 47sa1100_cs-$(CONFIG_SA1100_H3100) += sa1100_h3600.o
50sa1100_cs-$(CONFIG_SA1100_H3600) += sa1100_h3600.o 48sa1100_cs-$(CONFIG_SA1100_H3600) += sa1100_h3600.o
51sa1100_cs-$(CONFIG_SA1100_NANOENGINE) += sa1100_nanoengine.o
52sa1100_cs-$(CONFIG_SA1100_SHANNON) += sa1100_shannon.o
53sa1100_cs-$(CONFIG_SA1100_SIMPAD) += sa1100_simpad.o 49sa1100_cs-$(CONFIG_SA1100_SIMPAD) += sa1100_simpad.o
54 50
55pxa2xx_cm_x2xx_cs-y += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o 51pxa2xx_cm_x2xx_cs-y += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
diff --git a/drivers/pcmcia/sa1100_assabet.c b/drivers/pcmcia/sa1100_assabet.c
deleted file mode 100644
index 78ad2bba76db..000000000000
--- a/drivers/pcmcia/sa1100_assabet.c
+++ /dev/null
@@ -1,100 +0,0 @@
1// SPDX-License-Identifier: GPL-2.0
2/*
3 * drivers/pcmcia/sa1100_assabet.c
4 *
5 * PCMCIA implementation routines for Assabet
6 *
7 */
8#include <linux/module.h>
9#include <linux/kernel.h>
10#include <linux/errno.h>
11#include <linux/interrupt.h>
12#include <linux/device.h>
13#include <linux/init.h>
14#include <linux/gpio.h>
15
16#include <asm/mach-types.h>
17#include <mach/assabet.h>
18
19#include "sa1100_generic.h"
20
21static int assabet_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
22{
23 skt->stat[SOC_STAT_CD].gpio = ASSABET_GPIO_CF_CD;
24 skt->stat[SOC_STAT_CD].name = "CF CD";
25 skt->stat[SOC_STAT_BVD1].gpio = ASSABET_GPIO_CF_BVD1;
26 skt->stat[SOC_STAT_BVD1].name = "CF BVD1";
27 skt->stat[SOC_STAT_BVD2].gpio = ASSABET_GPIO_CF_BVD2;
28 skt->stat[SOC_STAT_BVD2].name = "CF BVD2";
29 skt->stat[SOC_STAT_RDY].gpio = ASSABET_GPIO_CF_IRQ;
30 skt->stat[SOC_STAT_RDY].name = "CF RDY";
31
32 return 0;
33}
34
35static int
36assabet_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state)
37{
38 unsigned int mask;
39
40 switch (state->Vcc) {
41 case 0:
42 mask = 0;
43 break;
44
45 case 50:
46 printk(KERN_WARNING "%s(): CS asked for 5V, applying 3.3V...\n",
47 __func__);
48
49 case 33: /* Can only apply 3.3V to the CF slot. */
50 mask = ASSABET_BCR_CF_PWR;
51 break;
52
53 default:
54 printk(KERN_ERR "%s(): unrecognized Vcc %u\n", __func__,
55 state->Vcc);
56 return -1;
57 }
58
59 /* Silently ignore Vpp, speaker enable. */
60
61 if (state->flags & SS_RESET)
62 mask |= ASSABET_BCR_CF_RST;
63 if (!(state->flags & SS_OUTPUT_ENA))
64 mask |= ASSABET_BCR_CF_BUS_OFF;
65
66 ASSABET_BCR_frob(ASSABET_BCR_CF_RST | ASSABET_BCR_CF_PWR |
67 ASSABET_BCR_CF_BUS_OFF, mask);
68
69 return 0;
70}
71
72/*
73 * Disable card status IRQs on suspend.
74 */
75static void assabet_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
76{
77 /*
78 * Tristate the CF bus signals. Also assert CF
79 * reset as per user guide page 4-11.
80 */
81 ASSABET_BCR_set(ASSABET_BCR_CF_BUS_OFF | ASSABET_BCR_CF_RST);
82}
83
84static struct pcmcia_low_level assabet_pcmcia_ops = {
85 .owner = THIS_MODULE,
86 .hw_init = assabet_pcmcia_hw_init,
87 .socket_state = soc_common_cf_socket_state,
88 .configure_socket = assabet_pcmcia_configure_socket,
89 .socket_suspend = assabet_pcmcia_socket_suspend,
90};
91
92int pcmcia_assabet_init(struct device *dev)
93{
94 int ret = -ENODEV;
95
96 if (machine_is_assabet() && !machine_has_neponset())
97 ret = sa11xx_drv_pcmcia_probe(dev, &assabet_pcmcia_ops, 1, 1);
98
99 return ret;
100}
diff --git a/drivers/pcmcia/sa1100_cerf.c b/drivers/pcmcia/sa1100_cerf.c
deleted file mode 100644
index 2a54081d161d..000000000000
--- a/drivers/pcmcia/sa1100_cerf.c
+++ /dev/null
@@ -1,86 +0,0 @@
1// SPDX-License-Identifier: GPL-2.0
2/*
3 * drivers/pcmcia/sa1100_cerf.c
4 *
5 * PCMCIA implementation routines for CerfBoard
6 * Based off the Assabet.
7 *
8 */
9#include <linux/module.h>
10#include <linux/kernel.h>
11#include <linux/device.h>
12#include <linux/init.h>
13#include <linux/delay.h>
14#include <linux/gpio.h>
15
16#include <mach/hardware.h>
17#include <asm/mach-types.h>
18#include <asm/irq.h>
19#include <mach/cerf.h>
20#include "sa1100_generic.h"
21
22#define CERF_SOCKET 1
23
24static int cerf_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
25{
26 int ret;
27
28 ret = gpio_request_one(CERF_GPIO_CF_RESET, GPIOF_OUT_INIT_LOW, "CF_RESET");
29 if (ret)
30 return ret;
31
32 skt->stat[SOC_STAT_CD].gpio = CERF_GPIO_CF_CD;
33 skt->stat[SOC_STAT_CD].name = "CF_CD";
34 skt->stat[SOC_STAT_BVD1].gpio = CERF_GPIO_CF_BVD1;
35 skt->stat[SOC_STAT_BVD1].name = "CF_BVD1";
36 skt->stat[SOC_STAT_BVD2].gpio = CERF_GPIO_CF_BVD2;
37 skt->stat[SOC_STAT_BVD2].name = "CF_BVD2";
38 skt->stat[SOC_STAT_RDY].gpio = CERF_GPIO_CF_IRQ;
39 skt->stat[SOC_STAT_RDY].name = "CF_IRQ";
40
41 return 0;
42}
43
44static void cerf_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
45{
46 gpio_free(CERF_GPIO_CF_RESET);
47}
48
49static int
50cerf_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
51 const socket_state_t *state)
52{
53 switch (state->Vcc) {
54 case 0:
55 case 50:
56 case 33:
57 break;
58
59 default:
60 printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
61 __func__, state->Vcc);
62 return -1;
63 }
64
65 gpio_set_value(CERF_GPIO_CF_RESET, !!(state->flags & SS_RESET));
66
67 return 0;
68}
69
70static struct pcmcia_low_level cerf_pcmcia_ops = {
71 .owner = THIS_MODULE,
72 .hw_init = cerf_pcmcia_hw_init,
73 .hw_shutdown = cerf_pcmcia_hw_shutdown,
74 .socket_state = soc_common_cf_socket_state,
75 .configure_socket = cerf_pcmcia_configure_socket,
76};
77
78int pcmcia_cerf_init(struct device *dev)
79{
80 int ret = -ENODEV;
81
82 if (machine_is_cerf())
83 ret = sa11xx_drv_pcmcia_probe(dev, &cerf_pcmcia_ops, CERF_SOCKET, 1);
84
85 return ret;
86}
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
index 66acdc85727c..47b060c57418 100644
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -31,7 +31,9 @@
31======================================================================*/ 31======================================================================*/
32 32
33#include <linux/module.h> 33#include <linux/module.h>
34#include <linux/gpio/consumer.h>
34#include <linux/init.h> 35#include <linux/init.h>
36#include <linux/regulator/consumer.h>
35#include <linux/slab.h> 37#include <linux/slab.h>
36#include <linux/platform_device.h> 38#include <linux/platform_device.h>
37 39
@@ -41,24 +43,64 @@
41 43
42#include "sa1100_generic.h" 44#include "sa1100_generic.h"
43 45
46static const char *sa11x0_cf_gpio_names[] = {
47 [SOC_STAT_CD] = "detect",
48 [SOC_STAT_BVD1] = "bvd1",
49 [SOC_STAT_BVD2] = "bvd2",
50 [SOC_STAT_RDY] = "ready",
51};
52
53static int sa11x0_cf_hw_init(struct soc_pcmcia_socket *skt)
54{
55 struct device *dev = skt->socket.dev.parent;
56 int i;
57
58 skt->gpio_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
59 if (IS_ERR(skt->gpio_reset))
60 return PTR_ERR(skt->gpio_reset);
61
62 skt->gpio_bus_enable = devm_gpiod_get_optional(dev, "bus-enable",
63 GPIOD_OUT_HIGH);
64 if (IS_ERR(skt->gpio_bus_enable))
65 return PTR_ERR(skt->gpio_bus_enable);
66
67 skt->vcc.reg = devm_regulator_get_optional(dev, "vcc");
68 if (IS_ERR(skt->vcc.reg))
69 return PTR_ERR(skt->vcc.reg);
70
71 if (!skt->vcc.reg)
72 dev_warn(dev,
73 "no Vcc regulator provided, ignoring Vcc controls\n");
74
75 for (i = 0; i < ARRAY_SIZE(sa11x0_cf_gpio_names); i++) {
76 skt->stat[i].name = sa11x0_cf_gpio_names[i];
77 skt->stat[i].desc = devm_gpiod_get_optional(dev,
78 sa11x0_cf_gpio_names[i], GPIOD_IN);
79 if (IS_ERR(skt->stat[i].desc))
80 return PTR_ERR(skt->stat[i].desc);
81 }
82 return 0;
83}
84
85static int sa11x0_cf_configure_socket(struct soc_pcmcia_socket *skt,
86 const socket_state_t *state)
87{
88 return soc_pcmcia_regulator_set(skt, &skt->vcc, state->Vcc);
89}
90
91static struct pcmcia_low_level sa11x0_cf_ops = {
92 .owner = THIS_MODULE,
93 .hw_init = sa11x0_cf_hw_init,
94 .socket_state = soc_common_cf_socket_state,
95 .configure_socket = sa11x0_cf_configure_socket,
96};
97
44int __init pcmcia_collie_init(struct device *dev); 98int __init pcmcia_collie_init(struct device *dev);
45 99
46static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = { 100static int (*sa11x0_pcmcia_legacy_hw_init[])(struct device *dev) = {
47#ifdef CONFIG_SA1100_ASSABET
48 pcmcia_assabet_init,
49#endif
50#ifdef CONFIG_SA1100_CERF
51 pcmcia_cerf_init,
52#endif
53#if defined(CONFIG_SA1100_H3100) || defined(CONFIG_SA1100_H3600) 101#if defined(CONFIG_SA1100_H3100) || defined(CONFIG_SA1100_H3600)
54 pcmcia_h3600_init, 102 pcmcia_h3600_init,
55#endif 103#endif
56#ifdef CONFIG_SA1100_NANOENGINE
57 pcmcia_nanoengine_init,
58#endif
59#ifdef CONFIG_SA1100_SHANNON
60 pcmcia_shannon_init,
61#endif
62#ifdef CONFIG_SA1100_SIMPAD 104#ifdef CONFIG_SA1100_SIMPAD
63 pcmcia_simpad_init, 105 pcmcia_simpad_init,
64#endif 106#endif
@@ -67,15 +109,15 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
67#endif 109#endif
68}; 110};
69 111
70static int sa11x0_drv_pcmcia_probe(struct platform_device *dev) 112static int sa11x0_drv_pcmcia_legacy_probe(struct platform_device *dev)
71{ 113{
72 int i, ret = -ENODEV; 114 int i, ret = -ENODEV;
73 115
74 /* 116 /*
75 * Initialise any "on-board" PCMCIA sockets. 117 * Initialise any "on-board" PCMCIA sockets.
76 */ 118 */
77 for (i = 0; i < ARRAY_SIZE(sa11x0_pcmcia_hw_init); i++) { 119 for (i = 0; i < ARRAY_SIZE(sa11x0_pcmcia_legacy_hw_init); i++) {
78 ret = sa11x0_pcmcia_hw_init[i](&dev->dev); 120 ret = sa11x0_pcmcia_legacy_hw_init[i](&dev->dev);
79 if (ret == 0) 121 if (ret == 0)
80 break; 122 break;
81 } 123 }
@@ -83,7 +125,7 @@ static int sa11x0_drv_pcmcia_probe(struct platform_device *dev)
83 return ret; 125 return ret;
84} 126}
85 127
86static int sa11x0_drv_pcmcia_remove(struct platform_device *dev) 128static int sa11x0_drv_pcmcia_legacy_remove(struct platform_device *dev)
87{ 129{
88 struct skt_dev_info *sinfo = platform_get_drvdata(dev); 130 struct skt_dev_info *sinfo = platform_get_drvdata(dev);
89 int i; 131 int i;
@@ -96,6 +138,45 @@ static int sa11x0_drv_pcmcia_remove(struct platform_device *dev)
96 return 0; 138 return 0;
97} 139}
98 140
141static int sa11x0_drv_pcmcia_probe(struct platform_device *pdev)
142{
143 struct soc_pcmcia_socket *skt;
144 struct device *dev = &pdev->dev;
145
146 if (pdev->id == -1)
147 return sa11x0_drv_pcmcia_legacy_probe(pdev);
148
149 skt = devm_kzalloc(dev, sizeof(*skt), GFP_KERNEL);
150 if (!skt)
151 return -ENOMEM;
152
153 platform_set_drvdata(pdev, skt);
154
155 skt->nr = pdev->id;
156 skt->clk = devm_clk_get(dev, NULL);
157 if (IS_ERR(skt->clk))
158 return PTR_ERR(skt->clk);
159
160 sa11xx_drv_pcmcia_ops(&sa11x0_cf_ops);
161 soc_pcmcia_init_one(skt, &sa11x0_cf_ops, dev);
162
163 return sa11xx_drv_pcmcia_add_one(skt);
164}
165
166static int sa11x0_drv_pcmcia_remove(struct platform_device *dev)
167{
168 struct soc_pcmcia_socket *skt;
169
170 if (dev->id == -1)
171 return sa11x0_drv_pcmcia_legacy_remove(dev);
172
173 skt = platform_get_drvdata(dev);
174
175 soc_pcmcia_remove_one(skt);
176
177 return 0;
178}
179
99static struct platform_driver sa11x0_pcmcia_driver = { 180static struct platform_driver sa11x0_pcmcia_driver = {
100 .driver = { 181 .driver = {
101 .name = "sa11x0-pcmcia", 182 .name = "sa11x0-pcmcia",
diff --git a/drivers/pcmcia/sa1100_generic.h b/drivers/pcmcia/sa1100_generic.h
index a5f1f1dd63cb..7b7cdcd20187 100644
--- a/drivers/pcmcia/sa1100_generic.h
+++ b/drivers/pcmcia/sa1100_generic.h
@@ -6,18 +6,14 @@
6 * Declaration for all machine specific init/exit functions. 6 * Declaration for all machine specific init/exit functions.
7 */ 7 */
8extern int pcmcia_adsbitsy_init(struct device *); 8extern int pcmcia_adsbitsy_init(struct device *);
9extern int pcmcia_assabet_init(struct device *);
10extern int pcmcia_badge4_init(struct device *); 9extern int pcmcia_badge4_init(struct device *);
11extern int pcmcia_cerf_init(struct device *);
12extern int pcmcia_flexanet_init(struct device *); 10extern int pcmcia_flexanet_init(struct device *);
13extern int pcmcia_freebird_init(struct device *); 11extern int pcmcia_freebird_init(struct device *);
14extern int pcmcia_gcplus_init(struct device *); 12extern int pcmcia_gcplus_init(struct device *);
15extern int pcmcia_graphicsmaster_init(struct device *); 13extern int pcmcia_graphicsmaster_init(struct device *);
16extern int pcmcia_h3600_init(struct device *); 14extern int pcmcia_h3600_init(struct device *);
17extern int pcmcia_nanoengine_init(struct device *);
18extern int pcmcia_pangolin_init(struct device *); 15extern int pcmcia_pangolin_init(struct device *);
19extern int pcmcia_pfs168_init(struct device *); 16extern int pcmcia_pfs168_init(struct device *);
20extern int pcmcia_shannon_init(struct device *);
21extern int pcmcia_simpad_init(struct device *); 17extern int pcmcia_simpad_init(struct device *);
22extern int pcmcia_stork_init(struct device *); 18extern int pcmcia_stork_init(struct device *);
23extern int pcmcia_system3_init(struct device *); 19extern int pcmcia_system3_init(struct device *);
diff --git a/drivers/pcmcia/sa1100_h3600.c b/drivers/pcmcia/sa1100_h3600.c
index aebf9a66fdde..a91222bc3824 100644
--- a/drivers/pcmcia/sa1100_h3600.c
+++ b/drivers/pcmcia/sa1100_h3600.c
@@ -24,13 +24,15 @@ static int h3600_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
24{ 24{
25 int err; 25 int err;
26 26
27 skt->stat[SOC_STAT_CD].name = skt->nr ? "pcmcia1-detect" : "pcmcia0-detect";
28 skt->stat[SOC_STAT_RDY].name = skt->nr ? "pcmcia1-ready" : "pcmcia0-ready";
29
30 err = soc_pcmcia_request_gpiods(skt);
31 if (err)
32 return err;
33
27 switch (skt->nr) { 34 switch (skt->nr) {
28 case 0: 35 case 0:
29 skt->stat[SOC_STAT_CD].gpio = H3XXX_GPIO_PCMCIA_CD0;
30 skt->stat[SOC_STAT_CD].name = "PCMCIA CD0";
31 skt->stat[SOC_STAT_RDY].gpio = H3XXX_GPIO_PCMCIA_IRQ0;
32 skt->stat[SOC_STAT_RDY].name = "PCMCIA IRQ0";
33
34 err = gpio_request(H3XXX_EGPIO_OPT_NVRAM_ON, "OPT NVRAM ON"); 36 err = gpio_request(H3XXX_EGPIO_OPT_NVRAM_ON, "OPT NVRAM ON");
35 if (err) 37 if (err)
36 goto err01; 38 goto err01;
@@ -57,10 +59,6 @@ static int h3600_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
57 goto err06; 59 goto err06;
58 break; 60 break;
59 case 1: 61 case 1:
60 skt->stat[SOC_STAT_CD].gpio = H3XXX_GPIO_PCMCIA_CD1;
61 skt->stat[SOC_STAT_CD].name = "PCMCIA CD1";
62 skt->stat[SOC_STAT_RDY].gpio = H3XXX_GPIO_PCMCIA_IRQ1;
63 skt->stat[SOC_STAT_RDY].name = "PCMCIA IRQ1";
64 break; 62 break;
65 } 63 }
66 return 0; 64 return 0;
diff --git a/drivers/pcmcia/sa1100_nanoengine.c b/drivers/pcmcia/sa1100_nanoengine.c
deleted file mode 100644
index 35c30ff41e81..000000000000
--- a/drivers/pcmcia/sa1100_nanoengine.c
+++ /dev/null
@@ -1,133 +0,0 @@
1/*
2 * drivers/pcmcia/sa1100_nanoengine.c
3 *
4 * PCMCIA implementation routines for BSI nanoEngine.
5 *
6 * In order to have a fully functional pcmcia subsystem in a BSE nanoEngine
7 * board you should carefully read this:
8 * http://cambuca.ldhs.cetuc.puc-rio.br/nanoengine/
9 *
10 * Copyright (C) 2010 Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
11 *
12 * Based on original work for kernel 2.4 by
13 * Miguel Freitas <miguel@cpti.cetuc.puc-rio.br>
14 *
15 * This program is free software; you can redistribute it and/or modify
16 * it under the terms of the GNU General Public License version 2 as
17 * published by the Free Software Foundation.
18 *
19 */
20#include <linux/device.h>
21#include <linux/errno.h>
22#include <linux/gpio.h>
23#include <linux/interrupt.h>
24#include <linux/irq.h>
25#include <linux/init.h>
26#include <linux/kernel.h>
27#include <linux/module.h>
28#include <linux/signal.h>
29
30#include <asm/mach-types.h>
31#include <asm/irq.h>
32
33#include <mach/hardware.h>
34#include <mach/nanoengine.h>
35
36#include "sa1100_generic.h"
37
38struct nanoengine_pins {
39 unsigned output_pins;
40 unsigned clear_outputs;
41 int gpio_rst;
42 int gpio_cd;
43 int gpio_rdy;
44};
45
46static struct nanoengine_pins nano_skts[] = {
47 {
48 .gpio_rst = GPIO_PC_RESET0,
49 .gpio_cd = GPIO_PC_CD0,
50 .gpio_rdy = GPIO_PC_READY0,
51 }, {
52 .gpio_rst = GPIO_PC_RESET1,
53 .gpio_cd = GPIO_PC_CD1,
54 .gpio_rdy = GPIO_PC_READY1,
55 }
56};
57
58unsigned num_nano_pcmcia_sockets = ARRAY_SIZE(nano_skts);
59
60static int nanoengine_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
61{
62 unsigned i = skt->nr;
63 int ret;
64
65 if (i >= num_nano_pcmcia_sockets)
66 return -ENXIO;
67
68 ret = gpio_request_one(nano_skts[i].gpio_rst, GPIOF_OUT_INIT_LOW,
69 i ? "PC RST1" : "PC RST0");
70 if (ret)
71 return ret;
72
73 skt->stat[SOC_STAT_CD].gpio = nano_skts[i].gpio_cd;
74 skt->stat[SOC_STAT_CD].name = i ? "PC CD1" : "PC CD0";
75 skt->stat[SOC_STAT_RDY].gpio = nano_skts[i].gpio_rdy;
76 skt->stat[SOC_STAT_RDY].name = i ? "PC RDY1" : "PC RDY0";
77
78 return 0;
79}
80
81static void nanoengine_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
82{
83 gpio_free(nano_skts[skt->nr].gpio_rst);
84}
85
86static int nanoengine_pcmcia_configure_socket(
87 struct soc_pcmcia_socket *skt, const socket_state_t *state)
88{
89 unsigned i = skt->nr;
90
91 if (i >= num_nano_pcmcia_sockets)
92 return -ENXIO;
93
94 gpio_set_value(nano_skts[skt->nr].gpio_rst, !!(state->flags & SS_RESET));
95
96 return 0;
97}
98
99static void nanoengine_pcmcia_socket_state(
100 struct soc_pcmcia_socket *skt, struct pcmcia_state *state)
101{
102 unsigned i = skt->nr;
103
104 if (i >= num_nano_pcmcia_sockets)
105 return;
106
107 state->bvd1 = 1;
108 state->bvd2 = 1;
109 state->vs_3v = 1; /* Can only apply 3.3V */
110 state->vs_Xv = 0;
111}
112
113static struct pcmcia_low_level nanoengine_pcmcia_ops = {
114 .owner = THIS_MODULE,
115
116 .hw_init = nanoengine_pcmcia_hw_init,
117 .hw_shutdown = nanoengine_pcmcia_hw_shutdown,
118
119 .configure_socket = nanoengine_pcmcia_configure_socket,
120 .socket_state = nanoengine_pcmcia_socket_state,
121};
122
123int pcmcia_nanoengine_init(struct device *dev)
124{
125 int ret = -ENODEV;
126
127 if (machine_is_nanoengine())
128 ret = sa11xx_drv_pcmcia_probe(
129 dev, &nanoengine_pcmcia_ops, 0, 2);
130
131 return ret;
132}
133
diff --git a/drivers/pcmcia/sa1100_shannon.c b/drivers/pcmcia/sa1100_shannon.c
deleted file mode 100644
index 0e52a575986e..000000000000
--- a/drivers/pcmcia/sa1100_shannon.c
+++ /dev/null
@@ -1,104 +0,0 @@
1// SPDX-License-Identifier: GPL-2.0
2/*
3 * drivers/pcmcia/sa1100_shannon.c
4 *
5 * PCMCIA implementation routines for Shannon
6 *
7 */
8#include <linux/module.h>
9#include <linux/kernel.h>
10#include <linux/device.h>
11#include <linux/init.h>
12#include <linux/io.h>
13
14#include <mach/hardware.h>
15#include <asm/mach-types.h>
16#include <mach/shannon.h>
17#include <asm/irq.h>
18#include "sa1100_generic.h"
19
20static int shannon_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
21{
22 /* All those are inputs */
23 GAFR &= ~(GPIO_GPIO(SHANNON_GPIO_EJECT_0) |
24 GPIO_GPIO(SHANNON_GPIO_EJECT_1) |
25 GPIO_GPIO(SHANNON_GPIO_RDY_0) |
26 GPIO_GPIO(SHANNON_GPIO_RDY_1));
27
28 if (skt->nr == 0) {
29 skt->stat[SOC_STAT_CD].gpio = SHANNON_GPIO_EJECT_0;
30 skt->stat[SOC_STAT_CD].name = "PCMCIA_CD_0";
31 skt->stat[SOC_STAT_RDY].gpio = SHANNON_GPIO_RDY_0;
32 skt->stat[SOC_STAT_RDY].name = "PCMCIA_RDY_0";
33 } else {
34 skt->stat[SOC_STAT_CD].gpio = SHANNON_GPIO_EJECT_1;
35 skt->stat[SOC_STAT_CD].name = "PCMCIA_CD_1";
36 skt->stat[SOC_STAT_RDY].gpio = SHANNON_GPIO_RDY_1;
37 skt->stat[SOC_STAT_RDY].name = "PCMCIA_RDY_1";
38 }
39
40 return 0;
41}
42
43static void
44shannon_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
45 struct pcmcia_state *state)
46{
47 switch (skt->nr) {
48 case 0:
49 state->bvd1 = 1;
50 state->bvd2 = 1;
51 state->vs_3v = 1; /* FIXME Can only apply 3.3V on Shannon. */
52 state->vs_Xv = 0;
53 break;
54
55 case 1:
56 state->bvd1 = 1;
57 state->bvd2 = 1;
58 state->vs_3v = 1; /* FIXME Can only apply 3.3V on Shannon. */
59 state->vs_Xv = 0;
60 break;
61 }
62}
63
64static int
65shannon_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
66 const socket_state_t *state)
67{
68 switch (state->Vcc) {
69 case 0: /* power off */
70 printk(KERN_WARNING "%s(): CS asked for 0V, still applying 3.3V..\n", __func__);
71 break;
72 case 50:
73 printk(KERN_WARNING "%s(): CS asked for 5V, applying 3.3V..\n", __func__);
74 case 33:
75 break;
76 default:
77 printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
78 __func__, state->Vcc);
79 return -1;
80 }
81
82 printk(KERN_WARNING "%s(): Warning, Can't perform reset\n", __func__);
83
84 /* Silently ignore Vpp, output enable, speaker enable. */
85
86 return 0;
87}
88
89static struct pcmcia_low_level shannon_pcmcia_ops = {
90 .owner = THIS_MODULE,
91 .hw_init = shannon_pcmcia_hw_init,
92 .socket_state = shannon_pcmcia_socket_state,
93 .configure_socket = shannon_pcmcia_configure_socket,
94};
95
96int pcmcia_shannon_init(struct device *dev)
97{
98 int ret = -ENODEV;
99
100 if (machine_is_shannon())
101 ret = sa11xx_drv_pcmcia_probe(dev, &shannon_pcmcia_ops, 0, 2);
102
103 return ret;
104}
diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c
index 7ce65bb23a8e..e235ee14eaa6 100644
--- a/drivers/pcmcia/sa1100_simpad.c
+++ b/drivers/pcmcia/sa1100_simpad.c
@@ -12,7 +12,6 @@
12 12
13#include <mach/hardware.h> 13#include <mach/hardware.h>
14#include <asm/mach-types.h> 14#include <asm/mach-types.h>
15#include <asm/irq.h>
16#include <mach/simpad.h> 15#include <mach/simpad.h>
17#include "sa1100_generic.h" 16#include "sa1100_generic.h"
18 17
@@ -21,12 +20,10 @@ static int simpad_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
21 20
22 simpad_clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1); 21 simpad_clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1);
23 22
24 skt->stat[SOC_STAT_CD].gpio = GPIO_CF_CD; 23 skt->stat[SOC_STAT_CD].name = "cf-detect";
25 skt->stat[SOC_STAT_CD].name = "CF_CD"; 24 skt->stat[SOC_STAT_RDY].name = "cf-ready";
26 skt->stat[SOC_STAT_RDY].gpio = GPIO_CF_IRQ;
27 skt->stat[SOC_STAT_RDY].name = "CF_RDY";
28 25
29 return 0; 26 return soc_pcmcia_request_gpiods(skt);
30} 27}
31 28
32static void simpad_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt) 29static void simpad_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
@@ -42,9 +39,6 @@ simpad_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
42{ 39{
43 long cs3reg = simpad_get_cs3_ro(); 40 long cs3reg = simpad_get_cs3_ro();
44 41
45 /* the detect signal is inverted - fix that up here */
46 state->detect = !state->detect;
47
48 state->bvd1 = 1; /* Might be cs3reg & PCMCIA_BVD1 */ 42 state->bvd1 = 1; /* Might be cs3reg & PCMCIA_BVD1 */
49 state->bvd2 = 1; /* Might be cs3reg & PCMCIA_BVD2 */ 43 state->bvd2 = 1; /* Might be cs3reg & PCMCIA_BVD2 */
50 44
generated by cgit v1.2.2 (git 2.25.0) at 2025-12-31 17:30:03 -0500