[ARM] 5283/1: pxa: add CM-X255 pcmcia support (8616e2fb) · Commits · e / devices / android_kernel_teracube_2e

drivers/pcmcia/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -71,6 +71,6 @@ sa1100_cs-$(CONFIG_SA1100_SIMPAD) += sa1100_simpad.o
	pxa2xx_cs-$(CONFIG_ARCH_LUBBOCK) += pxa2xx_lubbock.o sa1111_generic.o		pxa2xx_cs-$(CONFIG_ARCH_LUBBOCK) += pxa2xx_lubbock.o sa1111_generic.o
	pxa2xx_cs-$(CONFIG_MACH_MAINSTONE) += pxa2xx_mainstone.o		pxa2xx_cs-$(CONFIG_MACH_MAINSTONE) += pxa2xx_mainstone.o
	pxa2xx_cs-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o		pxa2xx_cs-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o
	pxa2xx_cs-$(CONFIG_MACH_ARMCORE) += pxa2xx_cm_x270.o		pxa2xx_cs-$(CONFIG_MACH_ARMCORE) += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
	pxa2xx_cs-$(CONFIG_MACH_PALMTX) += pxa2xx_palmtx.o		pxa2xx_cs-$(CONFIG_MACH_PALMTX) += pxa2xx_palmtx.o

drivers/pcmcia/pxa2xx_cm_x255.c

0 → 100644

+154 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* linux/drivers/pcmcia/pxa/pxa_cm_x255.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, 2007, 2008
			* Mike Rapoport <mike@compulab.co.il>
			*
			*/

			#include <linux/platform_device.h>
			#include <linux/irq.h>
			#include <linux/delay.h>
			#include <linux/gpio.h>

			#include <asm/mach-types.h>
			#include <mach/pxa-regs.h>

			#include "soc_common.h"

			#define GPIO_PCMCIA_SKTSEL (54)
			#define GPIO_PCMCIA_S0_CD_VALID (16)
			#define GPIO_PCMCIA_S1_CD_VALID (17)
			#define GPIO_PCMCIA_S0_RDYINT (6)
			#define GPIO_PCMCIA_S1_RDYINT (8)
			#define GPIO_PCMCIA_RESET (9)

			#define PCMCIA_S0_CD_VALID IRQ_GPIO(GPIO_PCMCIA_S0_CD_VALID)
			#define PCMCIA_S1_CD_VALID IRQ_GPIO(GPIO_PCMCIA_S1_CD_VALID)
			#define PCMCIA_S0_RDYINT IRQ_GPIO(GPIO_PCMCIA_S0_RDYINT)
			#define PCMCIA_S1_RDYINT IRQ_GPIO(GPIO_PCMCIA_S1_RDYINT)


			static struct pcmcia_irqs irqs[] = {
			{ 0, PCMCIA_S0_CD_VALID, "PCMCIA0 CD" },
			{ 1, PCMCIA_S1_CD_VALID, "PCMCIA1 CD" },
			};

			static int cmx255_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
			{
			int ret = gpio_request(GPIO_PCMCIA_RESET, "PCCard reset");
			if (ret)
			return ret;
			gpio_direction_output(GPIO_PCMCIA_RESET, 0);

			skt->irq = skt->nr == 0 ? PCMCIA_S0_RDYINT : PCMCIA_S1_RDYINT;
			ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
			if (!ret)
			gpio_free(GPIO_PCMCIA_RESET);

			return ret;
			}

			static void cmx255_pcmcia_shutdown(struct soc_pcmcia_socket *skt)
			{
			soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
			gpio_free(GPIO_PCMCIA_RESET);
			}


			static void cmx255_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
			struct pcmcia_state *state)
			{
			int cd = skt->nr ? GPIO_PCMCIA_S1_CD_VALID : GPIO_PCMCIA_S0_CD_VALID;
			int rdy = skt->nr ? GPIO_PCMCIA_S0_RDYINT : GPIO_PCMCIA_S1_RDYINT;

			state->detect = !gpio_get_value(cd);
			state->ready = !!gpio_get_value(rdy);
			state->bvd1 = 1;
			state->bvd2 = 1;
			state->vs_3v = 0;
			state->vs_Xv = 0;
			state->wrprot = 0; /* not available */
			}


			static int cmx255_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
			const socket_state_t *state)
			{
			switch (skt->nr) {
			case 0:
			if (state->flags & SS_RESET) {
			gpio_set_value(GPIO_PCMCIA_SKTSEL, 0);
			udelay(1);
			gpio_set_value(GPIO_PCMCIA_RESET, 1);
			udelay(10);
			gpio_set_value(GPIO_PCMCIA_RESET, 0);
			}
			break;
			case 1:
			if (state->flags & SS_RESET) {
			gpio_set_value(GPIO_PCMCIA_SKTSEL, 1);
			udelay(1);
			gpio_set_value(GPIO_PCMCIA_RESET, 1);
			udelay(10);
			gpio_set_value(GPIO_PCMCIA_RESET, 0);
			}
			break;
			}

			return 0;
			}

			static void cmx255_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
			{
			}

			static void cmx255_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
			{
			}


			static struct pcmcia_low_level cmx255_pcmcia_ops __initdata = {
			.owner = THIS_MODULE,
			.hw_init = cmx255_pcmcia_hw_init,
			.hw_shutdown = cmx255_pcmcia_shutdown,
			.socket_state = cmx255_pcmcia_socket_state,
			.configure_socket = cmx255_pcmcia_configure_socket,
			.socket_init = cmx255_pcmcia_socket_init,
			.socket_suspend = cmx255_pcmcia_socket_suspend,
			.nr = 1,
			};

			static struct platform_device *cmx255_pcmcia_device;

			int __init cmx255_pcmcia_init(void)
			{
			int ret;

			cmx255_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);

			if (!cmx255_pcmcia_device)
			return -ENOMEM;

			ret = platform_device_add_data(cmx255_pcmcia_device, &cmx255_pcmcia_ops,
			sizeof(cmx255_pcmcia_ops));

			if (ret == 0) {
			printk(KERN_INFO "Registering cm-x255 PCMCIA interface.\n");
			ret = platform_device_add(cmx255_pcmcia_device);
			}

			if (ret)
			platform_device_put(cmx255_pcmcia_device);

			return ret;
			}

			void __exit cmx255_pcmcia_exit(void)
			{
			platform_device_unregister(cmx255_pcmcia_device);
			}

