Replace all occurences with assign_h3600_egpio. Also simplify code a bit by replacing couple of if-else statements with one-line equivalents. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
		
			
				
	
	
		
			139 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			139 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * drivers/pcmcia/sa1100_h3600.c
 | |
|  *
 | |
|  * PCMCIA implementation routines for H3600
 | |
|  *
 | |
|  */
 | |
| #include <linux/module.h>
 | |
| #include <linux/kernel.h>
 | |
| #include <linux/device.h>
 | |
| #include <linux/interrupt.h>
 | |
| #include <linux/init.h>
 | |
| #include <linux/delay.h>
 | |
| 
 | |
| #include <mach/hardware.h>
 | |
| #include <asm/irq.h>
 | |
| #include <asm/mach-types.h>
 | |
| #include <mach/h3600.h>
 | |
| 
 | |
| #include "sa1100_generic.h"
 | |
| 
 | |
| static struct pcmcia_irqs irqs[] = {
 | |
| 	{ 0, IRQ_GPIO_H3600_PCMCIA_CD0, "PCMCIA CD0" },
 | |
| 	{ 1, IRQ_GPIO_H3600_PCMCIA_CD1, "PCMCIA CD1" }
 | |
| };
 | |
| 
 | |
| static int h3600_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 | |
| {
 | |
| 	skt->irq = skt->nr ? IRQ_GPIO_H3600_PCMCIA_IRQ1
 | |
| 			   : IRQ_GPIO_H3600_PCMCIA_IRQ0;
 | |
| 
 | |
| 
 | |
| 	return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
 | |
| }
 | |
| 
 | |
| static void h3600_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
 | |
| {
 | |
| 	soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
 | |
|   
 | |
| 	/* Disable CF bus: */
 | |
| 	assign_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON, 0);
 | |
| 	assign_h3600_egpio(IPAQ_EGPIO_OPT_ON, 0);
 | |
| 	assign_h3600_egpio(IPAQ_EGPIO_OPT_RESET, 1);
 | |
| }
 | |
| 
 | |
| static void
 | |
| h3600_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_state *state)
 | |
| {
 | |
| 	unsigned long levels = GPLR;
 | |
| 
 | |
| 	switch (skt->nr) {
 | |
| 	case 0:
 | |
| 		state->detect = levels & GPIO_H3600_PCMCIA_CD0 ? 0 : 1;
 | |
| 		state->ready = levels & GPIO_H3600_PCMCIA_IRQ0 ? 1 : 0;
 | |
| 		state->bvd1 = 0;
 | |
| 		state->bvd2 = 0;
 | |
| 		state->wrprot = 0; /* Not available on H3600. */
 | |
| 		state->vs_3v = 0;
 | |
| 		state->vs_Xv = 0;
 | |
| 		break;
 | |
| 
 | |
| 	case 1:
 | |
| 		state->detect = levels & GPIO_H3600_PCMCIA_CD1 ? 0 : 1;
 | |
| 		state->ready = levels & GPIO_H3600_PCMCIA_IRQ1 ? 1 : 0;
 | |
| 		state->bvd1 = 0;
 | |
| 		state->bvd2 = 0;
 | |
| 		state->wrprot = 0; /* Not available on H3600. */
 | |
| 		state->vs_3v = 0;
 | |
| 		state->vs_Xv = 0;
 | |
| 		break;
 | |
| 	}
 | |
| }
 | |
| 
 | |
| static int
 | |
| h3600_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state)
 | |
| {
 | |
| 	if (state->Vcc != 0 && state->Vcc != 33 && state->Vcc != 50) {
 | |
| 		printk(KERN_ERR "h3600_pcmcia: unrecognized Vcc %u.%uV\n",
 | |
| 		       state->Vcc / 10, state->Vcc % 10);
 | |
| 		return -1;
 | |
| 	}
 | |
| 
 | |
| 	assign_h3600_egpio(IPAQ_EGPIO_CARD_RESET, !!(state->flags & SS_RESET));
 | |
| 
 | |
| 	/* Silently ignore Vpp, output enable, speaker enable. */
 | |
| 
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| static void h3600_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
 | |
| {
 | |
| 	/* Enable CF bus: */
 | |
| 	assign_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON, 1);
 | |
| 	assign_h3600_egpio(IPAQ_EGPIO_OPT_ON, 1);
 | |
| 	assign_h3600_egpio(IPAQ_EGPIO_OPT_RESET, 0);
 | |
| 
 | |
| 	msleep(10);
 | |
| 
 | |
| 	soc_pcmcia_enable_irqs(skt, irqs, ARRAY_SIZE(irqs));
 | |
| }
 | |
| 
 | |
| static void h3600_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
 | |
| {
 | |
| 	soc_pcmcia_disable_irqs(skt, irqs, ARRAY_SIZE(irqs));
 | |
| 
 | |
| 	/*
 | |
| 	 * FIXME:  This doesn't fit well.  We don't have the mechanism in
 | |
| 	 * the generic PCMCIA layer to deal with the idea of two sockets
 | |
| 	 * on one bus.  We rely on the cs.c behaviour shutting down
 | |
| 	 * socket 0 then socket 1.
 | |
| 	 */
 | |
| 	if (skt->nr == 1) {
 | |
| 		assign_h3600_egpio(IPAQ_EGPIO_OPT_ON, 0);
 | |
| 		assign_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON, 0);
 | |
| 		/* hmm, does this suck power? */
 | |
| 		assign_h3600_egpio(IPAQ_EGPIO_OPT_RESET, 1);
 | |
| 	}
 | |
| }
 | |
| 
 | |
| struct pcmcia_low_level h3600_pcmcia_ops = { 
 | |
| 	.owner			= THIS_MODULE,
 | |
| 	.hw_init		= h3600_pcmcia_hw_init,
 | |
| 	.hw_shutdown		= h3600_pcmcia_hw_shutdown,
 | |
| 	.socket_state		= h3600_pcmcia_socket_state,
 | |
| 	.configure_socket	= h3600_pcmcia_configure_socket,
 | |
| 
 | |
| 	.socket_init		= h3600_pcmcia_socket_init,
 | |
| 	.socket_suspend		= h3600_pcmcia_socket_suspend,
 | |
| };
 | |
| 
 | |
| int __init pcmcia_h3600_init(struct device *dev)
 | |
| {
 | |
| 	int ret = -ENODEV;
 | |
| 
 | |
| 	if (machine_is_h3600())
 | |
| 		ret = sa11xx_drv_pcmcia_probe(dev, &h3600_pcmcia_ops, 0, 2);
 | |
| 
 | |
| 	return ret;
 | |
| }
 |