forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

move adc battery platform data from devices.c to board-rk29-k97.c

Browse source
This commit is contained in:
yanXiaoJun 2012-01-18 13:47:12 +08:00
commit 1852a726aa
2 changed files with 34 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

34
arch/arm/mach-rk29/board-rk29-k97.c
View file

@ -416,6 +416,40 @@ 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)

31
arch/arm/mach-rk29/devices.c
View file

@ -29,39 +29,8 @@
#include <mach/board.h>
#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_BATTERY_RK29_ADC
struct platform_device rk29_adc_device_battery = {
.name = "rk2918-battery",
.id = -1,
.dev = {
.platform_data = &rk29_adc_battery_platdata,
},
};
#endif
#ifdef CONFIG_RK29_VMAC
static u64 eth_dmamask = DMA_BIT_MASK(32);
static struct resource rk29_vmac_resource[] = {