提交 5dbc80f6 编写于 作者: R Russell King 提交者: Russell King
...@@ -1141,12 +1141,16 @@ struct power_supply_info em_x270_psy_info = { ...@@ -1141,12 +1141,16 @@ struct power_supply_info em_x270_psy_info = {
static void em_x270_battery_low(void) static void em_x270_battery_low(void)
{ {
#if defined(CONFIG_APM_EMULATION)
apm_queue_event(APM_LOW_BATTERY); apm_queue_event(APM_LOW_BATTERY);
#endif
} }
static void em_x270_battery_critical(void) static void em_x270_battery_critical(void)
{ {
#if defined(CONFIG_APM_EMULATION)
apm_queue_event(APM_CRITICAL_SUSPEND); apm_queue_event(APM_CRITICAL_SUSPEND);
#endif
} }
struct da9030_battery_info em_x270_batterty_info = { struct da9030_battery_info em_x270_batterty_info = {
......
...@@ -128,6 +128,10 @@ static unsigned long palmld_pin_config[] __initdata = { ...@@ -128,6 +128,10 @@ static unsigned long palmld_pin_config[] __initdata = {
GPIO38_GPIO, /* wifi ready */ GPIO38_GPIO, /* wifi ready */
GPIO81_GPIO, /* wifi reset */ GPIO81_GPIO, /* wifi reset */
/* FFUART */
GPIO34_FFUART_RXD,
GPIO39_FFUART_TXD,
/* HDD */ /* HDD */
GPIO98_GPIO, /* HDD reset */ GPIO98_GPIO, /* HDD reset */
GPIO115_GPIO, /* HDD power */ GPIO115_GPIO, /* HDD power */
......
...@@ -111,6 +111,10 @@ static unsigned long palmt5_pin_config[] __initdata = { ...@@ -111,6 +111,10 @@ static unsigned long palmt5_pin_config[] __initdata = {
/* PWM */ /* PWM */
GPIO16_PWM0_OUT, GPIO16_PWM0_OUT,
/* FFUART */
GPIO34_FFUART_RXD,
GPIO39_FFUART_TXD,
/* MISC */ /* MISC */
GPIO10_GPIO, /* hotsync button */ GPIO10_GPIO, /* hotsync button */
GPIO90_GPIO, /* power detect */ GPIO90_GPIO, /* power detect */
......
...@@ -127,6 +127,10 @@ static unsigned long palmtx_pin_config[] __initdata = { ...@@ -127,6 +127,10 @@ static unsigned long palmtx_pin_config[] __initdata = {
GPIO76_LCD_PCLK, GPIO76_LCD_PCLK,
GPIO77_LCD_BIAS, GPIO77_LCD_BIAS,
/* FFUART */
GPIO34_FFUART_RXD,
GPIO39_FFUART_TXD,
/* MISC. */ /* MISC. */
GPIO10_GPIO, /* hotsync button */ GPIO10_GPIO, /* hotsync button */
GPIO12_GPIO, /* power detect */ GPIO12_GPIO, /* power detect */
......
...@@ -197,10 +197,12 @@ static void __init zylonite_detect_lcd_panel(void) ...@@ -197,10 +197,12 @@ static void __init zylonite_detect_lcd_panel(void)
for (i = 0; i < NUM_LCD_DETECT_PINS; i++) { for (i = 0; i < NUM_LCD_DETECT_PINS; i++) {
id = id << 1; id = id << 1;
gpio = mfp_to_gpio(lcd_detect_pins[i]); gpio = mfp_to_gpio(lcd_detect_pins[i]);
gpio_request(gpio, "LCD_ID_PINS");
gpio_direction_input(gpio); gpio_direction_input(gpio);
if (gpio_get_value(gpio)) if (gpio_get_value(gpio))
id = id | 0x1; id = id | 0x1;
gpio_free(gpio);
} }
/* lcd id, flush out bit 1 */ /* lcd id, flush out bit 1 */
......
...@@ -176,10 +176,12 @@ static void __init zylonite_detect_lcd_panel(void) ...@@ -176,10 +176,12 @@ static void __init zylonite_detect_lcd_panel(void)
for (i = 0; i < NUM_LCD_DETECT_PINS; i++) { for (i = 0; i < NUM_LCD_DETECT_PINS; i++) {
id = id << 1; id = id << 1;
gpio = mfp_to_gpio(lcd_detect_pins[i]); gpio = mfp_to_gpio(lcd_detect_pins[i]);
gpio_request(gpio, "LCD_ID_PINS");
gpio_direction_input(gpio); gpio_direction_input(gpio);
if (gpio_get_value(gpio)) if (gpio_get_value(gpio))
id = id | 0x1; id = id | 0x1;
gpio_free(gpio);
} }
/* lcd id, flush out bit 1 */ /* lcd id, flush out bit 1 */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册