diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-09-03 02:50:23 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-09-23 17:04:37 -0400 |
commit | 68677ab3d08ed6d57be0c1ae4e4d364bb2d104b6 (patch) | |
tree | ff47fc2af665fd1f86cb0dd84c42bf5c85b15aec /arch/arm/mach-pxa/sharpsl_pm.c | |
parent | 859b796349d2073bd58e55d176e03b2d53cb8c36 (diff) |
[ARM] pxa/corgi: remove now unused corgi_ssp.c and corgi_lcd.c
Now poodle/corgi/spitz have been been converted to use SPI-based
drivers, remove the now unused corgi_ssp.c and corgi_lcd.c. And
as well as the unused reference of {corgi,spitz}ssp_device.
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/sharpsl_pm.c')
-rw-r--r-- | arch/arm/mach-pxa/sharpsl_pm.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c index 9427d8088395..15c2f1a8623b 100644 --- a/arch/arm/mach-pxa/sharpsl_pm.c +++ b/arch/arm/mach-pxa/sharpsl_pm.c | |||
@@ -116,33 +116,20 @@ struct battery_thresh spitz_battery_levels_noac[] = { | |||
116 | { 0, 0}, | 116 | { 0, 0}, |
117 | }; | 117 | }; |
118 | 118 | ||
119 | /* MAX1111 Commands */ | ||
120 | #define MAXCTRL_PD0 1u << 0 | ||
121 | #define MAXCTRL_PD1 1u << 1 | ||
122 | #define MAXCTRL_SGL 1u << 2 | ||
123 | #define MAXCTRL_UNI 1u << 3 | ||
124 | #define MAXCTRL_SEL_SH 4 | ||
125 | #define MAXCTRL_STR 1u << 7 | ||
126 | |||
127 | /* | 119 | /* |
128 | * Read MAX1111 ADC | 120 | * Read MAX1111 ADC |
129 | */ | 121 | */ |
122 | extern int max1111_read_channel(int); | ||
123 | |||
130 | int sharpsl_pm_pxa_read_max1111(int channel) | 124 | int sharpsl_pm_pxa_read_max1111(int channel) |
131 | { | 125 | { |
132 | if (machine_is_tosa()) // Ugly, better move this function into another module | 126 | if (machine_is_tosa()) // Ugly, better move this function into another module |
133 | return 0; | 127 | return 0; |
134 | 128 | ||
135 | #ifdef CONFIG_SENSORS_MAX1111 | ||
136 | extern int max1111_read_channel(int); | ||
137 | |||
138 | /* max1111 accepts channels from 0-3, however, | 129 | /* max1111 accepts channels from 0-3, however, |
139 | * it is encoded from 0-7 here in the code. | 130 | * it is encoded from 0-7 here in the code. |
140 | */ | 131 | */ |
141 | return max1111_read_channel(channel >> 1); | 132 | return max1111_read_channel(channel >> 1); |
142 | #else | ||
143 | return corgi_ssp_max1111_get((channel << MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1 | ||
144 | | MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR); | ||
145 | #endif | ||
146 | } | 133 | } |
147 | 134 | ||
148 | void sharpsl_pm_pxa_init(void) | 135 | void sharpsl_pm_pxa_init(void) |