UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[ARM] pxa: removing dead CORGI_SSP_DEPRECATED 

CORGI_SSP_DEPRECATED doesn't exist in Kconfig, therefore removing all
references for it from the source code.

Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Acked-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
This commit is contained in:
Christoph Egger 2010-07-04 23:28:23 +08:00 committed by Eric Miao
parent 8ae807c581
commit 556a460e5d
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-pxa/Kconfig
View File

@ -682,7 +682,6 @@ config SHARPSL_PM
config SHARPSL_PM_MAX1111 config SHARPSL_PM_MAX1111
bool bool
depends on !CORGI_SSP_DEPRECATED
select HWMON select HWMON
select SENSORS_MAX1111 select SENSORS_MAX1111

5
arch/arm/mach-pxa/sharpsl_pm.c
View File

@ -180,17 +180,12 @@ int sharpsl_pm_pxa_read_max1111(int channel)
if (machine_is_tosa()) if (machine_is_tosa())
return 0; return 0;
#ifdef CONFIG_CORGI_SSP_DEPRECATED
return corgi_ssp_max1111_get((channel << MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1
| MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);
#else
extern int max1111_read_channel(int); extern int max1111_read_channel(int);
/* max1111 accepts channels from 0-3, however, /* max1111 accepts channels from 0-3, however,
* it is encoded from 0-7 here in the code. * it is encoded from 0-7 here in the code.
*/ */
return max1111_read_channel(channel >> 1); return max1111_read_channel(channel >> 1);
#endif
} }
static int get_percentage(int voltage) static int get_percentage(int voltage)