github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

fix wrong commit 1852a72

Browse Source
This commit is contained in:
黄涛 2012-01-18 14:25:45 +08:00
parent 1852a726aa
commit 121fb4892d
3 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
arch/arm/mach-rk29/board-rk29-k97.c
View File

@ -416,40 +416,6 @@ struct platform_device rk29_device_dma_cpy = {
};
#endif
#ifdef CONFIG_ADC_RK29
static struct resource rk29_adc_resource[] = {
{
.start = IRQ_SARADC,
.end = IRQ_SARADC,
.flags = IORESOURCE_IRQ,
},
{
.start = RK29_ADC_PHYS,
.end = RK29_ADC_PHYS + RK29_ADC_SIZE - 1,
.flags = IORESOURCE_MEM,
},
};
struct platform_device rk29_device_adc = {
.name = "rk29-adc",
.id = -1,
.num_resources = ARRAY_SIZE(rk29_adc_resource),
.resource = rk29_adc_resource,
};
#endif
#ifdef CONFIG_BATTERY_RK29_ADC
struct platform_device rk29_adc_device_battery = {
.name = "rk2918-battery",
.id = -1,
.dev = {
.platform_data = &rk29_adc_battery_platdata,
},
};
#endif
#if defined(CONFIG_RK29_GPIO_SUSPEND)
static void key_gpio_pullupdown_enable(void)
@ -1107,7 +1073,7 @@ struct bq27510_platform_data bq27510_info = {
#endif
#ifdef CONFIG_BATTERY_RK29_ADC
struct rk29_adc_battery_platform_data rk29_adc_battery_platdata = {
static struct rk29_adc_battery_platform_data rk29_adc_battery_platdata = {
.dc_det_pin = RK29_PIN4_PA1,
.batt_low_pin = RK29_PIN4_PA2,
.charge_set_pin = INVALID_GPIO,
@ -1116,6 +1082,14 @@ struct rk29_adc_battery_platform_data rk29_adc_battery_platdata = {
.dc_det_level = GPIO_LOW,
.charge_ok_level = GPIO_HIGH,
};
static struct platform_device rk29_adc_device_battery = {
.name = "rk2918-battery",
.id = -1,
.dev = {
.platform_data = &rk29_adc_battery_platdata,
},
};
#endif
/*************************************PMU ACT8891****************************************/

21
arch/arm/mach-rk29/devices.c Executable file → Normal file
View File

@ -30,6 +30,27 @@
#include <mach/loader.h>
#include "devices.h"
#ifdef CONFIG_ADC_RK29
static struct resource rk29_adc_resource[] = {
{
.start = IRQ_SARADC,
.end = IRQ_SARADC,
.flags = IORESOURCE_IRQ,
},
{
.start = RK29_ADC_PHYS,
.end = RK29_ADC_PHYS + RK29_ADC_SIZE - 1,
.flags = IORESOURCE_MEM,
},
};
struct platform_device rk29_device_adc = {
.name = "rk29-adc",
.id = -1,
.num_resources = ARRAY_SIZE(rk29_adc_resource),
.resource = rk29_adc_resource,
};
#endif
#ifdef CONFIG_RK29_VMAC
static u64 eth_dmamask = DMA_BIT_MASK(32);

2
arch/arm/mach-rk29/devices.h Executable file → Normal file
View File

@ -63,8 +63,6 @@ extern struct rk29_sdmmc_platform_data default_sdmmc1_data;
extern struct platform_device rk29_device_sdmmc0;
extern struct platform_device rk29_device_sdmmc1;
extern struct platform_device rk29_device_adc;
extern struct platform_device rk29_adc_device_battery;
extern struct rk29_adc_battery_platform_data rk29_adc_battery_platdata;
extern struct platform_device rk29_device_vmac;
extern struct rk29_bl_info rk29_bl_info;
extern struct rk29_button_light_info rk29_button_light_info;