linux 2.6.22: merge cm-x270 kernel (from compulab-pxa270 recipe)

1 files changed, 228 insertions, 0 deletions

diff --git a/packages/linux/linux-2.6.22/cm-x270/0005-cm-x270-pcmcia.patch b/packages/linux/linux-2.6.22/cm-x270/0005-cm-x270-pcmcia.patch
new file mode 100644
index 0000000000..7dceff5c9d
--- /dev/null
+++ b/packages/linux/linux-2.6.22/cm-x270/0005-cm-x270-pcmcia.patch
@@ -0,0 +1,228 @@
+From 338653da8f8afcdf8afc7e8a5a0104d5083597cc Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake@happy.dev.bec-systems.com>
+Date: Fri, 20 Jul 2007 19:01:27 -0400
+Subject: [PATCH] cm-x270-pcmcia
+
+---
+ drivers/pcmcia/Makefile         |    1 +
+ drivers/pcmcia/pxa2xx_cm_x270.c |  198 +++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 199 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/pcmcia/pxa2xx_cm_x270.c
+
+diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
+index 4276965..353d5b7 100644
+--- a/drivers/pcmcia/Makefile
++++ b/drivers/pcmcia/Makefile
+@@ -69,4 +69,5 @@ sa1100_cs-$(CONFIG_SA1100_SIMPAD)		+= sa1100_simpad.o
+ 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
++pxa2xx_cs-$(CONFIG_MACH_ARMCORE)               += pxa2xx_cm_x270.o
+ 
+diff --git a/drivers/pcmcia/pxa2xx_cm_x270.c b/drivers/pcmcia/pxa2xx_cm_x270.c
+new file mode 100644
+index 0000000..25e369f
+--- /dev/null
++++ b/drivers/pcmcia/pxa2xx_cm_x270.c
+@@ -0,0 +1,198 @@
++/*
++ * linux/drivers/pcmcia/pxa/pxa_armcore.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.
++ *
++ * Compulab Ltd., 2003
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <linux/platform_device.h>
++#include <linux/irq.h>
++
++#include <pcmcia/ss.h>
++#include <asm/delay.h>
++#include <asm/hardware.h>
++
++#include <asm/arch/pxa-regs.h>
++#include <asm/arch/cm-x270.h>
++
++#include "soc_common.h"
++
++
++static struct pcmcia_irqs irqs[] = {
++       { 0, PCMCIA_S0_CD_VALID, "PCMCIA0 CD" },
++       { 1, PCMCIA_S1_CD_VALID, "PCMCIA1 CD" },
++};
++
++
++static int
++cmx270_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
++{
++       int return_val=0;
++
++       GPSR(GPIO48_nPOE) = GPIO_bit(GPIO48_nPOE) |
++               GPIO_bit(GPIO49_nPWE) |
++               GPIO_bit(GPIO50_nPIOR) |
++               GPIO_bit(GPIO51_nPIOW) |
++               GPIO_bit(GPIO85_nPCE_1) |
++               GPIO_bit(GPIO54_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(GPIO85_nPCE_1_MD);
++       pxa_gpio_mode(GPIO54_nPCE_2_MD);
++       //pxa_gpio_mode(GPIO79_pSKTSEL_MD); /* REVISIT: s/b dependent on num sockets (on ATX base not routed)*/
++       pxa_gpio_mode(GPIO55_nPREG_MD);
++       pxa_gpio_mode(GPIO56_nPWAIT_MD);
++       pxa_gpio_mode(GPIO57_nIOIS16_MD);
++
++       // Reset signal
++       GPDR(GPIO53_nPCE_2) |= GPIO_bit(GPIO53_nPCE_2);
++       GPCR(GPIO53_nPCE_2) = GPIO_bit(GPIO53_nPCE_2);
++
++       GPDR(IRQ_TO_GPIO(PCMCIA_S0_CD_VALID)) &= ~GPIO_bit(IRQ_TO_GPIO(PCMCIA_S0_CD_VALID));
++       GPDR(IRQ_TO_GPIO(PCMCIA_S1_CD_VALID)) &= ~GPIO_bit(IRQ_TO_GPIO(PCMCIA_S1_CD_VALID));
++
++       set_irq_type(PCMCIA_S0_CD_VALID, IRQ_TYPE_EDGE_BOTH);
++       set_irq_type(PCMCIA_S1_CD_VALID, IRQ_TYPE_EDGE_BOTH);
++
++       //irq's for slots:
++       GPDR(IRQ_TO_GPIO(PCMCIA_S0_RDYINT)) &= ~GPIO_bit(IRQ_TO_GPIO(PCMCIA_S0_RDYINT));
++       GPDR(IRQ_TO_GPIO(PCMCIA_S1_RDYINT)) &= ~GPIO_bit(IRQ_TO_GPIO(PCMCIA_S1_RDYINT));
++
++       set_irq_type(PCMCIA_S0_RDYINT, IRQ_TYPE_EDGE_FALLING);
++       set_irq_type(PCMCIA_S1_RDYINT, IRQ_TYPE_EDGE_FALLING);
++
++       skt->irq = (skt->nr == 0) ? PCMCIA_S0_RDYINT : PCMCIA_S1_RDYINT;
++       return_val = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
++
++       return return_val;
++}
++
++
++static void cmx270_pcmcia_shutdown(struct soc_pcmcia_socket *skt)
++{
++       soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
++
++       set_irq_type(IRQ_TO_GPIO(PCMCIA_S0_CD_VALID), IRQ_TYPE_NONE);
++       set_irq_type(IRQ_TO_GPIO(PCMCIA_S1_CD_VALID), IRQ_TYPE_NONE);
++
++       set_irq_type(IRQ_TO_GPIO(PCMCIA_S0_RDYINT), IRQ_TYPE_NONE);
++       set_irq_type(IRQ_TO_GPIO(PCMCIA_S1_RDYINT), IRQ_TYPE_NONE);
++}
++
++
++static void cmx270_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
++                                   struct pcmcia_state *state)
++{
++
++       state->detect = (PCC_DETECT(skt->nr) == 0) ? 1 : 0;
++       state->ready  = (PCC_READY(skt->nr) == 0) ? 0 : 1;
++       state->bvd1   = 1;
++       state->bvd2   = 1;
++       state->vs_3v  = 0;
++       state->vs_Xv  = 0;
++       state->wrprot = 0;  /* not available */
++
++}
++
++
++static int
++cmx270_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
++                                      const socket_state_t *state)
++{
++
++       GPSR(GPIO49_nPWE) = GPIO_bit(GPIO49_nPWE);
++       pxa_gpio_mode(GPIO49_nPWE | GPIO_OUT);
++       //pxa_gpio_mode(GPIO79_pSKTSEL_MD | GPIO_OUT); /* For 2-socket mode */
++
++       switch(skt->nr){
++           case 0:
++                       if(state->flags & SS_RESET) {
++                               //GPCR(GPIO79_pSKTSEL) = GPIO_bit(GPIO79_pSKTSEL); /* For 2-socket mode */
++                               //udelay(1);
++                               GPCR(GPIO49_nPWE) = GPIO_bit(GPIO49_nPWE);
++                               GPSR(GPIO53_nPCE_2) = GPIO_bit(GPIO53_nPCE_2);
++                               udelay(10);
++                               GPCR(GPIO53_nPCE_2) = GPIO_bit(GPIO53_nPCE_2);
++                               GPSR(GPIO49_nPWE) = GPIO_bit(GPIO49_nPWE);
++                       }
++                   break;
++               case 1:
++                       if(state->flags & SS_RESET) {
++                               //GPCR(GPIO79_pSKTSEL) = GPIO_bit(GPIO79_pSKTSEL); /* For 2-socket mode */
++                               //udelay(1);
++                               GPCR(GPIO49_nPWE) = GPIO_bit(GPIO49_nPWE);
++                               GPSR(GPIO53_nPCE_2) = GPIO_bit(GPIO53_nPCE_2);
++                               udelay(10);
++                               GPCR(GPIO53_nPCE_2) = GPIO_bit(GPIO53_nPCE_2);
++                               GPSR(GPIO49_nPWE) = GPIO_bit(GPIO49_nPWE);
++                       }
++                   break;
++       }
++
++       pxa_gpio_mode(GPIO49_nPWE_MD);
++       //pxa_gpio_mode(GPIO79_pSKTSEL_MD); /* For 2-socket mode */
++
++
++       return 0;
++}
++
++static void cmx270_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
++{
++}
++
++static void cmx270_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
++{
++}
++
++
++static struct pcmcia_low_level cmx270_pcmcia_ops = {
++       .owner                  = THIS_MODULE,
++       .hw_init                = cmx270_pcmcia_hw_init,
++       .hw_shutdown            = cmx270_pcmcia_shutdown,
++       .socket_state           = cmx270_pcmcia_socket_state,
++       .configure_socket       = cmx270_pcmcia_configure_socket,
++       .socket_init            = cmx270_pcmcia_socket_init,
++       .socket_suspend         = cmx270_pcmcia_socket_suspend,
++       .nr                     = 2,
++};
++
++static struct platform_device *cmx270_pcmcia_device;
++
++static int __init cmx270_pcmcia_init(void)
++{
++       int ret;
++
++       cmx270_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
++
++       if (!cmx270_pcmcia_device)
++               return -ENOMEM;
++
++       cmx270_pcmcia_device->dev.platform_data = &cmx270_pcmcia_ops;
++
++       printk ("Registering cm-x270 PCMCIA interface.\n");
++       ret = platform_device_add(cmx270_pcmcia_device);
++
++       if (ret)
++               platform_device_put(cmx270_pcmcia_device);
++
++       return ret;
++}
++
++static void __exit cmx270_pcmcia_exit(void)
++{
++       platform_device_unregister(cmx270_pcmcia_device);
++}
++
++module_init(cmx270_pcmcia_init);
++module_exit(cmx270_pcmcia_exit);
++
++MODULE_LICENSE("GPL");
+-- 
+1.5.1.6
+