Commit 93ab63ad authored by Ian Campbell's avatar Ian Campbell Committed by Russell King

[ARM PATCH] 1953/1: Omit id for platform devices where only one can possibly exist.

Patch from Ian Campbell

Now that the BK tree allows platform devices to specify an id of -1
to get rid of the numbered suffix. 

Following discussion on the l-a-k mailing list here is patch to do 
this for the pxafb, pxa2xx-udc and pxamci generic PXA2xx platform 
devices and the platform devices on the Lubbock.
parent 8f976736
...@@ -119,7 +119,7 @@ static u64 pxamci_dmamask = 0xffffffffUL; ...@@ -119,7 +119,7 @@ static u64 pxamci_dmamask = 0xffffffffUL;
static struct platform_device pxamci_device = { static struct platform_device pxamci_device = {
.name = "pxamci", .name = "pxamci",
.id = 0, .id = -1,
.dev = { .dev = {
.dma_mask = &pxamci_dmamask, .dma_mask = &pxamci_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = 0xffffffff,
...@@ -154,7 +154,7 @@ static u64 udc_dma_mask = ~(u32)0; ...@@ -154,7 +154,7 @@ 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 = 0, .id = -1,
.resource = pxa2xx_udc_resources, .resource = pxa2xx_udc_resources,
.num_resources = ARRAY_SIZE(pxa2xx_udc_resources), .num_resources = ARRAY_SIZE(pxa2xx_udc_resources),
.dev = { .dev = {
...@@ -188,7 +188,7 @@ static u64 fb_dma_mask = ~(u64)0; ...@@ -188,7 +188,7 @@ static u64 fb_dma_mask = ~(u64)0;
static struct platform_device pxafb_device = { static struct platform_device pxafb_device = {
.name = "pxafb", .name = "pxafb",
.id = 0, .id = -1,
.dev = { .dev = {
.platform_data = &pxa_fb_info, .platform_data = &pxa_fb_info,
.dma_mask = &fb_dma_mask, .dma_mask = &fb_dma_mask,
......
...@@ -126,7 +126,7 @@ static struct resource sa1111_resources[] = { ...@@ -126,7 +126,7 @@ static struct resource sa1111_resources[] = {
static struct platform_device sa1111_device = { static struct platform_device sa1111_device = {
.name = "sa1111", .name = "sa1111",
.id = 0, .id = -1,
.num_resources = ARRAY_SIZE(sa1111_resources), .num_resources = ARRAY_SIZE(sa1111_resources),
.resource = sa1111_resources, .resource = sa1111_resources,
}; };
...@@ -151,7 +151,7 @@ static struct resource smc91x_resources[] = { ...@@ -151,7 +151,7 @@ static struct resource smc91x_resources[] = {
static struct platform_device smc91x_device = { static struct platform_device smc91x_device = {
.name = "smc91x", .name = "smc91x",
.id = 0, .id = -1,
.num_resources = ARRAY_SIZE(smc91x_resources), .num_resources = ARRAY_SIZE(smc91x_resources),
.resource = smc91x_resources, .resource = smc91x_resources,
}; };
......
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