MXC PCMCIA Support
Subsystems (4)
cover MXC PCMCIA Support
This patch series adds support for the MXC PCMCIA / CF controller.
It has been tested on MX21 (with CF card and ide-cs) and compile only tested for MX27, MX31
RFC PATCH 1/2 PCMCIA: Add soc_common support for banked SoC drivers.
Some SoCs (like freescale MXC) require configuring a device register to set the bank mapped into the memory window.
Also allow interrupt flags to be configured (to support shared interrupts).
---
drivers/pcmcia/soc_common.c | 21 +++++++++++++++------ drivers/pcmcia/soc_common.h | 7 +++++++ 2 files changed, 22 insertions(+), 6 deletions(-)
drivers/pcmcia/soc_common.c +15 -6
@@ -257,7 +257,8 @@ static irqreturn_t soc_common_pcmcia_interrupt(int irq, void *dev)struct soc_pcmcia_socket *skt = dev;debug (skt,3 ,"servicing IRQ %d\n" , irq); - +if (skt->ops->ack_interrupt) + skt->ops->ack_interrupt (skt);soc_common_check_status (skt);return IRQ_HANDLED ;
@@ -335,6 +336,7 @@ soc_common_pcmcia_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *m {struct soc_pcmcia_socket *skt =to_soc_pcmcia_socket (sock);unsigned short speed = map->speed; +int ret =0 ;debug (skt,2 ,"map %u speed %u start 0x%08x stop 0x%08x\n" , map->map, map->speed, map->start, map->stop);
@@ -367,11 +369,14 @@ soc_common_pcmcia_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *mif (map->stop ==1 ) map->stop =PAGE_SIZE -1 ; +if (skt->ops->set_io_map) + ret = skt->ops->set_io_map (skt, map); + map->stop -= map->start; map->stop += skt->socket.io_offset; map->start = skt->socket.io_offset; -return 0 ; +return ret; }
@@ -389,6 +394,7 @@ soc_common_pcmcia_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_mapstruct soc_pcmcia_socket *skt =to_soc_pcmcia_socket (sock);struct resource *res;unsigned short speed = map->speed; +int ret =0 ;debug (skt,2 ,"map %u speed %u card_start %08x\n" , map->map, map->speed, map->card_start);
@@ -423,10 +429,12 @@ soc_common_pcmcia_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map } skt->ops->set_timing (skt); +if (skt->ops->set_mem_map) + ret = skt->ops->set_mem_map (skt, map); +else + map->static_start = res->start + map->card_start; - map->static_start = res->start + map->card_start; - -return 0 ; +return ret; }struct bittbl {
@@ -519,7 +527,8 @@ int soc_pcmcia_request_irqs(struct soc_pcmcia_socket *skt,if (irqs[i].sock != skt->nr)continue ; res =request_irq (irqs[i].irq, soc_common_pcmcia_interrupt, -IRQF_DISABLED , irqs[i].str, skt); +IRQF_DISABLED | irqs[i].flags, + irqs[i].str, skt);if (res)break ;set_irq_type (irqs[i].irq,IRQ_TYPE_NONE );
drivers/pcmcia/soc_common.h +7 -0
@@ -113,6 +113,12 @@ struct pcmcia_low_level {*/ int (*frequency_change)(struct soc_pcmcia_socket *,unsigned long ,struct cpufreq_freqs *);#endif +void (*ack_interrupt)(struct soc_pcmcia_socket *); + +/* Hardware specific mapping */ +int (*set_mem_map)(struct soc_pcmcia_socket *,struct pccard_mem_map *); +int (*set_io_map)(struct soc_pcmcia_socket *,struct pccard_io_map *map); + };
@@ -120,6 +126,7 @@ struct pcmcia_irqs {int sock;int irq;const char *str; +unsigned long flags; };struct soc_pcmcia_timing {
RFC PATCH 2/2 MXC: add pcmcia support
In reply to Martin Fuzzey---
arch/arm/mach-mx2/clock_imx21.c | 1 arch/arm/mach-mx2/clock_imx27.c | 1 arch/arm/mach-mx2/devices.c | 21 + arch/arm/mach-mx2/devices.h | 1 arch/arm/mach-mx3/clock.c | 1 drivers/pcmcia/Kconfig | 6 drivers/pcmcia/Makefile | 3 drivers/pcmcia/mxc_generic.c | 711 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 745 insertions(+), 0 deletions(-) create mode 100644 drivers/pcmcia/mxc_generic.c
arch/arm/mach-mx2/clock_imx21.c +1 -0
@@ -960,6 +960,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxc-keypad", NULL, kpp_clk) _REGISTER_CLOCK(NULL, "owire", owire_clk) _REGISTER_CLOCK(NULL, "rtc", rtc_clk) + _REGISTER_CLOCK("mxc-pcmcia", NULL, hclk_clk) };/*
arch/arm/mach-mx2/clock_imx27.c +1 -0
@@ -674,6 +674,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxc_w1.0", NULL, owire_clk) _REGISTER_CLOCK(NULL, "rtc", rtc_clk) _REGISTER_CLOCK(NULL, "scc", scc_clk) + _REGISTER_CLOCK("mxc-pcmcia", NULL, ahb_clk) };/* Adjust the clock path for TO2 and later */
arch/arm/mach-mx2/devices.c +21 -0
@@ -564,3 +564,24 @@ int __init mxc_register_gpios(void) {return mxc_gpio_init (imx_gpio_ports,ARRAY_SIZE (imx_gpio_ports)); } + +static struct resource mxc_resource_pcmcia[] = { + [0 ] = { + .start =PCMCIA_CTL_BASE_ADDR , + .end =PCMCIA_CTL_BASE_ADDR +0x67 , + .flags =IORESOURCE_MEM , + }, + [1 ] = { + .start =MXC_INT_PCMCIA , + .end =MXC_INT_PCMCIA , + .flags =IORESOURCE_IRQ , + }, +}; + +struct platform_device mxc_device_pcmcia = { + .name ="mxc-pcmcia" , + .id =-1 , + .resource = mxc_resource_pcmcia, + .num_resources =ARRAY_SIZE (mxc_resource_pcmcia), +}; +
arch/arm/mach-mx2/devices.h +1 -0
@@ -26,4 +26,5 @@ extern struct platform_device mxc_usbh2;extern struct platform_device mxc_spi_device0;extern struct platform_device mxc_spi_device1;extern struct platform_device mxc_spi_device2; +extern struct platform_device mxc_device_pcmcia;
arch/arm/mach-mx3/clock.c +1 -0
@@ -573,6 +573,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "mpeg4", mpeg4_clk) _REGISTER_CLOCK(NULL, "mbx", mbx_clk) _REGISTER_CLOCK("mxc_rtc", NULL, ckil_clk) + _REGISTER_CLOCK("mxc-pcmcia", NULL, ahb_clk) };int __init mx31_clocks_init (unsigned long fref)
drivers/pcmcia/Kconfig +6 -0
@@ -292,4 +292,10 @@ config PCCARD_NONSTATIC config PCCARD_IODYN bool +config PCMCIA_MXC + tristate "Freescale MXC PCMCIA Driver" + depends on PCMCIA && ARCH_MXC + help + Say Y here to support the integrated PCMCIA in the freescale MXC SoCs. + endif # PCCARD
drivers/pcmcia/Makefile +3 -0
@@ -34,6 +34,8 @@ obj-$(CONFIG_OMAP_CF) += omap_cf.o obj-$(CONFIG_BFIN_CFPCMCIA) += bfin_cf_pcmcia.o obj-$(CONFIG_AT91_CF) += at91_cf.o obj-$(CONFIG_ELECTRA_CF) += electra_cf.o +obj-$(CONFIG_PCMCIA_MXC) += mxc_pcmcia.o +mxc_pcmcia-objs += soc_common.o mxc_generic.o sa11xx_core-y += soc_common.o sa11xx_base.o pxa2xx_core-y += soc_common.o pxa2xx_base.o
@@ -78,3 +80,4 @@ pxa2xx-obj-$(CONFIG_MACH_E740) += pxa2xx_e740.o pxa2xx-obj-$(CONFIG_MACH_STARGATE2) += pxa2xx_stargate2.o obj-$(CONFIG_PCMCIA_PXA2XX) += pxa2xx_core.o $(pxa2xx-obj-y) +
drivers/pcmcia/mxc_generic.c new file +711 -0
711 lines not on this page · raw message
Sascha Hauer
maintainerRFC PATCH 2/2 MXC: add pcmcia support
Hi Martin,
Can you please split the arch specific changes from the driver? These are two different subsystems with two different maintainers.
Quoted 51 lines · Martin Fuzzey
Signed-off-by Martin Fuzzey <[email protected]>---
arch/arm/mach-mx2/clock_imx21.c | 1 arch/arm/mach-mx2/clock_imx27.c | 1 arch/arm/mach-mx2/devices.c | 21 + arch/arm/mach-mx2/devices.h | 1 arch/arm/mach-mx3/clock.c | 1 drivers/pcmcia/Kconfig | 6 drivers/pcmcia/Makefile | 3 drivers/pcmcia/mxc_generic.c | 711 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 745 insertions(+), 0 deletions(-) create mode 100644 drivers/pcmcia/mxc_generic.carch/arm/mach-mx2/clock_imx21.c +1
-0@@ -960,6 +960,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxc-keypad", NULL, kpp_clk) _REGISTER_CLOCK(NULL, "owire", owire_clk) _REGISTER_CLOCK(NULL, "rtc", rtc_clk) + _REGISTER_CLOCK("mxc-pcmcia", NULL, hclk_clk) };/* arch/arm/mach-mx2/clock_imx27.c +1
-0@@ -674,6 +674,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxc_w1.0", NULL, owire_clk) _REGISTER_CLOCK(NULL, "rtc", rtc_clk) _REGISTER_CLOCK(NULL, "scc", scc_clk) + _REGISTER_CLOCK("mxc-pcmcia", NULL, ahb_clk) };/* Adjust the clock path for TO2 and later */ arch/arm/mach-mx2/devices.c +2
-0@@ -564,3 +564,24 @@ int __init mxc_register_gpios(void) {return mxc_gpio_init (imx_gpio_ports,ARRAY_SIZE (imx_gpio_ports)); } + +static struct resource mxc_resource_pcmcia[] = {
arch/arm/mach-mx2/devices.c int __init mxc_register_gpios(void) · line 578
Quoted 10 lines
arch/arm/mach-mx2/devices.c +10
-0+ [0] = { + .start = PCMCIA_CTL_BASE_ADDR, + .end = PCMCIA_CTL_BASE_ADDR + 0x67, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = MXC_INT_PCMCIA, + .end = MXC_INT_PCMCIA, + .flags = IORESOURCE_IRQ, + },
Please let the compiler count the array indices.
Sascha
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |