Index: blueangel_pcmcia.c =================================================================== RCS file: /cvs/linux/kernel26/arch/arm/mach-pxa/htcblueangel/blueangel_pcmcia.c,v retrieving revision 1.10 diff -u -r1.10 blueangel_pcmcia.c --- blueangel_pcmcia.c 7 Jul 2007 04:21:19 -0000 1.10 +++ blueangel_pcmcia.c 7 Jul 2007 17:36:09 -0000 @@ -1,210 +1,154 @@ -/* - * HTC Blueangel PCMCIA support - * - * Copyright (c) 2005 SDG Systems, LLC - * - * Based on code from iPAQ h2200 - * Copyright 2004 Koen Kooi - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of this archive for - * more details. - */ + /* + * blueangel_pcmcia.c + * + * Created Apr 2, 2005, by Shawn Anderson + * + * 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 - #include -#include -#include #include #include - #include "../../../../drivers/pcmcia/soc_common.h" +#include +#include -/* - * CF resources used on blueangel : - * - * pxa_gpio_mode(GPIO_NR_BLUEANGEL_POE_N_MD); - * pxa_gpio_mode(GPIO_NR_BLUEANGEL_PWE_N_MD); - * pxa_gpio_mode(GPIO_NR_BLUEANGEL_PIOR_N_MD); - * pxa_gpio_mode(GPIO_NR_BLUEANGEL_PIOW_N_MD); - * pxa_gpio_mode(GPIO_NR_BLUEANGEL_PCE1_N_MD); - * pxa_gpio_mode(GPIO_NR_BLUEANGEL_PCE2_N_MD); - * pxa_gpio_mode(GPIO_NR_BLUEANGEL_PREG_N_MD); - * pxa_gpio_mode(GPIO_NR_BLUEANGEL_PWAIT_N_MD); - * pxa_gpio_mode(GPIO_NR_BLUEANGEL_PIOIS16_N_MD); - */ - -#if 0 -#define _debug(s, args...) printk (KERN_INFO s, ##args) -#define _debug_func(s, args...) _debug ("%s: " s, __FUNCTION__, ##args) -#else -#define _debug(s, args...) -#define _debug_func(s, args...) _debug ("%s: " s, __FUNCTION__, ##args) -#endif - -#if 0 -static struct pcmcia_irqs blueangel_cd_irq[] = { - { 0, 0, "PCMCIA CD" } /* fill in IRQ below */ -}; -#endif +extern struct platform_device blueangel_asic3; -static void -blueangel_cf_reset( int state ) -{ - printk("reset\n"); -#if 0 - _debug_func ("%d\n", state); -#endif -} +static struct pcmcia_irqs socket_state_irqs[] = { +}; -static int -blueangel_pcmcia_hw_init( struct soc_pcmcia_socket *skt ) +static int blueangel_pcmcia_hw_init(struct soc_pcmcia_socket *skt) { + GPSR(GPIO48_nPOE) = GPIO_bit(GPIO48_nPOE) | GPIO_bit(GPIO49_nPWE) | + GPIO_bit(GPIO52_nPCE_1_MD) | GPIO_bit(GPIO53_nPCE_2_MD) | + GPIO_bit(GPIO55_nPREG_MD) | GPIO_bit(GPIO56_nPWAIT_MD); + + pxa_gpio_mode(GPIO48_nPOE_MD); + pxa_gpio_mode(GPIO49_nPWE_MD); + pxa_gpio_mode(GPIO52_nPCE_1_MD); + pxa_gpio_mode(GPIO55_nPREG_MD); + pxa_gpio_mode(GPIO56_nPWAIT_MD); - _debug_func ("\n"); - - printk("hw_init\n"); -#if 0 - - pxa_gpio_mode(GPIO_NR_HX4700_POE_N_MD | GPIO_DFLT_HIGH); - pxa_gpio_mode(GPIO_NR_HX4700_PWE_N_MD | GPIO_DFLT_HIGH); - pxa_gpio_mode(GPIO_NR_HX4700_PIOR_N_MD | GPIO_DFLT_HIGH); - pxa_gpio_mode(GPIO_NR_HX4700_PIOW_N_MD | GPIO_DFLT_HIGH); - pxa_gpio_mode(GPIO_NR_HX4700_PCE1_N_MD | GPIO_DFLT_HIGH); - pxa_gpio_mode(GPIO_NR_HX4700_PCE2_N_MD | GPIO_DFLT_HIGH); - pxa_gpio_mode(GPIO_NR_HX4700_PREG_N_MD | GPIO_DFLT_HIGH); - pxa_gpio_mode(GPIO_NR_HX4700_PWAIT_N_MD | GPIO_DFLT_HIGH); - pxa_gpio_mode(GPIO_NR_HX4700_PIOIS16_N_MD | GPIO_DFLT_HIGH); - pxa_gpio_mode(GPIO_NR_HX4700_PSKTSEL_MD); - - return soc_pcmcia_request_irqs(skt, blueangel_cd_irq, ARRAY_SIZE(blueangel_cd_irq)); -#endif skt->irq = BLUEANGEL_IRQ(WLAN_IRQ_N); - return 0; -} -/* - * Release all resources. - */ -static void -blueangel_pcmcia_hw_shutdown( struct soc_pcmcia_socket *skt ) -{ - printk("shutdown\n"); -#if 0 - _debug_func ("\n"); - soc_pcmcia_free_irqs( skt, blueangel_cd_irq, ARRAY_SIZE(blueangel_cd_irq) ); -#endif -} - -static void -blueangel_pcmcia_socket_state( struct soc_pcmcia_socket *skt, - struct pcmcia_state *state ) -{ - - printk("socket_state\n"); - state->detect = 1; - state->ready = 1; - state->bvd1 = 1; - state->bvd2 = 1; - state->wrprot = 0; - state->vs_3v = 1; - state->vs_Xv = 0; + return soc_pcmcia_request_irqs(skt, socket_state_irqs, ARRAY_SIZE(socket_state_irqs)); +} - _debug( "detect:%d ready:%d vcc:%d\n", - state->detect, state->ready, state->vs_3v ); +static void blueangel_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt) +{ + soc_pcmcia_free_irqs(skt, socket_state_irqs, ARRAY_SIZE(socket_state_irqs)); } -static int -blueangel_pcmcia_config_socket( struct soc_pcmcia_socket *skt, - const socket_state_t *state ) +static void blueangel_pcmcia_socket_state(struct soc_pcmcia_socket *skt, + struct pcmcia_state *state) { + state->detect = 1; + state->ready = 1; + state->bvd1 = 1; + state->bvd2 = 1; + state->wrprot = 0; + state->vs_3v = asic3_get_gpio_status_b(&blueangel_asic3.dev) + & GPIOB_WLAN_PWR3; + state->vs_Xv = 0; +}; - printk("config_socket\n"); +static int blueangel_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, + const socket_state_t * state) +{ + printk("%s\n", __FUNCTION__); /* Silently ignore Vpp, output enable, speaker enable. */ - _debug_func( "Reset:%d Vcc:%d Astatusc=0x%x\n", - (state->flags & SS_RESET) ? 1 : 0, state->Vcc, - statusc ); + printk( "Reset:%d ,Vcc:%d ,Flags:%x\n", + (state->flags & SS_RESET) ? 1 : 0, state->Vcc, state->flags); + switch (state->Vcc) { + case 0: + asic3_set_gpio_out_a(&blueangel_asic3.dev, 1 << GPIOA_WLAN_PWR1, 0 ); + asic3_set_gpio_out_a(&blueangel_asic3.dev, 1 << GPIOA_WLAN_PWR2, 0 ); + asic3_set_gpio_out_b(&blueangel_asic3.dev, 1 << GPIOB_WLAN_PWR3, 0 ); + break; + case 50: + if ( (state->flags & SS_OUTPUT_ENA) ? 1 : 0 ) { + asic3_set_gpio_out_a(&blueangel_asic3.dev, 1 << GPIOA_WLAN_PWR1, 1 << GPIOA_WLAN_PWR1 ); + asic3_set_gpio_out_a(&blueangel_asic3.dev, 1 << GPIOA_WLAN_PWR2, 1 << GPIOA_WLAN_PWR2 ); + asic3_set_gpio_out_b(&blueangel_asic3.dev, 1 << GPIOB_WLAN_PWR3, 1 << GPIOB_WLAN_PWR3 ); + } + if ( (state->flags & SS_RESET) ? 1 : 0 ) + asic3_set_gpio_out_a(&blueangel_asic3.dev, 1 << GPIOA_WLAN_RESET, 1 << GPIOA_WLAN_RESET); + else + asic3_set_gpio_out_a(&blueangel_asic3.dev, 1 << GPIOA_WLAN_RESET, 0); + break; + case 33: + break; + default: + printk(KERN_ERR "%s: Unsupported Vcc:%d\n", __FUNCTION__, + state->Vcc); + } return 0; + } -/* - * Enable card status IRQs on (re-)initialisation. This can - * be called at initialisation, power management event, or - * pcmcia event. - */ -static void -blueangel_pcmcia_socket_init(struct soc_pcmcia_socket *skt) -{ - printk("socket_init\n"); -#if 0 - _debug_func ("\n"); - blueangel_cf_reset(0); -#endif -} - -/* - * Disable card status IRQs on suspend. - */ -static void -blueangel_pcmcia_socket_suspend( struct soc_pcmcia_socket *skt ) -{ - printk("socket_suspend\n"); -#if 0 - _debug_func ("\n"); - blueangel_cf_reset(1); -#endif +static void blueangel_pcmcia_socket_init(struct soc_pcmcia_socket *skt) +{ + printk("%s\n", __FUNCTION__); + soc_pcmcia_enable_irqs(skt, socket_state_irqs, ARRAY_SIZE(socket_state_irqs)); +} + +static void blueangel_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) +{ + printk("%s\n", __FUNCTION__); + soc_pcmcia_disable_irqs(skt, socket_state_irqs, ARRAY_SIZE(socket_state_irqs)); } static struct pcmcia_low_level blueangel_pcmcia_ops = { - .owner = THIS_MODULE, - .nr = 1, - .hw_init = blueangel_pcmcia_hw_init, - .hw_shutdown = blueangel_pcmcia_hw_shutdown, - .socket_state = blueangel_pcmcia_socket_state, - .configure_socket = blueangel_pcmcia_config_socket, - .socket_init = blueangel_pcmcia_socket_init, - .socket_suspend = blueangel_pcmcia_socket_suspend, + .owner = THIS_MODULE, + .first = 0, + .nr = 1, + .hw_init = blueangel_pcmcia_hw_init, + .hw_shutdown = blueangel_pcmcia_hw_shutdown, + .socket_state = blueangel_pcmcia_socket_state, + .configure_socket = blueangel_pcmcia_configure_socket, + .socket_init = blueangel_pcmcia_socket_init, + .socket_suspend = blueangel_pcmcia_socket_suspend, }; -static struct platform_device blueangel_pcmcia_device = { - .name = "pxa2xx-pcmcia", - .dev = { - .platform_data = &blueangel_pcmcia_ops, - } +static struct platform_device blueangel_pcmcia = { + .name = "pxa2xx-pcmcia", + .dev = {.platform_data = &blueangel_pcmcia_ops}, }; -static int __init -blueangel_pcmcia_init(void) +static int __init blueangel_pcmcia_probe(struct platform_device *pdev) { - _debug_func ("\n"); + return platform_device_register(&blueangel_pcmcia); +} - return platform_device_register( &blueangel_pcmcia_device ); +static struct platform_driver blueangel_pcmcia_driver = { + .driver = { + .name = "blueangel-pcmcia", + }, + .probe = blueangel_pcmcia_probe, +}; + +static int __init blueangel_pcmcia_init(void) +{ + return platform_driver_register(&blueangel_pcmcia_driver); } -static void __exit -blueangel_pcmcia_exit(void) +static void __exit blueangel_pcmcia_exit(void) { - platform_device_unregister( &blueangel_pcmcia_device ); + platform_device_unregister(&blueangel_pcmcia); + platform_driver_unregister(&blueangel_pcmcia_driver); } module_init(blueangel_pcmcia_init); module_exit(blueangel_pcmcia_exit); -MODULE_AUTHOR("Todd Blumer, SDG Systems, LLC"); -MODULE_DESCRIPTION("HTC Blueangel PCMCIA/CF platform-specific driver"); MODULE_LICENSE("GPL"); - -/* vim600: set noexpandtab sw=8 ts=8 :*/ -