bk://bk.arm.linux.org.uk/linux-2.6-rmk catalin.marinas@com.rmk.(none)|ChangeSet|20050113224921|41282 catalin.marinas # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2005/01/13 16:36:43-08:00 akpm@bix.(none) # Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk # into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/01/13 16:36:39-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/13 16:33:42-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/01/13 16:33:38-08:00 akpm@bix.(none) +0 -0 # Auto merged # # CREDITS # 2005/01/13 16:33:38-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/13 22:49:21+00:00 catalin.marinas@com.rmk.(none) # [ARM PATCH] 2399/1: asm/constants.h included in arch/arm/vfp/entry.S # # Patch from Catalin Marinas # # The TI_VFPSTATE is otherwise undefined and gas-2.15.90 (and probably # earlier versions) assumes 0. Gas-2.15.92 reports an error. # # Signed-off-by: Catalin Marinas # Signed-off-by: Russell King # # arch/arm/vfp/entry.S # 2005/01/13 00:00:00+00:00 catalin.marinas@com.rmk.(none) +1 -0 # [PATCH] 2399/1: asm/constants.h included in arch/arm/vfp/entry.S # # ChangeSet # 2005/01/13 22:43:31+00:00 LW@de.rmk.(none) # [ARM PATCH] 2395/1: __ioremap() miscalculates mapping size under certain conditions # # Patch from Lothar Wassmann # # Hi, # ioremapping a memory range that ends on the first byte of a page # (e.g. mapping PAGE_SIZE + 1 bytes on a page boundary) results in a # mapping that is one page too short. In particular trying to create a 1 # byte mapping at the start of a page results in a BUG_ON() assertion in # remap_area_pages() because the calculated mapping size is zero. # This bug has been reported on Bugzilla on 2004-02-25: # http://bugzilla.kernel.org/show_bug.cgi?id=2188 # # Signed-off-by: Lothar Wassmann # Signed-off-by: Russell King # # arch/arm/mm/ioremap.c # 2005/01/13 00:00:00+00:00 LW@de.rmk.(none) +1 -1 # [PATCH] 2395/1: __ioremap() miscalculates mapping size under certain conditions # # ChangeSet # 2005/01/13 22:37:36+00:00 elf@com.rmk.(none) # [ARM PATCH] 2394/1: Re: accepting responsibility for Sharp LH ports # # Patch from Marc Singer # # Admitting that I'm the maintainer for the Sharp LH ports. # # Signed-off-by: Marc Singer # Signed-off-by: Russell King # # MAINTAINERS # 2005/01/13 00:51:19+00:00 elf@com.rmk.(none) +7 -0 # [PATCH] 2394/1: Re: accepting responsibility for Sharp LH ports # # ChangeSet # 2005/01/13 22:31:41+00:00 rpurdie@net.rmk.(none) # [ARM PATCH] 2392/1: Add PCMCIA/CF support code for Sharp SL-C7xx Series # # Patch from Richard Purdie # # Add support code to enable the Compact Flash socket on the Sharp # SL-C7xx series of PDAs. The socket is controlled via the Sharp # SCOOP interface. # # Signed-off-by: Richard Purdie # Signed-off-by: Russell King # # drivers/pcmcia/Makefile # 2005/01/13 00:00:00+00:00 rpurdie@net.rmk.(none) +1 -0 # [PATCH] 2392/1: Add PCMCIA/CF support code for Sharp SL-C7xx Series # # drivers/pcmcia/pxa2xx_sharpsl.c # 2005/01/13 00:00:00+00:00 rpurdie@net.rmk.(none) +264 -0 # [PATCH] 2392/1: Add PCMCIA/CF support code for Sharp SL-C7xx Series # # drivers/pcmcia/pxa2xx_sharpsl.c # 2005/01/13 00:00:00+00:00 rpurdie@net.rmk.(none) +0 -0 # BitKeeper file /usr/src/bk/linux-2.6-rmk/drivers/pcmcia/pxa2xx_sharpsl.c # # ChangeSet # 2005/01/12 12:14:51-08:00 akpm@bix.(none) # Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk # into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/01/12 12:14:47-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/11 21:32:02-08:00 akpm@bix.(none) # Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk # into bix.(none):/usr/src/bk-arm # # CREDITS # 2005/01/11 21:31:56-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/11 11:47:36-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/01/11 11:47:31-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/10 20:25:29-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/01/10 20:25:24-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/10 14:38:10-08:00 akpm@bix.(none) # Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk # into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/01/10 14:38:06-08:00 akpm@bix.(none) +0 -0 # Auto merged # diff -Nru a/MAINTAINERS b/MAINTAINERS --- a/MAINTAINERS 2005-01-13 16:37:41 -08:00 +++ b/MAINTAINERS 2005-01-13 16:37:41 -08:00 @@ -2093,6 +2093,13 @@ L: ultralinux@vger.kernel.org S: Maintained +SHARP LH SUPPORT (LH7952X & LH7A40X) +P: Marc Singer +M: elf@buici.com +W: http://projects.buici.com/arm +L: linux-arm-kernel@lists.arm.linux.org.uk +S: Maintained + SPARC (sparc32): P: William L. Irwin M: wli@holomorphy.com diff -Nru a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c --- a/arch/arm/mm/ioremap.c 2005-01-13 16:37:41 -08:00 +++ b/arch/arm/mm/ioremap.c 2005-01-13 16:37:41 -08:00 @@ -148,7 +148,7 @@ */ offset = phys_addr & ~PAGE_MASK; phys_addr &= PAGE_MASK; - size = PAGE_ALIGN(last_addr) - phys_addr; + size = PAGE_ALIGN(last_addr + 1) - phys_addr; /* * Ok, go for it.. diff -Nru a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S --- a/arch/arm/vfp/entry.S 2005-01-13 16:37:41 -08:00 +++ b/arch/arm/vfp/entry.S 2005-01-13 16:37:41 -08:00 @@ -17,6 +17,7 @@ */ #include #include +#include #include #include diff -Nru a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile --- a/drivers/pcmcia/Makefile 2005-01-13 16:37:41 -08:00 +++ b/drivers/pcmcia/Makefile 2005-01-13 16:37:41 -08:00 @@ -48,4 +48,5 @@ pxa2xx_cs-$(CONFIG_ARCH_LUBBOCK) += pxa2xx_lubbock.o sa1111_generic.o pxa2xx_cs-$(CONFIG_MACH_MAINSTONE) += pxa2xx_mainstone.o +pxa2xx_cs-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o diff -Nru a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c --- /dev/null Wed Dec 31 16:00:00 196900 +++ b/drivers/pcmcia/pxa2xx_sharpsl.c 2005-01-13 16:37:41 -08:00 @@ -0,0 +1,264 @@ +/* + * Sharp SL-C7xx Series PCMCIA routines + * + * Copyright (c) 2004-2005 Richard Purdie + * + * Based on Sharp's 2.4 kernel patches and pxa2xx_mainstone.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +#include "soc_common.h" + +#define NO_KEEP_VS 0x0001 + +static unsigned char keep_vs; +static unsigned char keep_rd; + +static struct pcmcia_irqs irqs[] = { + { 0, CORGI_IRQ_GPIO_CF_CD, "PCMCIA0 CD"}, +}; + +static void sharpsl_pcmcia_init_reset(void) +{ + reset_scoop(); + keep_vs = NO_KEEP_VS; + keep_rd = 0; +} + +static int sharpsl_pcmcia_hw_init(struct soc_pcmcia_socket *skt) +{ + int ret; + + /* + * Setup default state of GPIO outputs + * before we enable them as outputs. + */ + GPSR(GPIO48_nPOE) = + GPIO_bit(GPIO48_nPOE) | + GPIO_bit(GPIO49_nPWE) | + GPIO_bit(GPIO50_nPIOR) | + GPIO_bit(GPIO51_nPIOW) | + GPIO_bit(GPIO52_nPCE_1) | + GPIO_bit(GPIO53_nPCE_2); + + pxa_gpio_mode(GPIO48_nPOE_MD); + pxa_gpio_mode(GPIO49_nPWE_MD); + pxa_gpio_mode(GPIO50_nPIOR_MD); + pxa_gpio_mode(GPIO51_nPIOW_MD); + pxa_gpio_mode(GPIO52_nPCE_1_MD); + pxa_gpio_mode(GPIO53_nPCE_2_MD); + pxa_gpio_mode(GPIO54_pSKTSEL_MD); + pxa_gpio_mode(GPIO55_nPREG_MD); + pxa_gpio_mode(GPIO56_nPWAIT_MD); + pxa_gpio_mode(GPIO57_nIOIS16_MD); + + /* Register interrupts */ + ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); + + if (ret) { + printk(KERN_ERR "Request for Compact Flash IRQ failed\n"); + return ret; + } + + /* Enable interrupt */ + write_scoop_reg(SCOOP_IMR, 0x00C0); + write_scoop_reg(SCOOP_MCR, 0x0101); + keep_vs = NO_KEEP_VS; + + skt->irq = CORGI_IRQ_GPIO_CF_IRQ; + + return 0; +} + +static void sharpsl_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt) +{ + soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs)); + + /* CF_BUS_OFF */ + sharpsl_pcmcia_init_reset(); +} + + +static void sharpsl_pcmcia_socket_state(struct soc_pcmcia_socket *skt, + struct pcmcia_state *state) +{ + unsigned short cpr, csr; + + cpr = read_scoop_reg(SCOOP_CPR); + + write_scoop_reg(SCOOP_IRM, 0x00FF); + write_scoop_reg(SCOOP_ISR, 0x0000); + write_scoop_reg(SCOOP_IRM, 0x0000); + csr = read_scoop_reg(SCOOP_CSR); + if (csr & 0x0004) { + /* card eject */ + write_scoop_reg(SCOOP_CDR, 0x0000); + keep_vs = NO_KEEP_VS; + } + else if (!(keep_vs & NO_KEEP_VS)) { + /* keep vs1,vs2 */ + write_scoop_reg(SCOOP_CDR, 0x0000); + csr |= keep_vs; + } + else if (cpr & 0x0003) { + /* power on */ + write_scoop_reg(SCOOP_CDR, 0x0000); + keep_vs = (csr & 0x00C0); + } + else { + /* card detect */ + write_scoop_reg(SCOOP_CDR, 0x0002); + } + + state->detect = (csr & 0x0004) ? 0 : 1; + state->ready = (csr & 0x0002) ? 1 : 0; + state->bvd1 = (csr & 0x0010) ? 1 : 0; + state->bvd2 = (csr & 0x0020) ? 1 : 0; + state->wrprot = (csr & 0x0008) ? 1 : 0; + state->vs_3v = (csr & 0x0040) ? 0 : 1; + state->vs_Xv = (csr & 0x0080) ? 0 : 1; + + if ((cpr & 0x0080) && ((cpr & 0x8040) != 0x8040)) { + printk(KERN_ERR "sharpsl_pcmcia_socket_state(): CPR=%04X, Low voltage!\n", cpr); + } + +} + + +static int sharpsl_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, + const socket_state_t *state) +{ + unsigned long flags; + + unsigned short cpr, ncpr, ccr, nccr, mcr, nmcr, imr, nimr; + + switch (state->Vcc) { + case 0: break; + case 33: break; + case 50: break; + default: + printk(KERN_ERR "sharpsl_pcmcia_configure_socket(): bad Vcc %u\n", state->Vcc); + return -1; + } + + if ((state->Vpp!=state->Vcc) && (state->Vpp!=0)) { + printk(KERN_ERR "CF slot cannot support Vpp %u\n", state->Vpp); + return -1; + } + + local_irq_save(flags); + + nmcr = (mcr = read_scoop_reg(SCOOP_MCR)) & ~0x0010; + ncpr = (cpr = read_scoop_reg(SCOOP_CPR)) & ~0x0083; + nccr = (ccr = read_scoop_reg(SCOOP_CCR)) & ~0x0080; + nimr = (imr = read_scoop_reg(SCOOP_IMR)) & ~0x003E; + + ncpr |= (state->Vcc == 33) ? 0x0001 : + (state->Vcc == 50) ? 0x0002 : 0; + nmcr |= (state->flags&SS_IOCARD) ? 0x0010 : 0; + ncpr |= (state->flags&SS_OUTPUT_ENA) ? 0x0080 : 0; + nccr |= (state->flags&SS_RESET)? 0x0080: 0; + nimr |= ((skt->status&SS_DETECT) ? 0x0004 : 0)| + ((skt->status&SS_READY) ? 0x0002 : 0)| + ((skt->status&SS_BATDEAD)? 0x0010 : 0)| + ((skt->status&SS_BATWARN)? 0x0020 : 0)| + ((skt->status&SS_STSCHG) ? 0x0010 : 0)| + ((skt->status&SS_WRPROT) ? 0x0008 : 0); + + if (!(ncpr & 0x0003)) { + keep_rd = 0; + } else if (!keep_rd) { + if (nccr & 0x0080) + keep_rd = 1; + else + nccr |= 0x0080; + } + + if (mcr != nmcr) + write_scoop_reg(SCOOP_MCR, nmcr); + if (cpr != ncpr) + write_scoop_reg(SCOOP_CPR, ncpr); + if (ccr != nccr) + write_scoop_reg(SCOOP_CCR, nccr); + if (imr != nimr) + write_scoop_reg(SCOOP_IMR, nimr); + + local_irq_restore(flags); + + return 0; +} + +static void sharpsl_pcmcia_socket_init(struct soc_pcmcia_socket *skt) +{ +} + +static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) +{ +} + +static struct pcmcia_low_level sharpsl_pcmcia_ops = { + .owner = THIS_MODULE, + .hw_init = sharpsl_pcmcia_hw_init, + .hw_shutdown = sharpsl_pcmcia_hw_shutdown, + .socket_state = sharpsl_pcmcia_socket_state, + .configure_socket = sharpsl_pcmcia_configure_socket, + .socket_init = sharpsl_pcmcia_socket_init, + .socket_suspend = sharpsl_pcmcia_socket_suspend, + .first = 0, + .nr = 1, +}; + +static struct platform_device *sharpsl_pcmcia_device; + +static int __init sharpsl_pcmcia_init(void) +{ + int ret; + + sharpsl_pcmcia_device = kmalloc(sizeof(*sharpsl_pcmcia_device), GFP_KERNEL); + if (!sharpsl_pcmcia_device) + return -ENOMEM; + memset(sharpsl_pcmcia_device, 0, sizeof(*sharpsl_pcmcia_device)); + sharpsl_pcmcia_device->name = "pxa2xx-pcmcia"; + sharpsl_pcmcia_device->dev.platform_data = &sharpsl_pcmcia_ops; + + ret = platform_device_register(sharpsl_pcmcia_device); + if (ret) + kfree(sharpsl_pcmcia_device); + + return ret; +} + +static void __exit sharpsl_pcmcia_exit(void) +{ + /* + * This call is supposed to free our sharpsl_pcmcia_device. + * Unfortunately platform_device don't have a free method, and + * we can't assume it's free of any reference at this point so we + * can't free it either. + */ + platform_device_unregister(sharpsl_pcmcia_device); +} + +module_init(sharpsl_pcmcia_init); +module_exit(sharpsl_pcmcia_exit); + +MODULE_DESCRIPTION("Sharp SL Series PCMCIA Support"); +MODULE_LICENSE("GPL");