Commit 04e4ad23 authored by Eric Miao's avatar Eric Miao
Browse files

[ARM] pxa: removed mostly unused and confusing two sharpsl.h 



Only a small part of used code is moved into sharpsl_pm.h.

Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 05732d7e

arch/arm/mach-pxa/corgi.c

+1 −2
Original line number Diff line number Diff line
@@ -50,14 +50,13 @@ 
#include <mach/udc.h>

#include <mach/pxa2xx_spi.h>

#include <mach/corgi.h>

#include <mach/sharpsl.h>

#include <mach/sharpsl_pm.h>



#include <asm/mach/sharpsl_param.h>

#include <asm/hardware/scoop.h>



#include "generic.h"

#include "devices.h"

#include "sharpsl.h"



static unsigned long corgi_pin_config[] __initdata = {

	/* Static Memory I/O */

arch/arm/mach-pxa/corgi_pm.c

+1 −2
Original line number Diff line number Diff line
@@ -23,12 +23,11 @@ 
#include <asm/mach-types.h>

#include <mach/hardware.h>



#include <mach/sharpsl.h>

#include <mach/corgi.h>

#include <mach/pxa2xx-regs.h>

#include <mach/sharpsl_pm.h>



#include "generic.h"

#include "sharpsl.h"



#define SHARPSL_CHARGE_ON_VOLT         0x99  /* 2.9V */

#define SHARPSL_CHARGE_ON_TEMP         0xe0  /* 2.9V */

arch/arm/mach-pxa/include/mach/sharpsl.h

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
/*

 * SharpSL SSP Driver

 */



unsigned long corgi_ssp_ads7846_putget(unsigned long);

unsigned long corgi_ssp_ads7846_get(void);

void corgi_ssp_ads7846_put(unsigned long data);

void corgi_ssp_ads7846_lock(void);

void corgi_ssp_ads7846_unlock(void);

void corgi_ssp_lcdtg_send (unsigned char adrs, unsigned char data);

void corgi_ssp_blduty_set(int duty);

int corgi_ssp_max1111_get(unsigned long data);



/*

 * SharpSL Touchscreen Driver

 */



struct corgits_machinfo {

	unsigned long (*get_hsync_invperiod)(void);

	void (*put_hsync)(void);

	void (*wait_hsync)(void);

};





/*

 * SharpSL Backlight

 */

extern void corgibl_limit_intensity(int limit);

extern void corgi_lcd_limit_intensity(int limit);





/*

 * SharpSL Battery/PM Driver

 */

extern void sharpsl_battery_kick(void);

arch/arm/mach-pxa/include/mach/sharpsl_pm.h

+9 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ struct sharpsl_pm_status { 


extern struct sharpsl_pm_status sharpsl_pm;



extern struct battery_thresh sharpsl_battery_levels_acin[];

extern struct battery_thresh sharpsl_battery_levels_noac[];



#define SHARPSL_LED_ERROR  2

#define SHARPSL_LED_ON     1
@@ -101,4 +103,11 @@ extern struct sharpsl_pm_status sharpsl_pm; 
void sharpsl_battery_kick(void);

void sharpsl_pm_led(int val);



/* MAX1111 Channel Definitions */

#define MAX1111_BATT_VOLT   4u

#define MAX1111_BATT_TEMP   2u

#define MAX1111_ACIN_VOLT   6u

int sharpsl_pm_pxa_read_max1111(int channel);



void corgi_lcd_limit_intensity(int limit);

#endif

arch/arm/mach-pxa/poodle.c

+0 −2
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include <mach/irda.h>

#include <mach/poodle.h>

#include <mach/pxafb.h>

#include <mach/sharpsl.h>

#include <mach/pxa2xx_spi.h>

#include <plat/i2c.h>
@@ -53,7 +52,6 @@ 


#include "generic.h"

#include "devices.h"

#include "sharpsl.h"



static unsigned long poodle_pin_config[] __initdata = {

	/* I/O */