starred/linux-legacy
1
0
Fork 0
mirror of https://github.com/genesi/linux-legacy.git synced 2026-09-22 22:56:06 +00:00
Code Issues 2 Packages Projects Releases Wiki Activity

lcd platform data member name change

Browse Source
This commit is contained in:
Matt Sealey
2011-02-17 17:06:01 -06:00
parent 8bd1f3b92f
commit d5ee5344f1
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/plat-mxc/include/mach/mxc.h
View File

@@ -336,8 +336,8 @@ struct mxc_lcd_platform_data {
char *analog_reg;
/* Efika MX Additions */
void (*power_on_lcd) (int);
void (*power_on_lvds) (int);
void (*lcd_power) (int);
void (*lvds_power) (int);
void (*lvds_enable) (int);
void (*reset) (void);

32
drivers/video/mxc/mxcfb_mtl017.c
View File

@@ -57,8 +57,8 @@ typedef struct mtl017_dev_data_tag {
struct semaphore sem;
void (*reset)(void);
void (*power_on_lcd) (int);
void (*power_on_lvds) (int);
void (*lcd_power) (int);
void (*lvds_power) (int);
void (*lvds_enable) (int);
} mtl017_dev_data;
@@ -685,14 +685,10 @@ static int __devinit mtl017_probe(struct i2c_client *client, const struct i2c_de
mtl017->suspending = 0;
mtl017->client = client;
if(plat) {
mtl017->reset =
plat->reset;
mtl017->power_on_lcd =
plat->power_on_lcd;
mtl017->power_on_lvds =
plat->power_on_lvds;
mtl017->lvds_enable =
plat->lvds_enable;
mtl017->reset = plat->reset;
mtl017->lcd_power = plat->lcd_power;
mtl017->lvds_power = plat->lvds_power;
mtl017->lvds_enable = plat->lvds_enable;
}
/* mtl017->lock = SPIN_LOCK_UNLOCKED; */
@@ -778,8 +774,8 @@ static void disp_power_on(void)
if (down_interruptible(&mtl017->sem))
return;
if(mtl017->power_on_lcd) {
mtl017->power_on_lcd(1);
if(mtl017->lcd_power) {
mtl017->lcd_power(1);
msleep(10);
}
@@ -788,8 +784,8 @@ static void disp_power_on(void)
msleep(5);
}
if(mtl017->power_on_lvds) {
mtl017->power_on_lvds(1);
if(mtl017->lvds_power) {
mtl017->lvds_power(1);
msleep(5);
}
@@ -815,13 +811,13 @@ static void disp_power_off(void)
mtl017->lvds_enable(0);
}
if(mtl017->power_on_lvds) {
mtl017->power_on_lvds(0);
if(mtl017->lvds_power) {
mtl017->lvds_power(0);
msleep(5);
}
if(mtl017->power_on_lcd) {
mtl017->power_on_lcd(0);
if(mtl017->lcd_power) {
mtl017->lcd_power(0);
}
mtl017->disp_on = 0;