Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95244306 authored by Paul Parsons's avatar Paul Parsons Committed by Haojian Zhuang
Browse files

pcmcia: add driver for hx4700 



This patch adds support for the HP iPAQ hx4700 to the existing
pxa2xx-pcmcia driver.

Signed-off-by: default avatarPaul Parsons <lost.distance@yahoo.com>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
parent 0de91b61

drivers/pcmcia/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -217,7 +217,7 @@ config PCMCIA_PXA2XX 
		    || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \

		    || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \

		    || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \

		    || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \

		    || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \

		    || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \

		    || MACH_COLIBRI320)

		    || MACH_COLIBRI320 || MACH_H4700)

	select PCMCIA_SA1111 if ARCH_LUBBOCK && SA1111

	select PCMCIA_SA1111 if ARCH_LUBBOCK && SA1111

	select PCMCIA_SOC_COMMON

	select PCMCIA_SOC_COMMON

	help

	help

drivers/pcmcia/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,7 @@ pxa2xx-obj-$(CONFIG_MACH_VPAC270) += pxa2xx_vpac270.o 
pxa2xx-obj-$(CONFIG_MACH_BALLOON3)		+= pxa2xx_balloon3.o

pxa2xx-obj-$(CONFIG_MACH_BALLOON3)		+= pxa2xx_balloon3.o

pxa2xx-obj-$(CONFIG_MACH_COLIBRI)		+= pxa2xx_colibri.o

pxa2xx-obj-$(CONFIG_MACH_COLIBRI)		+= pxa2xx_colibri.o

pxa2xx-obj-$(CONFIG_MACH_COLIBRI320)		+= pxa2xx_colibri.o

pxa2xx-obj-$(CONFIG_MACH_COLIBRI320)		+= pxa2xx_colibri.o

pxa2xx-obj-$(CONFIG_MACH_H4700)			+= pxa2xx_hx4700.o





obj-$(CONFIG_PCMCIA_PXA2XX)			+= pxa2xx_base.o $(pxa2xx-obj-y)

obj-$(CONFIG_PCMCIA_PXA2XX)			+= pxa2xx_base.o $(pxa2xx-obj-y)

drivers/pcmcia/pxa2xx_hx4700.c

0 → 100644
+121 −0
Original line number Original line Diff line number Diff line 
/*

 *  Copyright (C) 2012 Paul Parsons <lost.distance@yahoo.com>

 *

 *  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 <linux/module.h>

#include <linux/platform_device.h>

#include <linux/err.h>

#include <linux/gpio.h>

#include <linux/irq.h>



#include <asm/mach-types.h>

#include <mach/hx4700.h>



#include "soc_common.h"



static struct gpio gpios[] = {

	{ GPIO114_HX4700_CF_RESET,    GPIOF_OUT_INIT_LOW,   "CF reset"        },

	{ EGPIO4_CF_3V3_ON,           GPIOF_OUT_INIT_LOW,   "CF 3.3V enable"  },

};



static int hx4700_pcmcia_hw_init(struct soc_pcmcia_socket *skt)

{

	int ret;



	ret = gpio_request_array(gpios, ARRAY_SIZE(gpios));

	if (ret)

		goto out;



	/*

	 * IRQ type must be set before soc_pcmcia_hw_init() calls request_irq().

	 * The asic3 default IRQ type is level trigger low level detect, exactly

	 * the the signal present on GPIOD4_CF_nCD when a CF card is inserted.

	 * If the IRQ type is not changed, the asic3 interrupt handler will loop

	 * repeatedly because it is unable to clear the level trigger interrupt.

	 */

	irq_set_irq_type(gpio_to_irq(GPIOD4_CF_nCD), IRQ_TYPE_EDGE_BOTH);



	skt->stat[SOC_STAT_CD].gpio = GPIOD4_CF_nCD;

	skt->stat[SOC_STAT_CD].name = "PCMCIA CD";

	skt->stat[SOC_STAT_RDY].gpio = GPIO60_HX4700_CF_RNB;

	skt->stat[SOC_STAT_RDY].name = "PCMCIA Ready";



out:

	return ret;

}



static void hx4700_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)

{

	gpio_free_array(gpios, ARRAY_SIZE(gpios));

}



static void hx4700_pcmcia_socket_state(struct soc_pcmcia_socket *skt,

	struct pcmcia_state *state)

{

	state->vs_3v = 1;

	state->vs_Xv = 0;

}



static int hx4700_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,

	const socket_state_t *state)

{

	switch (state->Vcc) {

	case 0:

		gpio_set_value(EGPIO4_CF_3V3_ON, 0);

		break;

	case 33:

		gpio_set_value(EGPIO4_CF_3V3_ON, 1);

		break;

	default:

		printk(KERN_ERR "pcmcia: Unsupported Vcc: %d\n", state->Vcc);

		return -EINVAL;

	}



	gpio_set_value(GPIO114_HX4700_CF_RESET, (state->flags & SS_RESET) != 0);



	return 0;

}



static struct pcmcia_low_level hx4700_pcmcia_ops = {

	.owner          = THIS_MODULE,

	.nr             = 1,

	.hw_init        = hx4700_pcmcia_hw_init,

	.hw_shutdown    = hx4700_pcmcia_hw_shutdown,

	.socket_state   = hx4700_pcmcia_socket_state,

	.configure_socket = hx4700_pcmcia_configure_socket,

};



static struct platform_device *hx4700_pcmcia_device;



static int __init hx4700_pcmcia_init(void)

{

	struct platform_device *pdev;



	if (!machine_is_h4700())

		return -ENODEV;



	pdev = platform_device_register_data(NULL, "pxa2xx-pcmcia", -1,

		&hx4700_pcmcia_ops, sizeof(hx4700_pcmcia_ops));

	if (IS_ERR(pdev))

		return PTR_ERR(pdev);



	hx4700_pcmcia_device = pdev;



	return 0;

}



static void __exit hx4700_pcmcia_exit(void)

{

	platform_device_unregister(hx4700_pcmcia_device);

}



module_init(hx4700_pcmcia_init);

module_exit(hx4700_pcmcia_exit);



MODULE_AUTHOR("Paul Parsons <lost.distance@yahoo.com>");

MODULE_DESCRIPTION("HP iPAQ hx4700 PCMCIA driver");

MODULE_LICENSE("GPL");