redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[ARM] pxa: move device registration into CPU-specific file 

This allows individual CPU support to determine which platform
devices should be registered.  Also fix a copy-n-paste bug in
the I2C power platform device entry.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
hifive-unleashed-5.1
Russell King 2007-05-15 10:39:49 +01:00 committed by Russell King
parent 4adb70fc1b
commit 34f3231f43
4 changed files with 83 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
arch/arm/mach-pxa/generic.c
View File

@ -242,7 +242,7 @@ static struct resource pxamci_resources[] = {
static u64 pxamci_dmamask = 0xffffffffUL; static u64 pxamci_dmamask = 0xffffffffUL;
static struct platform_device pxamci_device = { struct platform_device pxamci_device = {
.name = "pxa2xx-mci", .name = "pxa2xx-mci",
.id = -1, .id = -1,
.dev = { .dev = {
@ -281,7 +281,7 @@ static struct resource pxa2xx_udc_resources[] = {
static u64 udc_dma_mask = ~(u32)0; static u64 udc_dma_mask = ~(u32)0;
static struct platform_device udc_device = { struct platform_device pxaudc_device = {
.name = "pxa2xx-udc", .name = "pxa2xx-udc",
.id = -1, .id = -1,
.resource = pxa2xx_udc_resources, .resource = pxa2xx_udc_resources,
@ -307,7 +307,7 @@ static struct resource pxafb_resources[] = {
static u64 fb_dma_mask = ~(u64)0; static u64 fb_dma_mask = ~(u64)0;
static struct platform_device pxafb_device = { struct platform_device pxafb_device = {
.name = "pxa2xx-fb", .name = "pxa2xx-fb",
.id = -1, .id = -1,
.dev = { .dev = {
@ -328,24 +328,24 @@ void __init set_pxa_fb_parent(struct device *parent_dev)
pxafb_device.dev.parent = parent_dev; pxafb_device.dev.parent = parent_dev;
} }
static struct platform_device ffuart_device = { struct platform_device ffuart_device = {
.name = "pxa2xx-uart", .name = "pxa2xx-uart",
.id = 0, .id = 0,
}; };
static struct platform_device btuart_device = { struct platform_device btuart_device = {
.name = "pxa2xx-uart", .name = "pxa2xx-uart",
.id = 1, .id = 1,
}; };
static struct platform_device stuart_device = { struct platform_device stuart_device = {
.name = "pxa2xx-uart", .name = "pxa2xx-uart",
.id = 2, .id = 2,
}; };
static struct platform_device hwuart_device = { struct platform_device hwuart_device = {
.name = "pxa2xx-uart", .name = "pxa2xx-uart",
.id = 3, .id = 3,
}; };
static struct resource i2c_resources[] = { static struct resource pxai2c_resources[] = {
{ {
.start = 0x40301680, .start = 0x40301680,
.end = 0x403016a3, .end = 0x403016a3,
@ -357,40 +357,19 @@ static struct resource i2c_resources[] = {
}, },
}; };
static struct platform_device i2c_device = { struct platform_device pxai2c_device = {
.name = "pxa2xx-i2c", .name = "pxa2xx-i2c",
.id = 0, .id = 0,
.resource = i2c_resources, .resource = pxai2c_resources,
.num_resources = ARRAY_SIZE(i2c_resources), .num_resources = ARRAY_SIZE(pxai2c_resources),
}; };
#ifdef CONFIG_PXA27x
static struct resource i2c_power_resources[] = {
{
.start = 0x40f00180,
.end = 0x40f001a3,
.flags = IORESOURCE_MEM,
}, {
.start = IRQ_PWRI2C,
.end = IRQ_PWRI2C,
.flags = IORESOURCE_IRQ,
},
};
static struct platform_device i2c_power_device = {
.name = "pxa2xx-i2c",
.id = 1,
.resource = i2c_power_resources,
.num_resources = ARRAY_SIZE(i2c_resources),
};
#endif
void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info) void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info)
{ {
i2c_device.dev.platform_data = info; pxai2c_device.dev.platform_data = info;
} }
static struct resource i2s_resources[] = { static struct resource pxai2s_resources[] = {
{ {
.start = 0x40400000, .start = 0x40400000,
.end = 0x40400083, .end = 0x40400083,
@ -402,16 +381,16 @@ static struct resource i2s_resources[] = {
}, },
}; };
static struct platform_device i2s_device = { struct platform_device pxai2s_device = {
.name = "pxa2xx-i2s", .name = "pxa2xx-i2s",
.id = -1, .id = -1,
.resource = i2s_resources, .resource = pxai2s_resources,
.num_resources = ARRAY_SIZE(i2s_resources), .num_resources = ARRAY_SIZE(pxai2s_resources),
}; };
static u64 pxaficp_dmamask = ~(u32)0; static u64 pxaficp_dmamask = ~(u32)0;
static struct platform_device pxaficp_device = { struct platform_device pxaficp_device = {
.name = "pxa2xx-ir", .name = "pxa2xx-ir",
.id = -1, .id = -1,
.dev = { .dev = {
@ -425,40 +404,7 @@ void __init pxa_set_ficp_info(struct pxaficp_platform_data *info)
pxaficp_device.dev.platform_data = info; pxaficp_device.dev.platform_data = info;
} }
static struct platform_device pxartc_device = { struct platform_device pxartc_device = {
.name = "sa1100-rtc", .name = "sa1100-rtc",
.id = -1, .id = -1,
}; };
static struct platform_device *devices[] __initdata = {
&pxamci_device,
&udc_device,
&pxafb_device,
&ffuart_device,
&btuart_device,
&stuart_device,
&pxaficp_device,
&i2c_device,
#ifdef CONFIG_PXA27x
&i2c_power_device,
#endif
&i2s_device,
&pxartc_device,
};
static int __init pxa_init(void)
{
int ret;
ret = platform_add_devices(devices, ARRAY_SIZE(devices));
if (ret)
return ret;
/* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */
if (cpu_is_pxa25x())
ret = platform_device_register(&hwuart_device);
return ret;
}
subsys_initcall(pxa_init);

11
arch/arm/mach-pxa/generic.h
View File

@ -26,3 +26,14 @@ extern unsigned int get_clk_frequency_khz(int info);
mi->bank[__nr].size = (__size), \ mi->bank[__nr].size = (__size), \
mi->bank[__nr].node = (((unsigned)(__start) - PHYS_OFFSET) >> 27) mi->bank[__nr].node = (((unsigned)(__start) - PHYS_OFFSET) >> 27)
extern struct platform_device pxamci_device;
extern struct platform_device pxaudc_device;
extern struct platform_device pxafb_device;
extern struct platform_device ffuart_device;
extern struct platform_device btuart_device;
extern struct platform_device stuart_device;
extern struct platform_device hwuart_device;
extern struct platform_device pxai2c_device;
extern struct platform_device pxai2s_device;
extern struct platform_device pxaficp_device;
extern struct platform_device pxartc_device;

22
arch/arm/mach-pxa/pxa25x.c
View File

@ -19,6 +19,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <asm/hardware.h> #include <asm/hardware.h>
@ -136,6 +137,19 @@ void __init pxa25x_init_irq(void)
pxa_init_irq_gpio(85); pxa_init_irq_gpio(85);
} }
static struct platform_device *pxa25x_devices[] __initdata = {
&pxamci_device,
&pxaudc_device,
&pxafb_device,
&ffuart_device,
&btuart_device,
&stuart_device,
&pxai2c_device,
&pxai2s_device,
&pxaficp_device,
&pxartc_device,
};
static int __init pxa25x_init(void) static int __init pxa25x_init(void)
{ {
int ret = 0; int ret = 0;
@ -146,8 +160,14 @@ static int __init pxa25x_init(void)
#ifdef CONFIG_PM #ifdef CONFIG_PM
pm_set_ops(&pxa25x_pm_ops); pm_set_ops(&pxa25x_pm_ops);
#endif #endif
ret = platform_add_devices(pxa25x_devices,
ARRAY_SIZE(pxa25x_devices));
} }
return 0; /* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */
if (cpu_is_pxa25x())
ret = platform_device_register(&hwuart_device);
return ret;
} }
subsys_initcall(pxa25x_init); subsys_initcall(pxa25x_init);

36
arch/arm/mach-pxa/pxa27x.c
View File

@ -184,7 +184,7 @@ static struct resource pxa27x_ohci_resources[] = {
}, },
}; };
static struct platform_device ohci_device = { static struct platform_device pxaohci_device = {
.name = "pxa27x-ohci", .name = "pxa27x-ohci",
.id = -1, .id = -1,
.dev = { .dev = {
@ -197,11 +197,41 @@ static struct platform_device ohci_device = {
void __init pxa_set_ohci_info(struct pxaohci_platform_data *info) void __init pxa_set_ohci_info(struct pxaohci_platform_data *info)
{ {
ohci_device.dev.platform_data = info; pxaohci_device.dev.platform_data = info;
} }
static struct resource i2c_power_resources[] = {
{
.start = 0x40f00180,
.end = 0x40f001a3,
.flags = IORESOURCE_MEM,
}, {
.start = IRQ_PWRI2C,
.end = IRQ_PWRI2C,
.flags = IORESOURCE_IRQ,
},
};
static struct platform_device pxai2c_power_device = {
.name = "pxa2xx-i2c",
.id = 1,
.resource = i2c_power_resources,
.num_resources = ARRAY_SIZE(i2c_power_resources),
};
static struct platform_device *devices[] __initdata = { static struct platform_device *devices[] __initdata = {
&ohci_device, &pxamci_device,
&pxaudc_device,
&pxafb_device,
&ffuart_device,
&btuart_device,
&stuart_device,
&pxai2c_device,
&pxai2c_power_device,
&pxai2s_device,
&pxaficp_device,
&pxartc_device,
&pxaohci_device,
}; };
void __init pxa27x_init_irq(void) void __init pxa27x_init_irq(void)