diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
commit | 054d5c9238f3c577ad51195c3ee7803613f322cc (patch) | |
tree | ff7d9f5c0e0ddf14230ba28f28ef69a2c0a0debf /arch/arm/mach-pxa/include | |
parent | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (diff) | |
parent | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (diff) |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-pxa/include')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/balloon3.h | 75 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/colibri.h | 32 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/corgi.h | 5 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/gumstix.h | 12 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/palm27x.h | 81 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pata_pxa.h | 33 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/sharpsl.h | 35 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/sharpsl_pm.h | 9 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/spitz.h | 2 |
9 files changed, 204 insertions, 80 deletions
diff --git a/arch/arm/mach-pxa/include/mach/balloon3.h b/arch/arm/mach-pxa/include/mach/balloon3.h index 1a741065045f..eec92e6fd7cf 100644 --- a/arch/arm/mach-pxa/include/mach/balloon3.h +++ b/arch/arm/mach-pxa/include/mach/balloon3.h | |||
@@ -26,21 +26,55 @@ enum balloon3_features { | |||
26 | #define BALLOON3_FPGA_VIRT (0xf1000000) /* as per balloon2 */ | 26 | #define BALLOON3_FPGA_VIRT (0xf1000000) /* as per balloon2 */ |
27 | #define BALLOON3_FPGA_LENGTH 0x01000000 | 27 | #define BALLOON3_FPGA_LENGTH 0x01000000 |
28 | 28 | ||
29 | /* FPGA/CPLD registers */ | 29 | /* FPGA / CPLD registers for CF socket */ |
30 | #define BALLOON3_PCMCIA0_REG (BALLOON3_FPGA_VIRT + 0x00e00008) | 30 | #define BALLOON3_CF_STATUS_REG (BALLOON3_FPGA_VIRT + 0x00e00008) |
31 | /* fixme - same for now */ | 31 | #define BALLOON3_CF_CONTROL_REG (BALLOON3_FPGA_VIRT + 0x00e00008) |
32 | #define BALLOON3_PCMCIA1_REG (BALLOON3_FPGA_VIRT + 0x00e00008) | 32 | /* FPGA / CPLD version register */ |
33 | #define BALLOON3_NANDIO_IO_REG (BALLOON3_FPGA_VIRT + 0x00e00000) | 33 | #define BALLOON3_FPGA_VER (BALLOON3_FPGA_VIRT + 0x00e0001c) |
34 | /* FPGA / CPLD registers for NAND flash */ | ||
35 | #define BALLOON3_NAND_BASE (PXA_CS4_PHYS + 0x00e00000) | ||
36 | #define BALLOON3_NAND_IO_REG (BALLOON3_FPGA_VIRT + 0x00e00000) | ||
37 | #define BALLOON3_NAND_CONTROL2_REG (BALLOON3_FPGA_VIRT + 0x00e00010) | ||
38 | #define BALLOON3_NAND_STAT_REG (BALLOON3_FPGA_VIRT + 0x00e00010) | ||
39 | #define BALLOON3_NAND_CONTROL_REG (BALLOON3_FPGA_VIRT + 0x00e00014) | ||
40 | |||
34 | /* fpga/cpld interrupt control register */ | 41 | /* fpga/cpld interrupt control register */ |
35 | #define BALLOON3_INT_CONTROL_REG (BALLOON3_FPGA_VIRT + 0x00e0000C) | 42 | #define BALLOON3_INT_CONTROL_REG (BALLOON3_FPGA_VIRT + 0x00e0000C) |
36 | #define BALLOON3_NANDIO_CTL2_REG (BALLOON3_FPGA_VIRT + 0x00e00010) | ||
37 | #define BALLOON3_NANDIO_CTL_REG (BALLOON3_FPGA_VIRT + 0x00e00014) | ||
38 | #define BALLOON3_VERSION_REG (BALLOON3_FPGA_VIRT + 0x00e0001c) | 43 | #define BALLOON3_VERSION_REG (BALLOON3_FPGA_VIRT + 0x00e0001c) |
39 | 44 | ||
40 | #define BALLOON3_SAMOSA_ADDR_REG (BALLOON3_FPGA_VIRT + 0x00c00000) | 45 | #define BALLOON3_SAMOSA_ADDR_REG (BALLOON3_FPGA_VIRT + 0x00c00000) |
41 | #define BALLOON3_SAMOSA_DATA_REG (BALLOON3_FPGA_VIRT + 0x00c00004) | 46 | #define BALLOON3_SAMOSA_DATA_REG (BALLOON3_FPGA_VIRT + 0x00c00004) |
42 | #define BALLOON3_SAMOSA_STATUS_REG (BALLOON3_FPGA_VIRT + 0x00c0001c) | 47 | #define BALLOON3_SAMOSA_STATUS_REG (BALLOON3_FPGA_VIRT + 0x00c0001c) |
43 | 48 | ||
49 | /* CF Status Register bits (read-only) bits */ | ||
50 | #define BALLOON3_CF_nIRQ (1 << 0) | ||
51 | #define BALLOON3_CF_nSTSCHG_BVD1 (1 << 1) | ||
52 | |||
53 | /* CF Control Set Register bits / CF Control Clear Register bits (write-only) */ | ||
54 | #define BALLOON3_CF_RESET (1 << 0) | ||
55 | #define BALLOON3_CF_ENABLE (1 << 1) | ||
56 | #define BALLOON3_CF_ADD_ENABLE (1 << 2) | ||
57 | |||
58 | /* CF Interrupt sources */ | ||
59 | #define BALLOON3_BP_CF_NRDY_IRQ BALLOON3_IRQ(0) | ||
60 | #define BALLOON3_BP_NSTSCHG_IRQ BALLOON3_IRQ(1) | ||
61 | |||
62 | /* NAND Control register */ | ||
63 | #define BALLOON3_NAND_CONTROL_FLWP (1 << 7) | ||
64 | #define BALLOON3_NAND_CONTROL_FLSE (1 << 6) | ||
65 | #define BALLOON3_NAND_CONTROL_FLCE3 (1 << 5) | ||
66 | #define BALLOON3_NAND_CONTROL_FLCE2 (1 << 4) | ||
67 | #define BALLOON3_NAND_CONTROL_FLCE1 (1 << 3) | ||
68 | #define BALLOON3_NAND_CONTROL_FLCE0 (1 << 2) | ||
69 | #define BALLOON3_NAND_CONTROL_FLALE (1 << 1) | ||
70 | #define BALLOON3_NAND_CONTROL_FLCLE (1 << 0) | ||
71 | |||
72 | /* NAND Status register */ | ||
73 | #define BALLOON3_NAND_STAT_RNB (1 << 0) | ||
74 | |||
75 | /* NAND Control2 register */ | ||
76 | #define BALLOON3_NAND_CONTROL2_16BIT (1 << 0) | ||
77 | |||
44 | /* GPIOs for irqs */ | 78 | /* GPIOs for irqs */ |
45 | #define BALLOON3_GPIO_AUX_NIRQ (94) | 79 | #define BALLOON3_GPIO_AUX_NIRQ (94) |
46 | #define BALLOON3_GPIO_CODEC_IRQ (95) | 80 | #define BALLOON3_GPIO_CODEC_IRQ (95) |
@@ -54,20 +88,24 @@ enum balloon3_features { | |||
54 | 88 | ||
55 | #define BALLOON3_GPIO_S0_CD (105) | 89 | #define BALLOON3_GPIO_S0_CD (105) |
56 | 90 | ||
91 | /* NAND */ | ||
92 | #define BALLOON3_GPIO_RUN_NAND (102) | ||
93 | |||
94 | /* PCF8574A Leds */ | ||
95 | #define BALLOON3_PCF_GPIO_BASE 160 | ||
96 | #define BALLOON3_PCF_GPIO_LED0 (BALLOON3_PCF_GPIO_BASE + 0) | ||
97 | #define BALLOON3_PCF_GPIO_LED1 (BALLOON3_PCF_GPIO_BASE + 1) | ||
98 | #define BALLOON3_PCF_GPIO_LED2 (BALLOON3_PCF_GPIO_BASE + 2) | ||
99 | #define BALLOON3_PCF_GPIO_LED3 (BALLOON3_PCF_GPIO_BASE + 3) | ||
100 | #define BALLOON3_PCF_GPIO_LED4 (BALLOON3_PCF_GPIO_BASE + 4) | ||
101 | #define BALLOON3_PCF_GPIO_LED5 (BALLOON3_PCF_GPIO_BASE + 5) | ||
102 | #define BALLOON3_PCF_GPIO_LED6 (BALLOON3_PCF_GPIO_BASE + 6) | ||
103 | #define BALLOON3_PCF_GPIO_LED7 (BALLOON3_PCF_GPIO_BASE + 7) | ||
104 | |||
57 | /* FPGA Interrupt Mask/Acknowledge Register */ | 105 | /* FPGA Interrupt Mask/Acknowledge Register */ |
58 | #define BALLOON3_INT_S0_IRQ (1 << 0) /* PCMCIA 0 IRQ */ | 106 | #define BALLOON3_INT_S0_IRQ (1 << 0) /* PCMCIA 0 IRQ */ |
59 | #define BALLOON3_INT_S0_STSCHG (1 << 1) /* PCMCIA 0 status changed */ | 107 | #define BALLOON3_INT_S0_STSCHG (1 << 1) /* PCMCIA 0 status changed */ |
60 | 108 | ||
61 | /* CF Status Register */ | ||
62 | #define BALLOON3_PCMCIA_nIRQ (1 << 0) /* IRQ / ready signal */ | ||
63 | #define BALLOON3_PCMCIA_nSTSCHG_BVD1 (1 << 1) | ||
64 | /* VDD sense / card status changed */ | ||
65 | |||
66 | /* CF control register (write) */ | ||
67 | #define BALLOON3_PCMCIA_RESET (1 << 0) /* Card reset signal */ | ||
68 | #define BALLOON3_PCMCIA_ENABLE (1 << 1) | ||
69 | #define BALLOON3_PCMCIA_ADD_ENABLE (1 << 2) | ||
70 | |||
71 | /* CPLD (and FPGA) interface definitions */ | 109 | /* CPLD (and FPGA) interface definitions */ |
72 | #define CPLD_LCD0_DATA_SET 0x00 | 110 | #define CPLD_LCD0_DATA_SET 0x00 |
73 | #define CPLD_LCD0_DATA_CLR 0x10 | 111 | #define CPLD_LCD0_DATA_CLR 0x10 |
@@ -132,9 +170,6 @@ enum balloon3_features { | |||
132 | /* Balloon3 Interrupts */ | 170 | /* Balloon3 Interrupts */ |
133 | #define BALLOON3_IRQ(x) (IRQ_BOARD_START + (x)) | 171 | #define BALLOON3_IRQ(x) (IRQ_BOARD_START + (x)) |
134 | 172 | ||
135 | #define BALLOON3_BP_CF_NRDY_IRQ BALLOON3_IRQ(0) | ||
136 | #define BALLOON3_BP_NSTSCHG_IRQ BALLOON3_IRQ(1) | ||
137 | |||
138 | #define BALLOON3_AUX_NIRQ IRQ_GPIO(BALLOON3_GPIO_AUX_NIRQ) | 173 | #define BALLOON3_AUX_NIRQ IRQ_GPIO(BALLOON3_GPIO_AUX_NIRQ) |
139 | #define BALLOON3_CODEC_IRQ IRQ_GPIO(BALLOON3_GPIO_CODEC_IRQ) | 174 | #define BALLOON3_CODEC_IRQ IRQ_GPIO(BALLOON3_GPIO_CODEC_IRQ) |
140 | #define BALLOON3_S0_CD_IRQ IRQ_GPIO(BALLOON3_GPIO_S0_CD) | 175 | #define BALLOON3_S0_CD_IRQ IRQ_GPIO(BALLOON3_GPIO_S0_CD) |
diff --git a/arch/arm/mach-pxa/include/mach/colibri.h b/arch/arm/mach-pxa/include/mach/colibri.h index 5f2ba8d9015c..58dada11054f 100644 --- a/arch/arm/mach-pxa/include/mach/colibri.h +++ b/arch/arm/mach-pxa/include/mach/colibri.h | |||
@@ -5,6 +5,27 @@ | |||
5 | #include <mach/mfp.h> | 5 | #include <mach/mfp.h> |
6 | 6 | ||
7 | /* | 7 | /* |
8 | * base board glue for PXA270 module | ||
9 | */ | ||
10 | |||
11 | enum { | ||
12 | COLIBRI_PXA270_EVALBOARD = 0, | ||
13 | COLIBRI_PXA270_INCOME, | ||
14 | }; | ||
15 | |||
16 | #if defined(CONFIG_MACH_COLIBRI_PXA270_EVALBOARD) | ||
17 | extern void colibri_pxa270_evalboard_init(void); | ||
18 | #else | ||
19 | static inline void colibri_pxa270_evalboard_init(void) {} | ||
20 | #endif | ||
21 | |||
22 | #if defined(CONFIG_MACH_COLIBRI_PXA270_INCOME) | ||
23 | extern void colibri_pxa270_income_boardinit(void); | ||
24 | #else | ||
25 | static inline void colibri_pxa270_income_boardinit(void) {} | ||
26 | #endif | ||
27 | |||
28 | /* | ||
8 | * common settings for all modules | 29 | * common settings for all modules |
9 | */ | 30 | */ |
10 | 31 | ||
@@ -33,13 +54,10 @@ static inline void colibri_pxa3xx_init_nand(void) {} | |||
33 | /* physical memory regions */ | 54 | /* physical memory regions */ |
34 | #define COLIBRI_SDRAM_BASE 0xa0000000 /* SDRAM region */ | 55 | #define COLIBRI_SDRAM_BASE 0xa0000000 /* SDRAM region */ |
35 | 56 | ||
36 | /* definitions for Colibri PXA270 */ | 57 | /* GPIO definitions for Colibri PXA270 */ |
37 | 58 | #define GPIO114_COLIBRI_PXA270_ETH_IRQ 114 | |
38 | #define COLIBRI_PXA270_FLASH_PHYS (PXA_CS0_PHYS) /* Flash region */ | 59 | #define GPIO0_COLIBRI_PXA270_SD_DETECT 0 |
39 | #define COLIBRI_PXA270_ETH_PHYS (PXA_CS2_PHYS) /* Ethernet */ | 60 | #define GPIO113_COLIBRI_PXA270_TS_IRQ 113 |
40 | #define COLIBRI_PXA270_ETH_IRQ_GPIO 114 | ||
41 | #define COLIBRI_PXA270_ETH_IRQ \ | ||
42 | gpio_to_irq(mfp_to_gpio(COLIBRI_PXA270_ETH_IRQ_GPIO)) | ||
43 | 61 | ||
44 | #endif /* _COLIBRI_H_ */ | 62 | #endif /* _COLIBRI_H_ */ |
45 | 63 | ||
diff --git a/arch/arm/mach-pxa/include/mach/corgi.h b/arch/arm/mach-pxa/include/mach/corgi.h index 585970ef08ce..0011055bc3f9 100644 --- a/arch/arm/mach-pxa/include/mach/corgi.h +++ b/arch/arm/mach-pxa/include/mach/corgi.h | |||
@@ -109,10 +109,5 @@ | |||
109 | #define CORGI_GPIO_BACKLIGHT_CONT (CORGI_SCOOP_GPIO_BASE + 7) | 109 | #define CORGI_GPIO_BACKLIGHT_CONT (CORGI_SCOOP_GPIO_BASE + 7) |
110 | #define CORGI_GPIO_MIC_BIAS (CORGI_SCOOP_GPIO_BASE + 8) | 110 | #define CORGI_GPIO_MIC_BIAS (CORGI_SCOOP_GPIO_BASE + 8) |
111 | 111 | ||
112 | /* | ||
113 | * Shared data structures | ||
114 | */ | ||
115 | extern struct platform_device corgiscoop_device; | ||
116 | |||
117 | #endif /* __ASM_ARCH_CORGI_H */ | 112 | #endif /* __ASM_ARCH_CORGI_H */ |
118 | 113 | ||
diff --git a/arch/arm/mach-pxa/include/mach/gumstix.h b/arch/arm/mach-pxa/include/mach/gumstix.h index 06abd4160607..9b898680b206 100644 --- a/arch/arm/mach-pxa/include/mach/gumstix.h +++ b/arch/arm/mach-pxa/include/mach/gumstix.h | |||
@@ -14,25 +14,15 @@ | |||
14 | 14 | ||
15 | /* | 15 | /* |
16 | GPIOn - Input from MAX823 (or equiv), normalizing USB +5V into a clean | 16 | GPIOn - Input from MAX823 (or equiv), normalizing USB +5V into a clean |
17 | interrupt signal for determining cable presence. On the original gumstix, | 17 | interrupt signal for determining cable presence. On the gumstix F, |
18 | this is GPIO81, and GPIO83 needs to be defined as well. On the gumstix F, | ||
19 | this moves to GPIO17 and GPIO37. */ | 18 | this moves to GPIO17 and GPIO37. */ |
20 | 19 | ||
21 | /* GPIOx - Connects to USB D+ and used as a pull-up after GPIOn | 20 | /* GPIOx - Connects to USB D+ and used as a pull-up after GPIOn |
22 | has detected a cable insertion; driven low otherwise. */ | 21 | has detected a cable insertion; driven low otherwise. */ |
23 | 22 | ||
24 | #ifdef CONFIG_ARCH_GUMSTIX_ORIG | ||
25 | |||
26 | #define GPIO_GUMSTIX_USB_GPIOn 81 | ||
27 | #define GPIO_GUMSTIX_USB_GPIOx 83 | ||
28 | |||
29 | #else | ||
30 | |||
31 | #define GPIO_GUMSTIX_USB_GPIOn 35 | 23 | #define GPIO_GUMSTIX_USB_GPIOn 35 |
32 | #define GPIO_GUMSTIX_USB_GPIOx 41 | 24 | #define GPIO_GUMSTIX_USB_GPIOx 41 |
33 | 25 | ||
34 | #endif | ||
35 | |||
36 | /* usb state change */ | 26 | /* usb state change */ |
37 | #define GUMSTIX_USB_INTR_IRQ IRQ_GPIO(GPIO_GUMSTIX_USB_GPIOn) | 27 | #define GUMSTIX_USB_INTR_IRQ IRQ_GPIO(GPIO_GUMSTIX_USB_GPIOn) |
38 | 28 | ||
diff --git a/arch/arm/mach-pxa/include/mach/palm27x.h b/arch/arm/mach-pxa/include/mach/palm27x.h new file mode 100644 index 000000000000..0a5e5eadebf5 --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/palm27x.h | |||
@@ -0,0 +1,81 @@ | |||
1 | /* | ||
2 | * Common functions for Palm LD, T5, TX, Z72 | ||
3 | * | ||
4 | * Copyright (C) 2010 | ||
5 | * Marek Vasut <marek.vasut@gmail.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | * | ||
11 | */ | ||
12 | #ifndef __INCLUDE_MACH_PALM27X__ | ||
13 | #define __INCLUDE_MACH_PALM27X__ | ||
14 | |||
15 | #if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE) | ||
16 | extern void __init palm27x_mmc_init(int detect, int ro, int power, | ||
17 | int power_inverted); | ||
18 | #else | ||
19 | static inline void palm27x_mmc_init(int detect, int ro, int power, | ||
20 | int power_inverted) | ||
21 | {} | ||
22 | #endif | ||
23 | |||
24 | #if defined(CONFIG_SUSPEND) | ||
25 | extern void __init palm27x_pm_init(unsigned long str_base); | ||
26 | #else | ||
27 | static inline void palm27x_pm_init(unsigned long str_base) {} | ||
28 | #endif | ||
29 | |||
30 | #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE) | ||
31 | extern struct pxafb_mode_info palm_320x480_lcd_mode; | ||
32 | extern struct pxafb_mode_info palm_320x320_lcd_mode; | ||
33 | extern struct pxafb_mode_info palm_320x320_new_lcd_mode; | ||
34 | extern void __init palm27x_lcd_init(int power, | ||
35 | struct pxafb_mode_info *mode); | ||
36 | #else | ||
37 | static inline void palm27x_lcd_init(int power, struct pxafb_mode_info *mode) {} | ||
38 | #endif | ||
39 | |||
40 | #if defined(CONFIG_USB_GADGET_PXA27X) || \ | ||
41 | defined(CONFIG_USB_GADGET_PXA27X_MODULE) | ||
42 | extern void __init palm27x_udc_init(int vbus, int pullup, | ||
43 | int vbus_inverted); | ||
44 | #else | ||
45 | static inline void palm27x_udc_init(int vbus, int pullup, int vbus_inverted) {} | ||
46 | #endif | ||
47 | |||
48 | #if defined(CONFIG_IRDA) || defined(CONFIG_IRDA_MODULE) | ||
49 | extern void __init palm27x_irda_init(int pwdn); | ||
50 | #else | ||
51 | static inline void palm27x_irda_init(int pwdn) {} | ||
52 | #endif | ||
53 | |||
54 | #if defined(CONFIG_TOUCHSCREEN_WM97XX) || \ | ||
55 | defined(CONFIG_TOUCHSCREEN_WM97XX_MODULE) | ||
56 | extern void __init palm27x_ac97_init(int minv, int maxv, int jack, | ||
57 | int reset); | ||
58 | #else | ||
59 | static inline void palm27x_ac97_init(int minv, int maxv, int jack, int reset) {} | ||
60 | #endif | ||
61 | |||
62 | #if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM_MODULE) | ||
63 | extern void __init palm27x_pwm_init(int bl, int lcd); | ||
64 | #else | ||
65 | static inline void palm27x_pwm_init(int bl, int lcd) {} | ||
66 | #endif | ||
67 | |||
68 | #if defined(CONFIG_PDA_POWER) || defined(CONFIG_PDA_POWER_MODULE) | ||
69 | extern void __init palm27x_power_init(int ac, int usb); | ||
70 | #else | ||
71 | static inline void palm27x_power_init(int ac, int usb) {} | ||
72 | #endif | ||
73 | |||
74 | #if defined(CONFIG_REGULATOR_MAX1586) || \ | ||
75 | defined(CONFIG_REGULATOR_MAX1586_MODULE) | ||
76 | extern void __init palm27x_pmic_init(void); | ||
77 | #else | ||
78 | static inline void palm27x_pmic_init(void) {} | ||
79 | #endif | ||
80 | |||
81 | #endif /* __INCLUDE_MACH_PALM27X__ */ | ||
diff --git a/arch/arm/mach-pxa/include/mach/pata_pxa.h b/arch/arm/mach-pxa/include/mach/pata_pxa.h new file mode 100644 index 000000000000..6cf7df1d5830 --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/pata_pxa.h | |||
@@ -0,0 +1,33 @@ | |||
1 | /* | ||
2 | * Generic PXA PATA driver | ||
3 | * | ||
4 | * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2, or (at your option) | ||
9 | * any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; see the file COPYING. If not, write to | ||
18 | * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | ||
19 | */ | ||
20 | |||
21 | #ifndef __MACH_PATA_PXA_H__ | ||
22 | #define __MACH_PATA_PXA_H__ | ||
23 | |||
24 | struct pata_pxa_pdata { | ||
25 | /* PXA DMA DREQ<0:2> pin */ | ||
26 | uint32_t dma_dreq; | ||
27 | /* Register shift */ | ||
28 | uint32_t reg_shift; | ||
29 | /* IRQ flags */ | ||
30 | uint32_t irq_flags; | ||
31 | }; | ||
32 | |||
33 | #endif /* __MACH_PATA_PXA_H__ */ | ||
diff --git a/arch/arm/mach-pxa/include/mach/sharpsl.h b/arch/arm/mach-pxa/include/mach/sharpsl.h deleted file mode 100644 index 8242e14a44fa..000000000000 --- a/arch/arm/mach-pxa/include/mach/sharpsl.h +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | /* | ||
2 | * SharpSL SSP Driver | ||
3 | */ | ||
4 | |||
5 | unsigned long corgi_ssp_ads7846_putget(unsigned long); | ||
6 | unsigned long corgi_ssp_ads7846_get(void); | ||
7 | void corgi_ssp_ads7846_put(unsigned long data); | ||
8 | void corgi_ssp_ads7846_lock(void); | ||
9 | void corgi_ssp_ads7846_unlock(void); | ||
10 | void corgi_ssp_lcdtg_send (unsigned char adrs, unsigned char data); | ||
11 | void corgi_ssp_blduty_set(int duty); | ||
12 | int corgi_ssp_max1111_get(unsigned long data); | ||
13 | |||
14 | /* | ||
15 | * SharpSL Touchscreen Driver | ||
16 | */ | ||
17 | |||
18 | struct corgits_machinfo { | ||
19 | unsigned long (*get_hsync_invperiod)(void); | ||
20 | void (*put_hsync)(void); | ||
21 | void (*wait_hsync)(void); | ||
22 | }; | ||
23 | |||
24 | |||
25 | /* | ||
26 | * SharpSL Backlight | ||
27 | */ | ||
28 | extern void corgibl_limit_intensity(int limit); | ||
29 | extern void corgi_lcd_limit_intensity(int limit); | ||
30 | |||
31 | |||
32 | /* | ||
33 | * SharpSL Battery/PM Driver | ||
34 | */ | ||
35 | extern void sharpsl_battery_kick(void); | ||
diff --git a/arch/arm/mach-pxa/include/mach/sharpsl_pm.h b/arch/arm/mach-pxa/include/mach/sharpsl_pm.h index 1920dc6b05dc..905be6755f04 100644 --- a/arch/arm/mach-pxa/include/mach/sharpsl_pm.h +++ b/arch/arm/mach-pxa/include/mach/sharpsl_pm.h | |||
@@ -93,6 +93,8 @@ struct sharpsl_pm_status { | |||
93 | 93 | ||
94 | extern struct sharpsl_pm_status sharpsl_pm; | 94 | extern struct sharpsl_pm_status sharpsl_pm; |
95 | 95 | ||
96 | extern struct battery_thresh sharpsl_battery_levels_acin[]; | ||
97 | extern struct battery_thresh sharpsl_battery_levels_noac[]; | ||
96 | 98 | ||
97 | #define SHARPSL_LED_ERROR 2 | 99 | #define SHARPSL_LED_ERROR 2 |
98 | #define SHARPSL_LED_ON 1 | 100 | #define SHARPSL_LED_ON 1 |
@@ -101,4 +103,11 @@ extern struct sharpsl_pm_status sharpsl_pm; | |||
101 | void sharpsl_battery_kick(void); | 103 | void sharpsl_battery_kick(void); |
102 | void sharpsl_pm_led(int val); | 104 | void sharpsl_pm_led(int val); |
103 | 105 | ||
106 | /* MAX1111 Channel Definitions */ | ||
107 | #define MAX1111_BATT_VOLT 4u | ||
108 | #define MAX1111_BATT_TEMP 2u | ||
109 | #define MAX1111_ACIN_VOLT 6u | ||
110 | int sharpsl_pm_pxa_read_max1111(int channel); | ||
111 | |||
112 | void corgi_lcd_limit_intensity(int limit); | ||
104 | #endif | 113 | #endif |
diff --git a/arch/arm/mach-pxa/include/mach/spitz.h b/arch/arm/mach-pxa/include/mach/spitz.h index fa1998caa78e..685749a51c42 100644 --- a/arch/arm/mach-pxa/include/mach/spitz.h +++ b/arch/arm/mach-pxa/include/mach/spitz.h | |||
@@ -185,7 +185,5 @@ | |||
185 | /* | 185 | /* |
186 | * Shared data structures | 186 | * Shared data structures |
187 | */ | 187 | */ |
188 | extern struct platform_device spitzscoop_device; | ||
189 | extern struct platform_device spitzscoop2_device; | ||
190 | extern struct platform_device spitzssp_device; | 188 | extern struct platform_device spitzssp_device; |
191 | extern struct sharpsl_charger_machinfo spitz_pm_machinfo; | 189 | extern struct sharpsl_charger_machinfo spitz_pm_machinfo; |