drivers/pcmcia/pxa2xx_cm_x270.c

+2 −12

Original line number	Original line	Diff line number	Diff line
	@@ -105,13 +105,10 @@ static struct pcmcia_low_level cmx270_pcmcia_ops __initdata = {

	static struct platform_device *cmx270_pcmcia_device;		static struct platform_device *cmx270_pcmcia_device;

	static int __init cmx270_pcmcia_init(void)		int __init cmx270_pcmcia_init(void)
	{		{
	int ret;		int ret;

	if (!machine_is_armcore())
	return -ENODEV;

	cmx270_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);		cmx270_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);

	if (!cmx270_pcmcia_device)		if (!cmx270_pcmcia_device)
	@@ -131,14 +128,7 @@ static int __init cmx270_pcmcia_init(void)
	return ret;		return ret;
	}		}

	static void __exit cmx270_pcmcia_exit(void)		void __exit cmx270_pcmcia_exit(void)
	{		{
	platform_device_unregister(cmx270_pcmcia_device);		platform_device_unregister(cmx270_pcmcia_device);
	}		}

	module_init(cmx270_pcmcia_init);
	module_exit(cmx270_pcmcia_exit);

	MODULE_LICENSE("GPL");
	MODULE_AUTHOR("Mike Rapoport <mike@compulab.co.il>");
	MODULE_DESCRIPTION("CM-x270 PCMCIA driver");

drivers/pcmcia/pxa2xx_cm_x2xx.c

0 → 100644

+49 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* linux/drivers/pcmcia/pxa/pxa_cm_x2xx.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, 2007, 2008
			* Mike Rapoport <mike@compulab.co.il>
			*
			*/

			#include <linux/module.h>

			#include <asm/system.h>
			#include <asm/mach-types.h>
			#include <mach/system.h>

			int cmx255_pcmcia_init(void);
			int cmx270_pcmcia_init(void);
			void cmx255_pcmcia_exit(void);
			void cmx270_pcmcia_exit(void);

			static int __init cmx2xx_pcmcia_init(void)
			{
			int ret = -ENODEV;

			if (machine_is_armcore() && cpu_is_pxa25x())
			ret = cmx255_pcmcia_init();
			else if (machine_is_armcore() && cpu_is_pxa27x())
			ret = cmx270_pcmcia_init();

			return ret;
			}

			static void __exit cmx2xx_pcmcia_exit(void)
			{
			if (machine_is_armcore() && cpu_is_pxa25x())
			cmx255_pcmcia_exit();
			else if (machine_is_armcore() && cpu_is_pxa27x())
			cmx270_pcmcia_exit();
			}

			module_init(cmx2xx_pcmcia_init);
			module_exit(cmx2xx_pcmcia_exit);

			MODULE_LICENSE("GPL");
			MODULE_AUTHOR("Mike Rapoport <mike@compulab.co.il>");
			MODULE_DESCRIPTION("CM-x2xx PCMCIA driver");