From: rmk+kernel@armlinux.org.uk (Russell King)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 23/33] ARM: sa1100/cerf: convert to generic CF sockets
Date: Mon, 29 Aug 2016 11:26:03 +0100 [thread overview]
Message-ID: <E1beJlT-0000nx-DC@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <20160829102328.GA28796@n2100.armlinux.org.uk>
Convert Cerf to use the generic CF socket support.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---
arch/arm/mach-sa1100/cerf.c | 18 +++++++--
drivers/pcmcia/Makefile | 1 -
drivers/pcmcia/sa1100_cerf.c | 85 -----------------------------------------
drivers/pcmcia/sa1100_generic.c | 3 --
drivers/pcmcia/sa1100_generic.h | 1 -
5 files changed, 15 insertions(+), 93 deletions(-)
delete mode 100644 drivers/pcmcia/sa1100_cerf.c
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 @@
*/
#include <linux/init.h>
+#include <linux/gpio/machine.h>
#include <linux/kernel.h>
#include <linux/tty.h>
#include <linux/platform_data/sa11x0-serial.h>
@@ -45,6 +46,19 @@ static struct platform_device cerfuart2_device = {
.resource = cerfuart2_resources,
};
+/* Compact Flash */
+static struct gpiod_lookup_table cerf_cf_gpio_table = {
+ .dev_id = "sa11x0-pcmcia.1",
+ .table = {
+ GPIO_LOOKUP("gpio", 19, "bvd2", GPIO_ACTIVE_HIGH),
+ GPIO_LOOKUP("gpio", 20, "bvd1", GPIO_ACTIVE_HIGH),
+ GPIO_LOOKUP("gpio", 21, "reset", GPIO_ACTIVE_HIGH),
+ GPIO_LOOKUP("gpio", 22, "ready", GPIO_ACTIVE_HIGH),
+ GPIO_LOOKUP("gpio", 23, "detect", GPIO_ACTIVE_LOW),
+ { },
+ },
+};
+
/* LEDs */
struct gpio_led cerf_gpio_leds[] = {
{
@@ -151,9 +165,6 @@ static void __init cerf_map_io(void)
sa1100_register_uart(0, 3);
sa1100_register_uart(1, 2); /* disable this and the uart2 device for sa1100_fir */
sa1100_register_uart(2, 1);
-
- /* set some GPDR bits here while it's safe */
- GPDR |= CERF_GPIO_CF_RESET;
}
static struct mcp_plat_data cerf_mcp_data = {
@@ -167,6 +178,7 @@ static void __init cerf_init(void)
platform_add_devices(cerf_devices, ARRAY_SIZE(cerf_devices));
sa11x0_register_mtd(&cerf_flash_data, &cerf_flash_resource, 1);
sa11x0_register_mcp(&cerf_mcp_data);
+ sa11x0_register_pcmcia(1, &cerf_cf_gpio_table);
}
MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index f2f614abc470..dc6a568e7967 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -46,7 +46,6 @@ sa1111_cs-$(CONFIG_SA1100_JORNADA720) += sa1111_jornada720.o
sa1111_cs-$(CONFIG_ARCH_LUBBOCK) += sa1111_lubbock.o
sa1100_cs-y += sa1100_generic.o
-sa1100_cs-$(CONFIG_SA1100_CERF) += sa1100_cerf.o
sa1100_cs-$(CONFIG_SA1100_COLLIE) += pxa2xx_sharpsl.o
sa1100_cs-$(CONFIG_SA1100_H3100) += sa1100_h3600.o
sa1100_cs-$(CONFIG_SA1100_H3600) += sa1100_h3600.o
diff --git a/drivers/pcmcia/sa1100_cerf.c b/drivers/pcmcia/sa1100_cerf.c
deleted file mode 100644
index c3f67363f6a1..000000000000
--- a/drivers/pcmcia/sa1100_cerf.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * drivers/pcmcia/sa1100_cerf.c
- *
- * PCMCIA implementation routines for CerfBoard
- * Based off the Assabet.
- *
- */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/device.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/gpio.h>
-
-#include <mach/hardware.h>
-#include <asm/mach-types.h>
-#include <asm/irq.h>
-#include <mach/cerf.h>
-#include "sa1100_generic.h"
-
-#define CERF_SOCKET 1
-
-static int cerf_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
-{
- int ret;
-
- ret = gpio_request_one(CERF_GPIO_CF_RESET, GPIOF_OUT_INIT_LOW, "CF_RESET");
- if (ret)
- return ret;
-
- skt->stat[SOC_STAT_CD].gpio = CERF_GPIO_CF_CD;
- skt->stat[SOC_STAT_CD].name = "CF_CD";
- skt->stat[SOC_STAT_BVD1].gpio = CERF_GPIO_CF_BVD1;
- skt->stat[SOC_STAT_BVD1].name = "CF_BVD1";
- skt->stat[SOC_STAT_BVD2].gpio = CERF_GPIO_CF_BVD2;
- skt->stat[SOC_STAT_BVD2].name = "CF_BVD2";
- skt->stat[SOC_STAT_RDY].gpio = CERF_GPIO_CF_IRQ;
- skt->stat[SOC_STAT_RDY].name = "CF_IRQ";
-
- return 0;
-}
-
-static void cerf_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
-{
- gpio_free(CERF_GPIO_CF_RESET);
-}
-
-static int
-cerf_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
- const socket_state_t *state)
-{
- switch (state->Vcc) {
- case 0:
- case 50:
- case 33:
- break;
-
- default:
- printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
- __func__, state->Vcc);
- return -1;
- }
-
- gpio_set_value(CERF_GPIO_CF_RESET, !!(state->flags & SS_RESET));
-
- return 0;
-}
-
-static struct pcmcia_low_level cerf_pcmcia_ops = {
- .owner = THIS_MODULE,
- .hw_init = cerf_pcmcia_hw_init,
- .hw_shutdown = cerf_pcmcia_hw_shutdown,
- .socket_state = soc_common_cf_socket_state,
- .configure_socket = cerf_pcmcia_configure_socket,
-};
-
-int pcmcia_cerf_init(struct device *dev)
-{
- int ret = -ENODEV;
-
- if (machine_is_cerf())
- ret = sa11xx_drv_pcmcia_probe(dev, &cerf_pcmcia_ops, CERF_SOCKET, 1);
-
- return ret;
-}
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
index 00746fef4453..83b365f060ea 100644
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -115,9 +115,6 @@ static struct pcmcia_low_level sa11x0_ops = {
int __init pcmcia_collie_init(struct device *dev);
static int (*sa11x0_pcmcia_legacy_hw_init[])(struct device *dev) = {
-#ifdef CONFIG_SA1100_CERF
- pcmcia_cerf_init,
-#endif
#if defined(CONFIG_SA1100_H3100) || defined(CONFIG_SA1100_H3600)
pcmcia_h3600_init,
#endif
diff --git a/drivers/pcmcia/sa1100_generic.h b/drivers/pcmcia/sa1100_generic.h
index 92e0010b4ded..3f5495957ca5 100644
--- a/drivers/pcmcia/sa1100_generic.h
+++ b/drivers/pcmcia/sa1100_generic.h
@@ -6,7 +6,6 @@
*/
extern int pcmcia_adsbitsy_init(struct device *);
extern int pcmcia_badge4_init(struct device *);
-extern int pcmcia_cerf_init(struct device *);
extern int pcmcia_flexanet_init(struct device *);
extern int pcmcia_freebird_init(struct device *);
extern int pcmcia_gcplus_init(struct device *);
--
2.1.0
next prev parent reply other threads:[~2016-08-29 10:26 UTC|newest]
Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-29 10:02 [PATCH 0/3] SA11x0/PXA pcmcia fixes Russell King - ARM Linux
2016-08-29 10:03 ` [PATCH 1/3] pcmcia: sa11xx_base: fix reporting of timing information Russell King
2016-08-29 10:03 ` [PATCH 2/3] pcmcia: sa11xx_base: add units to the " Russell King
2016-08-29 10:03 ` [PATCH 3/3] pcmcia: soc_common: fix SS_STSCHG polarity Russell King
2016-08-29 10:23 ` [RFC PATCH 00/33] SA11x0/PXA GPIO rework (Core + PCMCIA only) Russell King - ARM Linux
2016-08-29 10:24 ` [PATCH 01/33] gpio: sa1100: fix irq probing for ucb1x00 Russell King
2016-09-07 22:25 ` Linus Walleij
2016-08-29 10:24 ` [PATCH 02/33] gpio: sa1100: use sa11x0_gpio_set_wake() Russell King
2016-08-29 10:24 ` [PATCH 03/33] gpio: sa1100: convert to use IO accessors Russell King
2016-08-29 10:24 ` [PATCH 04/33] gpio: sa1100: implement get_direction method Russell King
2016-08-29 10:24 ` [PATCH 05/33] gpio: add generic single-register fixed-direction GPIO driver Russell King
2016-08-29 19:39 ` Robert Jarzmik
2016-08-29 23:12 ` Russell King - ARM Linux
2016-08-30 6:08 ` Alexander Shiyan
2016-08-30 7:41 ` Russell King - ARM Linux
2016-08-30 9:18 ` Russell King - ARM Linux
2016-08-30 16:42 ` Robert Jarzmik
2016-08-30 18:46 ` Russell King - ARM Linux
2016-08-30 21:32 ` Robert Jarzmik
2016-08-31 8:49 ` Russell King - ARM Linux
2016-08-31 10:27 ` Russell King - ARM Linux
2016-09-01 7:19 ` Robert Jarzmik
2016-09-01 9:27 ` Russell King - ARM Linux
2016-09-01 21:58 ` Robert Jarzmik
2016-09-01 23:02 ` Russell King - ARM Linux
2016-09-02 17:50 ` Robert Jarzmik
2016-09-02 18:56 ` Russell King - ARM Linux
2016-09-02 21:21 ` Robert Jarzmik
2016-09-02 23:34 ` Russell King - ARM Linux
2016-09-03 9:15 ` Russell King - ARM Linux
2016-09-03 9:09 ` Russell King - ARM Linux
2016-09-03 10:25 ` Russell King - ARM Linux
2016-09-03 11:31 ` Robert Jarzmik
2016-09-04 19:04 ` Robert Jarzmik
2016-09-04 20:18 ` Russell King - ARM Linux
2016-09-05 9:06 ` Linus Walleij
2016-09-05 12:26 ` Russell King - ARM Linux
2016-09-08 13:21 ` Linus Walleij
2016-09-14 8:50 ` Linus Walleij
2016-08-30 21:25 ` Linus Walleij
2016-08-30 21:42 ` Russell King - ARM Linux
2016-08-30 21:47 ` Linus Walleij
2016-09-02 17:00 ` Russell King - ARM Linux
2016-09-04 20:53 ` Linus Walleij
2016-08-29 10:24 ` [PATCH 06/33] ARM: pxa/lubbock: add GPIO driver for LUB_MISC_WR register Russell King
2016-08-29 19:57 ` Robert Jarzmik
2016-08-29 22:58 ` Russell King - ARM Linux
2016-08-29 10:24 ` [PATCH 07/33] ARM: sa1100/assabet: add BCR/BSR GPIO driver Russell King
2016-08-29 10:24 ` [PATCH 08/33] ARM: sa1100/neponset: add GPIO drivers for control and modem registers Russell King
2016-08-29 10:24 ` [PATCH 09/33] ARM: sa1111: implement a gpio_chip for SA1111 GPIOs Russell King
2016-08-29 10:24 ` [PATCH 10/33] pcmcia: soc_common: switch to using gpio_descs Russell King
2016-09-14 11:29 ` Linus Walleij
2016-09-14 12:10 ` Russell King - ARM Linux
2016-08-29 10:25 ` [PATCH 11/33] pcmcia: soc_common: request legacy detect GPIO with active low Russell King
2016-08-29 10:25 ` [PATCH 12/33] pcmcia: soc_common: add support for reset and bus enable GPIOs Russell King
2016-08-29 10:25 ` [PATCH 13/33] pcmcia: soc_common: restore previous socket state on error Russell King
2016-08-29 10:25 ` [PATCH 14/33] pcmcia: soc_common: add CF socket state helper Russell King
2016-08-29 10:25 ` [PATCH 15/33] pcmcia: soc_common: add support for Vcc and Vpp regulators Russell King
2016-08-29 10:25 ` [PATCH 16/33] pcmcia: soc_common: switch to a per-socket cpufreq notifier Russell King
2016-08-29 10:25 ` [PATCH 17/33] pcmcia: soc_common: constify pcmcia_low_level ops pointer Russell King
2016-08-29 10:25 ` [PATCH 18/33] pcmcia: sa1100: provide generic CF support Russell King
2016-09-14 8:52 ` Linus Walleij
2016-09-14 9:06 ` Russell King - ARM Linux
2016-09-14 11:13 ` Linus Walleij
2016-08-29 10:25 ` [PATCH 19/33] pcmcia: sa1111: add driver-data pointer Russell King
2016-08-29 10:25 ` [PATCH 20/33] pcmcia: add MAX1600 driver Russell King
2016-08-29 10:25 ` [PATCH 21/33] ARM: sa1100: provide infrastructure to support generic CF sockets Russell King
2016-08-29 10:25 ` [PATCH 22/33] ARM: sa1100/assabet: convert to " Russell King
2016-08-29 10:26 ` Russell King [this message]
2016-08-29 10:26 ` [PATCH 24/33] ARM: sa1100/h3xxx: switch h3xxx PCMCIA to use gpiod APIs Russell King
2016-08-29 10:26 ` [PATCH 25/33] ARM: sa1100/nanoengine: convert to generic CF sockets Russell King
2016-08-29 10:26 ` [PATCH 26/33] ARM: sa1100/shannon: switch shannon PCMCIA to use gpiod APIs Russell King
2016-08-29 10:26 ` [PATCH 27/33] ARM: sa1100/simpad: switch simpad CF " Russell King
2016-08-29 10:26 ` [PATCH 28/33] ARM: sa1100/neponset: add GPIOs for PCMCIA Russell King
2016-08-29 10:26 ` [PATCH 29/33] pcmcia: sa1111/neponset: convert to use MAX1600 power driver Russell King
2016-08-29 10:26 ` [PATCH 30/33] ARM: sa1100/jornada720: switch jornada720 PCMCIA to gpiod APIs Russell King
2016-08-29 10:26 ` [PATCH 31/33] ARM: pxa/lubbock: convert PCMCIA to use MAX1600 driver Russell King
2016-08-29 10:26 ` [PATCH 32/33] pcmcia: sa1100*: remove redundant bvd1/bvd2 setting Russell King
2016-08-29 10:26 ` [PATCH 33/33] ARM: sa1111: remove legacy GPIO interfaces Russell King
2016-08-29 11:01 ` [PATCH 0/3] SA11x0 gpio keys/leds Russell King - ARM Linux
2016-08-29 11:03 ` [PATCH 1/3] ARM: sa1100/assabet: add gpio keys support for right-hand two buttons Russell King
2016-08-29 11:03 ` [PATCH 2/3] ARM: sa1100/assabet: switch to using gpio leds Russell King
2016-08-29 11:03 ` [PATCH 3/3] ARM: sa1100/cerf: switch to using gpio_led_register_device() Russell King
2016-08-29 11:25 ` [PATCH 0/8] SA11x0 DMA engine/IrDA updates Russell King - ARM Linux
2016-08-29 11:26 ` [PATCH 1/8] dmaengine: sa11x0: add DMA filters Russell King
2016-08-30 15:57 ` Vinod Koul
2016-08-29 11:26 ` [PATCH 2/8] net: irda/sa1100_ir: convert to dma_request_slave_channel() Russell King
2016-08-29 11:26 ` [PATCH 3/8] net: irda/sa1100_ir: add gpiod APIs for controlling IrDA transceiver Russell King
2016-08-29 11:26 ` [PATCH 4/8] dmaengine: sa11x0: unexport sa11x0_dma_filter_fn and clean up Russell King
2016-08-30 15:58 ` Vinod Koul
2016-08-29 11:26 ` [PATCH 5/8] ARM: sa1100/assabet: switch assabet IrDA to use gpiod APIs Russell King
2016-08-29 11:26 ` [PATCH 6/8] ARM: sa1100/collie: switch collie " Russell King
2016-08-29 11:26 ` [PATCH 7/8] ARM: sa1100/h3xxx: switch h3xxx " Russell King
2016-08-29 11:26 ` [PATCH 8/8] net: irda/sa1100_ir: remove sa11x0 irda platform data Russell King
2016-08-29 12:05 ` [PATCH 0/6] SA11x0 serial updates Russell King - ARM Linux
2016-08-29 12:05 ` [PATCH 1/6] serial: sa1100: add support for mctrl gpios Russell King
2016-08-31 13:25 ` Greg Kroah-Hartman
2016-08-29 12:05 ` [PATCH 2/6] ARM: sa1100/assabet: convert serial to gpiod APIs Russell King
2016-08-29 12:06 ` [PATCH 3/6] ARM: sa1100/h3xxx: " Russell King
2016-08-29 12:06 ` [PATCH 4/6] ARM: sa1100/badge4: remove commented out modem control initialisers Russell King
2016-08-29 12:06 ` [PATCH 5/6] ARM: sa1100/hackkit: remove empty serial mctrl functions Russell King
2016-08-29 12:06 ` [PATCH 6/6] ARM: sa1100/neponset: convert serial to use gpiod APIs Russell King
2016-08-30 10:51 ` [PATCH 0/4] SA11x0 Clocks and removal of Neponset SMC91x hack Russell King - ARM Linux
2016-08-30 10:52 ` [PATCH 1/4] ARM: sa1100: convert to common clock framework Russell King
2016-08-30 10:52 ` [PATCH 2/4] net: smc91x: add external clock support Russell King
2016-08-30 10:52 ` [PATCH 3/4] ARM: sa1100/neponset: add ethernet oscillator Russell King
2016-08-30 10:52 ` [PATCH 4/4] net: smc91x: remove neponset specific oscillator hack Russell King
2016-08-30 10:59 ` [PATCH 0/8] SA11x0/PXA remainder & cleanups Russell King - ARM Linux
2016-08-30 11:00 ` [PATCH 1/8] mfd: ucb1x00: allow IRQ probing to work with IRQs > 32 Russell King
2016-08-30 12:00 ` Lee Jones
2016-08-30 11:00 ` [PATCH 2/8] ARM: pxa/lubbock: remove lubbock_set_misc_wr() from global view Russell King
2016-08-30 11:00 ` [PATCH 3/8] ARM: sa1100/cerf: remove redundant definitions Russell King
2016-08-30 11:00 ` [PATCH 4/8] ARM: sa1100/cerf: move cerf header file Russell King
2016-08-30 11:00 ` [PATCH 5/8] ARM: sa1100/nanoengine: remove redundant definitions Russell King
2016-08-30 11:00 ` [PATCH 6/8] ARM: sa1100/nanoengine: move nanoengine header file Russell King
2016-08-30 11:00 ` [PATCH 7/8] ARM: sa1100/neponset: remove neponset_ncr_* GPIO interfaces and header Russell King
2016-08-30 11:01 ` [PATCH 8/8] ARM: sa1100: remove SA-1101 header file Russell King
2016-08-30 15:31 ` [PATCH 0/4] SA11x0 Clocks and removal of Neponset SMC91x hack Nicolas Pitre
2016-09-01 23:32 ` David Miller
2016-09-02 18:59 ` Russell King - ARM Linux
2016-09-05 9:09 ` [PATCH 0/6] SA11x0 serial updates Linus Walleij
2016-09-05 12:28 ` Russell King - ARM Linux
2016-09-07 22:28 ` Linus Walleij
2016-09-08 13:23 ` Linus Walleij
2016-08-30 21:31 ` [RFC PATCH 00/33] SA11x0/PXA GPIO rework (Core + PCMCIA only) Linus Walleij
2016-09-01 15:34 ` Russell King - ARM Linux
2016-09-06 14:46 ` [PATCH 0/3] SA11x0/PXA pcmcia fixes Russell King - ARM Linux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1beJlT-0000nx-DC@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).