Commit 1dac5247 authored by Ian Campbell's avatar Ian Campbell Committed by Russell King

[ARM PATCH] 1954/2: Make pxa platform device names more sensible

Patch from Ian Campbell

Update 1954/1 to use pxa2xx- as the platform device prefix 
instead of pxa2xx_. This changes pxamci to pxa2xx-mci, pxa2xx_udc 
to pxa2xx-udc and pxafb to pxa2xx-fb. pxa2xx-uart doesn't need changing.
parent 496bf4b8
...@@ -118,7 +118,7 @@ static struct resource pxamci_resources[] = { ...@@ -118,7 +118,7 @@ static struct resource pxamci_resources[] = {
static u64 pxamci_dmamask = 0xffffffffUL; static u64 pxamci_dmamask = 0xffffffffUL;
static struct platform_device pxamci_device = { static struct platform_device pxamci_device = {
.name = "pxamci", .name = "pxa2xx-mci",
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &pxamci_dmamask, .dma_mask = &pxamci_dmamask,
...@@ -153,7 +153,7 @@ static struct resource pxa2xx_udc_resources[] = { ...@@ -153,7 +153,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 = { static struct platform_device udc_device = {
.name = "pxa2xx_udc", .name = "pxa2xx-udc",
.id = -1, .id = -1,
.resource = pxa2xx_udc_resources, .resource = pxa2xx_udc_resources,
.num_resources = ARRAY_SIZE(pxa2xx_udc_resources), .num_resources = ARRAY_SIZE(pxa2xx_udc_resources),
...@@ -187,7 +187,7 @@ static struct resource pxafb_resources[] = { ...@@ -187,7 +187,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 = { static struct platform_device pxafb_device = {
.name = "pxafb", .name = "pxa2xx-fb",
.id = -1, .id = -1,
.dev = { .dev = {
.platform_data = &pxa_fb_info, .platform_data = &pxa_fb_info,
......
...@@ -2539,7 +2539,7 @@ static int __exit pxa2xx_udc_remove(struct device *_dev) ...@@ -2539,7 +2539,7 @@ static int __exit pxa2xx_udc_remove(struct device *_dev)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static struct device_driver udc_driver = { static struct device_driver udc_driver = {
.name = (char *) driver_name, .name = "pxa2xx-udc",
.bus = &platform_bus_type, .bus = &platform_bus_type,
.probe = pxa2xx_udc_probe, .probe = pxa2xx_udc_probe,
.remove = __exit_p(pxa2xx_udc_remove), .remove = __exit_p(pxa2xx_udc_remove),
......
...@@ -1350,7 +1350,7 @@ int __init pxafb_probe(struct device *dev) ...@@ -1350,7 +1350,7 @@ int __init pxafb_probe(struct device *dev)
} }
static struct device_driver pxafb_driver = { static struct device_driver pxafb_driver = {
.name = "pxafb", .name = "pxa2xx-fb",
.bus = &platform_bus_type, .bus = &platform_bus_type,
.probe = pxafb_probe, .probe = pxafb_probe,
#ifdef CONFIG_PM #ifdef CONFIG_PM
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment