Skip to content

Commit 2b8b279

Browse files
gclementJason Cooper
authored andcommitted
ARM: plat-orion: Fix num_resources and id for ge10 and ge11
When platform data were moved from arch/arm/mach-mv78xx0/common.c to arch/arm/plat-orion/common.c with the commit "7e3819d ARM: orion: Consolidate ethernet platform data", there were few typo made on gigabit Ethernet interface ge10 and ge11. This commit writes back their initial value, which allows to use this interfaces again. Signed-off-by: Gregory CLEMENT <[email protected]> Acked-by: Andrew Lunn <[email protected]> Cc: <[email protected]> # v3.0.x Signed-off-by: Jason Cooper <[email protected]>
1 parent 8eed481 commit 2b8b279

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

arch/arm/plat-orion/common.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ static struct resource orion_ge10_shared_resources[] = {
383383

384384
static struct platform_device orion_ge10_shared = {
385385
.name = MV643XX_ETH_SHARED_NAME,
386-
.id = 1,
386+
.id = 2,
387387
.dev = {
388388
.platform_data = &orion_ge10_shared_data,
389389
},
@@ -398,8 +398,8 @@ static struct resource orion_ge10_resources[] = {
398398

399399
static struct platform_device orion_ge10 = {
400400
.name = MV643XX_ETH_NAME,
401-
.id = 1,
402-
.num_resources = 2,
401+
.id = 2,
402+
.num_resources = 1,
403403
.resource = orion_ge10_resources,
404404
.dev = {
405405
.coherent_dma_mask = DMA_BIT_MASK(32),
@@ -432,7 +432,7 @@ static struct resource orion_ge11_shared_resources[] = {
432432

433433
static struct platform_device orion_ge11_shared = {
434434
.name = MV643XX_ETH_SHARED_NAME,
435-
.id = 1,
435+
.id = 3,
436436
.dev = {
437437
.platform_data = &orion_ge11_shared_data,
438438
},
@@ -447,8 +447,8 @@ static struct resource orion_ge11_resources[] = {
447447

448448
static struct platform_device orion_ge11 = {
449449
.name = MV643XX_ETH_NAME,
450-
.id = 1,
451-
.num_resources = 2,
450+
.id = 3,
451+
.num_resources = 1,
452452
.resource = orion_ge11_resources,
453453
.dev = {
454454
.coherent_dma_mask = DMA_BIT_MASK(32),

0 commit comments

Comments
 (0)