[PATCH 1/2] spitz.h rewritten and documented (resend) | |
| [Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] | |
Attached patch adds description of the complete Spitz/Akita GPIO pinout to the spitz.h, reorders the list into ascending order and drops defines duplicating pxa2xx-gpio.h values. It's a source code only change not affecting compiled code. It's resend of my patch "[PATCH 2/2] pxa/spitz: spitz.h documentation and rewrite" from Mon, 18 Feb 2008 18:42:09 +0100, which was not applied. http://www.spinics.net/lists/arm-kernel/msg47470.html Based on: Intel PXA27x Processor Family documentation Zaurus SL-C3000 specific information provided by Trisoft tracing of the PCB done by albertr spitz_h_rewrite.patch: Signed-off-by: Stanislav Brabec <sbrabec@xxxxxxx> diff --git a/include/asm-arm/arch-pxa/akita.h b/include/asm-arm/arch-pxa/akita.h index 5d8cc1d..cec04c8 100644 --- a/include/asm-arm/arch-pxa/akita.h +++ b/include/asm-arm/arch-pxa/akita.h @@ -12,11 +12,11 @@ /* Akita IO Expander GPIOs */ #define AKITA_IOEXP_RESERVED_7 (1 << 7) -#define AKITA_IOEXP_IR_ON (1 << 6) -#define AKITA_IOEXP_AKIN_PULLUP (1 << 5) -#define AKITA_IOEXP_BACKLIGHT_CONT (1 << 4) -#define AKITA_IOEXP_BACKLIGHT_ON (1 << 3) -#define AKITA_IOEXP_MIC_BIAS (1 << 2) +#define AKITA_IOEXP_IR_ON (1 << 6) /* IrDA: IrDA On */ +#define AKITA_IOEXP_AKIN_PULLUP (1 << 5) /* audio: Pull-Up for Remote */ +#define AKITA_IOEXP_BACKLIGHT_CONT (1 << 4) /* display: Backlight Control */ +#define AKITA_IOEXP_BACKLIGHT_ON (1 << 3) /* display: Backlight On */ +#define AKITA_IOEXP_MIC_BIAS (1 << 2) /* audio: Mic Bias On */ #define AKITA_IOEXP_RESERVED_1 (1 << 1) #define AKITA_IOEXP_RESERVED_0 (1 << 0) diff --git a/include/asm-arm/arch-pxa/spitz.h b/include/asm-arm/arch-pxa/spitz.h index bd14365..6bf96b6 100644 --- a/include/asm-arm/arch-pxa/spitz.h +++ b/include/asm-arm/arch-pxa/spitz.h @@ -1,8 +1,9 @@ /* - * Hardware specific definitions for SL-Cx000 series of PDAs + * Hardware specific definitions for SL-Cxx00 series of PDAs * * Copyright (c) 2005 Alexander Wykes * Copyright (c) 2005 Richard Purdie + * Copyright (c) 2008 Stanislav Brabec * * Based on Sharp's 2.4 kernel patches * @@ -13,140 +14,186 @@ */ #ifndef __ASM_ARCH_SPITZ_H #define __ASM_ARCH_SPITZ_H 1 -#endif -#include <linux/fb.h> +#include <asm-arm/arch-pxa/irqs.h> +#include <linux/platform_device.h> /* Spitz/Akita GPIOs */ -#define SPITZ_GPIO_KEY_INT (0) /* Key Interrupt */ -#define SPITZ_GPIO_RESET (1) -#define SPITZ_GPIO_nSD_DETECT (9) -#define SPITZ_GPIO_TP_INT (11) /* Touch Panel interrupt */ -#define SPITZ_GPIO_AK_INT (13) /* Remote Control */ -#define SPITZ_GPIO_ADS7846_CS (14) -#define SPITZ_GPIO_SYNC (16) -#define SPITZ_GPIO_MAX1111_CS (20) -#define SPITZ_GPIO_FATAL_BAT (21) -#define SPITZ_GPIO_HSYNC (22) -#define SPITZ_GPIO_nSD_CLK (32) -#define SPITZ_GPIO_USB_DEVICE (35) -#define SPITZ_GPIO_USB_HOST (37) -#define SPITZ_GPIO_USB_CONNECT (41) -#define SPITZ_GPIO_LCDCON_CS (53) -#define SPITZ_GPIO_nPCE (54) -#define SPITZ_GPIO_nSD_WP (81) -#define SPITZ_GPIO_ON_RESET (89) -#define SPITZ_GPIO_BAT_COVER (90) -#define SPITZ_GPIO_CF_CD (94) -#define SPITZ_GPIO_ON_KEY (95) -#define SPITZ_GPIO_SWA (97) -#define SPITZ_GPIO_SWB (96) -#define SPITZ_GPIO_CHRG_FULL (101) -#define SPITZ_GPIO_CO (101) -#define SPITZ_GPIO_CF_IRQ (105) -#define SPITZ_GPIO_AC_IN (115) -#define SPITZ_GPIO_HP_IN (116) - -/* Spitz Only GPIOs */ - -#define SPITZ_GPIO_CF2_IRQ (106) /* CF slot1 Ready */ -#define SPITZ_GPIO_CF2_CD (93) - +#define SPITZ_GPIO_KEY_INT 0 /* system: Key Interrupt */ +/* GPIO1_RST 1 system */ +/* GPIO2 SYS_EN 2 system: System Power Enable */ +#define SPITZ_GPIO_PWR_SCL 3 /* I2C: SCL power */ +#define SPITZ_GPIO_PWR_SDA 4 /* I2C: SDA power */ +/* GPIO5-GPIO8 PWR_CAP0-PWR_CAP3 5-8 system: Sleep DC-DC Converter Power Capacitors */ +#define SPITZ_GPIO_nSD_DETECT 9 /* SD: Card Presence */ +#define SPITZ_GPIO_NC_10 10 /* system: Not Connected (but used in kernel) */ +#define SPITZ_GPIO_TP_INT 11 /* SPI: Touch Panel IRQ */ +#define SPITZ_GPIO_KEY_SENSE0 12 /* keyboard: Sense 0 */ +#define SPITZ_GPIO_AK_INT 13 /* audio: Remote Control detect */ +#define SPITZ_GPIO_ADS7846_CS 14 /* SPI: Touch Panel Controller Chip Select */ +#define SPITZ_GPIO_BAT_COVER2 15 /* power: Battery Cover switch, parallel pin */ +#define SPITZ_GPIO_SYNC 16 /* IOPORT: Wake Up (input) */ +#define SPITZ_GPIO_KEY_SENSE1 17 /* keyboard: Sense 1 */ +/* GPIO18_RDY 18 power */ +#define SPITZ_GPIO_SSP_CLK 19 /* SPI: SSP bus Clock */ +#define SPITZ_GPIO_MAX1111_CS 20 /* SPI: Multi Channel ADC Chip Select */ +#define SPITZ_GPIO_FATAL_BAT 21 /* power: Fatal Battery */ +#define SPITZ_GPIO_HSYNC 22 /* display: Line Sync Feedback */ +#define SPITZ_GPIO_KEY_STROBE1 23 /* keyboard: Strobe 1 */ +#define SPITZ_GPIO_KEY_STROBE2 24 /* keyboard: Strobe 2 */ +#define SPITZ_GPIO_KEY_STROBE3 25 /* keyboard: Strobe 3 */ +#define SPITZ_GPIO_KEY_STROBE4 26 /* keyboard: Strobe 4 */ +#define SPITZ_GPIO_KEY_STROBE5 27 /* keyboard: Strobe 5 */ +/* GPIO28_BITCLK 28 audio */ +/* GPIO29_SDATA_IN 29 audio */ +/* GPIO30_SDATA_OUT 30 audio */ +/* GPIO31_SYNC 31 audio */ +/* GPIO32_MMCCLK 32 SD */ +#define SPITZ_GPIO_FFDSR 33 /* IOPORT: UART DSR */ +#define SPITZ_GPIO_KEY_SENSE3 34 /* keyboard: Sense 3 */ +#define SPITZ_GPIO_USB_DEVICE 35 /* USB: Client power is present */ +#define SPITZ_GPIO_KEY_SENSE4 36 /* keyboard: Sense 4 */ +#define SPITZ_GPIO_USB_HOST 37 /* USB: OTG 5V Host power supply control */ +#define SPITZ_GPIO_KEY_SENSE5 38 /* keyboard: Sense 5 */ +#define SPITZ_GPIO_KEY_SENSE6 39 /* keyboard: Sense 6 */ +/* GPIO40 40 NC: Not Connected */ +#define SPITZ_GPIO_USB_CONNECT 41 /* USB: Host Cable Connected */ +/* GPIO42_BTRXD 42 Bluetooth: UART RxD (Akita+BT only) */ +/* GPIO43_BTTXD 43 Bluetooth: UART TxD (Akita+BT only) */ +/* GPIO44_BTCTS 44 Bluetooth: UART CTS (Akita+BT only) */ +/* GPIO45_BTRTS 45 Bluetooth: UART RTS (Akita+BT only) */ +/* GPIO46_STRXD 46 IrDA: UART RxD */ +/* GPIO47_STTXD 47 IrDA: UART TxD */ +/* GPIO48_nPOE 48 CF */ +/* GPIO49_nPWE 49 CF */ +/* GPIO50_nPIOR 50 CF */ +/* GPIO51_nPIOW 51 CF */ +#define SPITZ_GPIO_KEY_STROBE6 52 /* keyboard: Strobe 6 */ +#define SPITZ_GPIO_LCDCON_CS 53 /* SPI: LCD Controller Chip Select */ +/* GPIO54_nPCE_2 54 CF */ +/* GPIO55_nPREG 55 CF */ +/* GPIO56_nPWAIT 56 CF */ +/* GPIO57_nIOIS16 57 CF */ +/* GPIO58_LDD_0-GPIO74_LDD_15 58-73 display */ +/* GPIO74_LCD_FCLK 74 display */ +/* GPIO75_LCD_LCLK 75 display */ +/* GPIO76_LCD_PCLK 76 display */ +/* GPIO77_LCD_ACBIAS 77 display */ +/* GPIO78_nCS_2 78 CF2 (Spitz)*/ +#define SPITZ_GPIO_NAND_CS 79 /* system: NAND Flash Chip Select */ +/* GPIO80_nCS_4 80 CF1 */ +#define SPITZ_GPIO_nSD_WP 81 /* SD: Write Protection */ +#define SPITZ_GPIO_FFDTR 82 /* IOPORT: UART DTR */ +#define SPITZ_GPIO_SERVICE0 83 /* power: Service Connector */ +#define SPITZ_GPIO_SERVICE1 84 /* power: Service Connector */ +/* GPIO85_nPCE_1 85 CF */ +#define SPITZ_GPIO_SSP_RXD 86 /* SPI: SSP bus RxD */ +#define SPITZ_GPIO_SSP_TXD 87 /* SPI: SSP bus TxD */ +#define SPITZ_GPIO_KEY_STROBE0 88 /* keyboard: Strobe 0 */ +#define SPITZ_GPIO_ON_RESET 89 /* power: Software Reset */ +#define SPITZ_GPIO_BAT_COVER 90 /* power: Battery Cover switch */ +#define SPITZ_GPIO_KEY_SENSE2 91 /* keyboard: Sense 2 */ +/* GPIO92_MMCDAT0 92 SD */ +#define SPITZ_GPIO_CF2_CD 93 /* CF2 (Spitz): Internal CF IRQ */ +#define SPITZ_GPIO_CF_CD 94 /* CF1: CF IRQ */ +#define SPITZ_GPIO_ON_KEY 95 /* keyboard: Power On Key */ +#define SPITZ_GPIO_SWB 96 /* keyboard: Keyboard Interrupt B */ +#define SPITZ_GPIO_SWA 97 /* keyboard: Keyboard Interrupt A */ +#define SPITZ_GPIO_FFRTS 98 /* IOPORT: UART RTS */ +#define SPITZ_GPIO_FFTXD 99 /* IOPORT: UART nTxD (inverted levels) */ +#define SPITZ_GPIO_FFCTS 100 /* IOPORT: UART CTS */ +#define SPITZ_GPIO_CHRG_FULL 101 /* power: Battery Full */ +#define SPITZ_GPIO_FFRXD 102 /* IOPORT: UART nRxD (inverted levels) */ +#define SPITZ_GPIO_KEY_STROBE7 103 /* keyboard: Strobe 7 */ +/* GPIO104_pSKTSEL 104 CF */ +#define SPITZ_GPIO_CF_IRQ 105 /* CF1: CF Ready */ +#define SPITZ_GPIO_CF2_IRQ 106 /* CF2 (Spitz): Internal CF Ready */ +#define SPITZ_GPIO_KEY_STROBE8 107 /* keyboard: Strobe 8 */ +#define SPITZ_GPIO_KEY_STROBE9 108 /* keyboard: Strobe 9 */ +/* GPIO109_MMCDAT1 109 SD */ +/* GPIO110_MMCDAT2 110 SD */ +/* GPIO111_MMCDAT3 111 SD */ +/* GPIO112_MMCCMD 112 SD */ +/* GPIO113_AC97_RESET_N 113 audio */ +#define SPITZ_GPIO_KEY_STROBE10 114 /* keyboard: Strobe 10 */ +#define SPITZ_GPIO_AC_IN 115 /* power: External Power Supply is active */ +#define SPITZ_GPIO_HP_IN 116 /* audio: Headphone Detect */ +#define SPITZ_GPIO_SCL 117 /* I2C: I2C SCL */ +#define SPITZ_GPIO_SDA 118 /* I2C: I2C SDA */ /* Spitz/Akita Keyboard Definitions */ -#define SPITZ_KEY_STROBE_NUM (11) -#define SPITZ_KEY_SENSE_NUM (7) -#define SPITZ_GPIO_G0_STROBE_BIT 0x0f800000 -#define SPITZ_GPIO_G1_STROBE_BIT 0x00100000 -#define SPITZ_GPIO_G2_STROBE_BIT 0x01000000 -#define SPITZ_GPIO_G3_STROBE_BIT 0x00041880 -#define SPITZ_GPIO_G0_SENSE_BIT 0x00021000 -#define SPITZ_GPIO_G1_SENSE_BIT 0x000000d4 -#define SPITZ_GPIO_G2_SENSE_BIT 0x08000000 -#define SPITZ_GPIO_G3_SENSE_BIT 0x00000000 - -#define SPITZ_GPIO_KEY_STROBE0 88 -#define SPITZ_GPIO_KEY_STROBE1 23 -#define SPITZ_GPIO_KEY_STROBE2 24 -#define SPITZ_GPIO_KEY_STROBE3 25 -#define SPITZ_GPIO_KEY_STROBE4 26 -#define SPITZ_GPIO_KEY_STROBE5 27 -#define SPITZ_GPIO_KEY_STROBE6 52 -#define SPITZ_GPIO_KEY_STROBE7 103 -#define SPITZ_GPIO_KEY_STROBE8 107 -#define SPITZ_GPIO_KEY_STROBE9 108 -#define SPITZ_GPIO_KEY_STROBE10 114 - -#define SPITZ_GPIO_KEY_SENSE0 12 -#define SPITZ_GPIO_KEY_SENSE1 17 -#define SPITZ_GPIO_KEY_SENSE2 91 -#define SPITZ_GPIO_KEY_SENSE3 34 -#define SPITZ_GPIO_KEY_SENSE4 36 -#define SPITZ_GPIO_KEY_SENSE5 38 -#define SPITZ_GPIO_KEY_SENSE6 39 - - -/* Spitz Scoop Device (No. 1) GPIOs */ +#define SPITZ_KEY_STROBE_NUM 11 +#define SPITZ_KEY_SENSE_NUM 7 +#define SPITZ_GPIO_G0_STROBE_BIT 0x0f800000 +#define SPITZ_GPIO_G1_STROBE_BIT 0x00100000 +#define SPITZ_GPIO_G2_STROBE_BIT 0x01000000 +#define SPITZ_GPIO_G3_STROBE_BIT 0x00041880 +#define SPITZ_GPIO_G0_SENSE_BIT 0x00021000 +#define SPITZ_GPIO_G1_SENSE_BIT 0x000000d4 +#define SPITZ_GPIO_G2_SENSE_BIT 0x08000000 +#define SPITZ_GPIO_G3_SENSE_BIT 0x00000000 + +/* Spitz/Akita Scoop Device (No. 1) GPIOs */ /* Suspend States in comments */ -#define SPITZ_SCP_LED_GREEN SCOOP_GPCR_PA11 /* Keep */ -#define SPITZ_SCP_JK_B SCOOP_GPCR_PA12 /* Keep */ -#define SPITZ_SCP_CHRG_ON SCOOP_GPCR_PA13 /* Keep */ -#define SPITZ_SCP_MUTE_L SCOOP_GPCR_PA14 /* Low */ -#define SPITZ_SCP_MUTE_R SCOOP_GPCR_PA15 /* Low */ -#define SPITZ_SCP_CF_POWER SCOOP_GPCR_PA16 /* Keep */ -#define SPITZ_SCP_LED_ORANGE SCOOP_GPCR_PA17 /* Keep */ -#define SPITZ_SCP_JK_A SCOOP_GPCR_PA18 /* Low */ -#define SPITZ_SCP_ADC_TEMP_ON SCOOP_GPCR_PA19 /* Low */ +#define SPITZ_SCP_LED_GREEN SCOOP_GPCR_PA11 /* LED: Green LED, Keep */ +#define SPITZ_SCP_JK_B SCOOP_GPCR_PA12 /* power: Fast Charge On, Keep */ +#define SPITZ_SCP_CHRG_ON SCOOP_GPCR_PA13 /* power: Charge On, Keep */ +#define SPITZ_SCP_MUTE_L SCOOP_GPCR_PA14 /* audio: Extra Mute Left, Low */ +#define SPITZ_SCP_MUTE_R SCOOP_GPCR_PA15 /* audio: Extra Mute Right, Low */ +#define SPITZ_SCP_CF_POWER SCOOP_GPCR_PA16 /* power: CF+SD Power Circuit, Keep */ +#define SPITZ_SCP_LED_ORANGE SCOOP_GPCR_PA17 /* LED: Orange LED, Keep */ +#define SPITZ_SCP_JK_A SCOOP_GPCR_PA18 /* power: Dummy Load, Low */ +#define SPITZ_SCP_ADC_TEMP_ON SCOOP_GPCR_PA19 /* power: Battery Sensor On, Low */ #define SPITZ_SCP_IO_DIR (SPITZ_SCP_LED_GREEN | SPITZ_SCP_JK_B | SPITZ_SCP_CHRG_ON | \ - SPITZ_SCP_MUTE_L | SPITZ_SCP_MUTE_R | SPITZ_SCP_LED_ORANGE | \ - SPITZ_SCP_CF_POWER | SPITZ_SCP_JK_A | SPITZ_SCP_ADC_TEMP_ON) + SPITZ_SCP_MUTE_L | SPITZ_SCP_MUTE_R | SPITZ_SCP_LED_ORANGE | \ + SPITZ_SCP_CF_POWER | SPITZ_SCP_JK_A | SPITZ_SCP_ADC_TEMP_ON) #define SPITZ_SCP_IO_OUT (SPITZ_SCP_CHRG_ON | SPITZ_SCP_MUTE_L | SPITZ_SCP_MUTE_R) #define SPITZ_SCP_SUS_CLR (SPITZ_SCP_MUTE_L | SPITZ_SCP_MUTE_R | SPITZ_SCP_JK_A | SPITZ_SCP_ADC_TEMP_ON) #define SPITZ_SCP_SUS_SET 0 /* Spitz Scoop Device (No. 2) GPIOs */ -/* Suspend States in comments */ -#define SPITZ_SCP2_IR_ON SCOOP_GPCR_PA11 /* High */ -#define SPITZ_SCP2_AKIN_PULLUP SCOOP_GPCR_PA12 /* Keep */ -#define SPITZ_SCP2_RESERVED_1 SCOOP_GPCR_PA13 /* High */ -#define SPITZ_SCP2_RESERVED_2 SCOOP_GPCR_PA14 /* Low */ -#define SPITZ_SCP2_RESERVED_3 SCOOP_GPCR_PA15 /* Low */ -#define SPITZ_SCP2_RESERVED_4 SCOOP_GPCR_PA16 /* Low */ -#define SPITZ_SCP2_BACKLIGHT_CONT SCOOP_GPCR_PA17 /* Low */ -#define SPITZ_SCP2_BACKLIGHT_ON SCOOP_GPCR_PA18 /* Low */ -#define SPITZ_SCP2_MIC_BIAS SCOOP_GPCR_PA19 /* Low */ +/* Suspend States in comments + * Spitz only, Akita uses corresponding AKITA_IOEXP_ */ +#define SPITZ_SCP2_IR_ON SCOOP_GPCR_PA11 /* IrDA: IrDA On, High */ +#define SPITZ_SCP2_AKIN_PULLUP SCOOP_GPCR_PA12 /* audio: Pull-Up for Remote, Keep */ +#define SPITZ_SCP2_RESERVED_1 SCOOP_GPCR_PA13 /* NC: High */ +#define SPITZ_SCP2_RESERVED_2 SCOOP_GPCR_PA14 /* NC: Low */ +#define SPITZ_SCP2_RESERVED_3 SCOOP_GPCR_PA15 /* NC: Low */ +#define SPITZ_SCP2_RESERVED_4 SCOOP_GPCR_PA16 /* NC: Low */ +#define SPITZ_SCP2_BACKLIGHT_CONT SCOOP_GPCR_PA17 /* display: Backlight Control, Low */ +#define SPITZ_SCP2_BACKLIGHT_ON SCOOP_GPCR_PA18 /* display: Backlight On, Low */ +#define SPITZ_SCP2_MIC_BIAS SCOOP_GPCR_PA19 /* audio: Mic Bias On, Low */ #define SPITZ_SCP2_IO_DIR (SPITZ_SCP2_IR_ON | SPITZ_SCP2_AKIN_PULLUP | SPITZ_SCP2_RESERVED_1 | \ - SPITZ_SCP2_RESERVED_2 | SPITZ_SCP2_RESERVED_3 | SPITZ_SCP2_RESERVED_4 | \ - SPITZ_SCP2_BACKLIGHT_CONT | SPITZ_SCP2_BACKLIGHT_ON | SPITZ_SCP2_MIC_BIAS) + SPITZ_SCP2_RESERVED_2 | SPITZ_SCP2_RESERVED_3 | SPITZ_SCP2_RESERVED_4 | \ + SPITZ_SCP2_BACKLIGHT_CONT | SPITZ_SCP2_BACKLIGHT_ON | SPITZ_SCP2_MIC_BIAS) #define SPITZ_SCP2_IO_OUT (SPITZ_SCP2_IR_ON | SPITZ_SCP2_AKIN_PULLUP | SPITZ_SCP2_RESERVED_1) #define SPITZ_SCP2_SUS_CLR (SPITZ_SCP2_RESERVED_2 | SPITZ_SCP2_RESERVED_3 | SPITZ_SCP2_RESERVED_4 | \ - SPITZ_SCP2_BACKLIGHT_CONT | SPITZ_SCP2_BACKLIGHT_ON | SPITZ_SCP2_MIC_BIAS) + SPITZ_SCP2_BACKLIGHT_CONT | SPITZ_SCP2_BACKLIGHT_ON | SPITZ_SCP2_MIC_BIAS) #define SPITZ_SCP2_SUS_SET (SPITZ_SCP2_IR_ON | SPITZ_SCP2_RESERVED_1) -/* Spitz IRQ Definitions */ +/* Spitz/Akita IRQ Definitions */ -#define SPITZ_IRQ_GPIO_KEY_INT IRQ_GPIO(SPITZ_GPIO_KEY_INT) -#define SPITZ_IRQ_GPIO_AC_IN IRQ_GPIO(SPITZ_GPIO_AC_IN) -#define SPITZ_IRQ_GPIO_AK_INT IRQ_GPIO(SPITZ_GPIO_AK_INT) -#define SPITZ_IRQ_GPIO_HP_IN IRQ_GPIO(SPITZ_GPIO_HP_IN) -#define SPITZ_IRQ_GPIO_TP_INT IRQ_GPIO(SPITZ_GPIO_TP_INT) -#define SPITZ_IRQ_GPIO_SYNC IRQ_GPIO(SPITZ_GPIO_SYNC) -#define SPITZ_IRQ_GPIO_ON_KEY IRQ_GPIO(SPITZ_GPIO_ON_KEY) -#define SPITZ_IRQ_GPIO_SWA IRQ_GPIO(SPITZ_GPIO_SWA) -#define SPITZ_IRQ_GPIO_SWB IRQ_GPIO(SPITZ_GPIO_SWB) +#define SPITZ_IRQ_GPIO_KEY_INT IRQ_GPIO(SPITZ_GPIO_KEY_INT) +#define SPITZ_IRQ_GPIO_AC_IN IRQ_GPIO(SPITZ_GPIO_AC_IN) +#define SPITZ_IRQ_GPIO_AK_INT IRQ_GPIO(SPITZ_GPIO_AK_INT) +#define SPITZ_IRQ_GPIO_HP_IN IRQ_GPIO(SPITZ_GPIO_HP_IN) +#define SPITZ_IRQ_GPIO_TP_INT IRQ_GPIO(SPITZ_GPIO_TP_INT) +#define SPITZ_IRQ_GPIO_SYNC IRQ_GPIO(SPITZ_GPIO_SYNC) +#define SPITZ_IRQ_GPIO_ON_KEY IRQ_GPIO(SPITZ_GPIO_ON_KEY) +#define SPITZ_IRQ_GPIO_SWA IRQ_GPIO(SPITZ_GPIO_SWA) +#define SPITZ_IRQ_GPIO_SWB IRQ_GPIO(SPITZ_GPIO_SWB) #define SPITZ_IRQ_GPIO_BAT_COVER IRQ_GPIO(SPITZ_GPIO_BAT_COVER) #define SPITZ_IRQ_GPIO_FATAL_BAT IRQ_GPIO(SPITZ_GPIO_FATAL_BAT) -#define SPITZ_IRQ_GPIO_CO IRQ_GPIO(SPITZ_GPIO_CO) -#define SPITZ_IRQ_GPIO_CF_IRQ IRQ_GPIO(SPITZ_GPIO_CF_IRQ) -#define SPITZ_IRQ_GPIO_CF_CD IRQ_GPIO(SPITZ_GPIO_CF_CD) -#define SPITZ_IRQ_GPIO_CF2_IRQ IRQ_GPIO(SPITZ_GPIO_CF2_IRQ) -#define SPITZ_IRQ_GPIO_nSD_INT IRQ_GPIO(SPITZ_GPIO_nSD_INT) +#define SPITZ_IRQ_GPIO_CF_IRQ IRQ_GPIO(SPITZ_GPIO_CF_IRQ) +#define SPITZ_IRQ_GPIO_CF_CD IRQ_GPIO(SPITZ_GPIO_CF_CD) +#define SPITZ_IRQ_GPIO_CF2_IRQ IRQ_GPIO(SPITZ_GPIO_CF2_IRQ) +#define SPITZ_IRQ_GPIO_nSD_INT IRQ_GPIO(SPITZ_GPIO_nSD_INT) #define SPITZ_IRQ_GPIO_nSD_DETECT IRQ_GPIO(SPITZ_GPIO_nSD_DETECT) /* @@ -156,3 +203,5 @@ extern struct platform_device spitzscoop_device; extern struct platform_device spitzscoop2_device; extern struct platform_device spitzssp_device; extern struct sharpsl_charger_machinfo spitz_pm_machinfo; + +#endif diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c index 3603540..0d05de4 100644 --- a/arch/arm/mach-pxa/spitz_pm.c +++ b/arch/arm/mach-pxa/spitz_pm.c @@ -112,9 +112,9 @@ static void spitz_presuspend(void) pxa_gpio_mode(GPIO18_RDY|GPIO_OUT | GPIO_DFLT_HIGH); PRER = GPIO_bit(SPITZ_GPIO_KEY_INT); - PFER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET); - PWER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET) | PWER_RTC; - PKWR = GPIO_bit(SPITZ_GPIO_SYNC) | GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET); + PFER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(GPIO1_RST); + PWER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(GPIO1_RST) | PWER_RTC; + PKWR = GPIO_bit(SPITZ_GPIO_SYNC) | GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(GPIO1_RST); PKSR = 0xffffffff; // clear /* nRESET_OUT Disable */ -- Best Regards / S pozdravem, Stanislav Brabec software developer --------------------------------------------------------------------- SUSE LINUX, s. r. o. e-mail: sbrabec@xxxxxxx Lihovarská 1060/12 tel: +420 284 028 966, +49 911 740538747 190 00 Praha 9 fax: +420 284 028 951 Czech Republic http://www.suse.cz/ ------------------------------------------------------------------- List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php
[Site Home] [Linux Arm] [Fedora ARM] [Gcc Help] [Git] [DCCP] [IETF Announce] [Security] [PDAs] [Linux] [Linux Book List] [Linux MIPS] [Yosemite Campsites] [Photos]
|
|