ARM: plat-orion: Fix num_resources and id for ge10 and ge11
PATCH 1/1 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.
--- arch/arm/plat-orion/common.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/plat-orion/common.c +6 -6
@@ -383,7 +383,7 @@ static struct resource orion_ge10_shared_resources[] = {static struct platform_device orion_ge10_shared = { .name =MV643XX_ETH_SHARED_NAME , - .id =1 , + .id =2 , .dev = { .platform_data = &orion_ge10_shared_data, },
@@ -398,8 +398,8 @@ static struct resource orion_ge10_resources[] = {static struct platform_device orion_ge10 = { .name =MV643XX_ETH_NAME , - .id =1 , - .num_resources =2 , + .id =2 , + .num_resources =1 , .resource = orion_ge10_resources, .dev = { .coherent_dma_mask =DMA_BIT_MASK (32 ),
@@ -432,7 +432,7 @@ static struct resource orion_ge11_shared_resources[] = {static struct platform_device orion_ge11_shared = { .name =MV643XX_ETH_SHARED_NAME , - .id =1 , + .id =3 , .dev = { .platform_data = &orion_ge11_shared_data, },
@@ -447,8 +447,8 @@ static struct resource orion_ge11_resources[] = {static struct platform_device orion_ge11 = { .name =MV643XX_ETH_NAME , - .id =1 , - .num_resources =2 , + .id =3 , + .num_resources =1 , .resource = orion_ge11_resources, .dev = { .coherent_dma_mask =DMA_BIT_MASK (32 ),
Signature · 1 line
1.8.1.2
Andrew Lunn
maintainerPATCH 1/1 ARM: plat-orion: Fix num_resources and id for ge10 and ge11
Quoted 58 lines · Gregory CLEMENT
When platform data were moved from
arch/arm/mach-mv78xx0/common.ctoarch/arm/plat-orion/common.cwith 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]>--- arch/arm/plat-orion/common.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/arm/plat-orion/common.c +6
-6@@ -383,7 +383,7 @@ static struct resource orion_ge10_shared_resources[] = {static struct platform_device orion_ge10_shared = { .name =MV643XX_ETH_SHARED_NAME , - .id =1 , + .id =2 , .dev = { .platform_data = &orion_ge10_shared_data, },@@ -398,8 +398,8 @@ static struct resource orion_ge10_resources[] = {static struct platform_device orion_ge10 = { .name =MV643XX_ETH_NAME , - .id =1 , - .num_resources =2 , + .id =2 , + .num_resources =1 , .resource = orion_ge10_resources, .dev = { .coherent_dma_mask =DMA_BIT_MASK (32 ),@@ -432,7 +432,7 @@ static struct resource orion_ge11_shared_resources[] = {static struct platform_device orion_ge11_shared = { .name =MV643XX_ETH_SHARED_NAME , - .id =1 , + .id =3 , .dev = { .platform_data = &orion_ge11_shared_data, },@@ -447,8 +447,8 @@ static struct resource orion_ge11_resources[] = {static struct platform_device orion_ge11 = { .name =MV643XX_ETH_NAME , - .id =1 , - .num_resources =2 , + .id =3 , + .num_resources =1 , .resource = orion_ge11_resources, .dev = { .coherent_dma_mask =DMA_BIT_MASK (32 ),Signature · 1 line
1.8.1.2
Hi Gregory
My Bad. Thanks for fixing this.
Jason, this can go into stable, as far back as 3.0.
Andrew
PATCH 1/1 ARM: plat-orion: Fix num_resources and id for ge10 and ge11
Quoted 62 lines · Andrew Lunn
Quoted 58 lines · Gregory CLEMENT
When platform data were moved from
arch/arm/mach-mv78xx0/common.ctoarch/arm/plat-orion/common.cwith 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]>--- arch/arm/plat-orion/common.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/arm/plat-orion/common.c +6
-6@@ -383,7 +383,7 @@ static struct resource orion_ge10_shared_resources[] = {static struct platform_device orion_ge10_shared = { .name =MV643XX_ETH_SHARED_NAME , - .id =1 , + .id =2 , .dev = { .platform_data = &orion_ge10_shared_data, },@@ -398,8 +398,8 @@ static struct resource orion_ge10_resources[] = {static struct platform_device orion_ge10 = { .name =MV643XX_ETH_NAME , - .id =1 , - .num_resources =2 , + .id =2 , + .num_resources =1 , .resource = orion_ge10_resources, .dev = { .coherent_dma_mask =DMA_BIT_MASK (32 ),@@ -432,7 +432,7 @@ static struct resource orion_ge11_shared_resources[] = {static struct platform_device orion_ge11_shared = { .name =MV643XX_ETH_SHARED_NAME , - .id =1 , + .id =3 , .dev = { .platform_data = &orion_ge11_shared_data, },@@ -447,8 +447,8 @@ static struct resource orion_ge11_resources[] = {static struct platform_device orion_ge11 = { .name =MV643XX_ETH_NAME , - .id =1 , - .num_resources =2 , + .id =3 , + .num_resources =1 , .resource = orion_ge11_resources, .dev = { .coherent_dma_mask =DMA_BIT_MASK (32 ),Signature · 1 line
1.8.1.2Hi Gregory
Quoted 5 lines
My Bad. Thanks for fixing this.
Acked-by Andrew Lunn <[email protected]>Jason, this can go into stable, as far back as 3.0.
Ok, thanks for the heads up. I'll wait for v2 (with rmk's suggestion) and tag it for stable.
thx,
Jason.
Andrew Lunn
maintainerPATCH 1/1 ARM: plat-orion: Fix num_resources and id for ge10 and ge11
Quoted 63 lines · Jason Cooper
Quoted 62 lines · Andrew Lunn
Quoted 58 lines · Gregory CLEMENT
When platform data were moved from
arch/arm/mach-mv78xx0/common.ctoarch/arm/plat-orion/common.cwith 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]>--- arch/arm/plat-orion/common.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/arm/plat-orion/common.c +6
-6@@ -383,7 +383,7 @@ static struct resource orion_ge10_shared_resources[] = {static struct platform_device orion_ge10_shared = { .name =MV643XX_ETH_SHARED_NAME , - .id =1 , + .id =2 , .dev = { .platform_data = &orion_ge10_shared_data, },@@ -398,8 +398,8 @@ static struct resource orion_ge10_resources[] = {static struct platform_device orion_ge10 = { .name =MV643XX_ETH_NAME , - .id =1 , - .num_resources =2 , + .id =2 , + .num_resources =1 , .resource = orion_ge10_resources, .dev = { .coherent_dma_mask =DMA_BIT_MASK (32 ),@@ -432,7 +432,7 @@ static struct resource orion_ge11_shared_resources[] = {static struct platform_device orion_ge11_shared = { .name =MV643XX_ETH_SHARED_NAME , - .id =1 , + .id =3 , .dev = { .platform_data = &orion_ge11_shared_data, },@@ -447,8 +447,8 @@ static struct resource orion_ge11_resources[] = {static struct platform_device orion_ge11 = { .name =MV643XX_ETH_NAME , - .id =1 , - .num_resources =2 , + .id =3 , + .num_resources =1 , .resource = orion_ge11_resources, .dev = { .coherent_dma_mask =DMA_BIT_MASK (32 ),Signature · 1 line
1.8.1.2Hi Gregory
Quoted 8 lines
Quoted 5 lines
My Bad. Thanks for fixing this.
Acked-by Andrew Lunn <[email protected]>Jason, this can go into stable, as far back as 3.0.
Ok, thanks for the heads up. I'll wait for v2 (with rmk's suggestion) and tag it for stable.
Hi Jason
RMK suggestion would apply to the whole file, not just this one instance. As such, it would be a bigger patch going into -cleanup for the next merge window.
I suggest you take this patch as is for the next -rc and i can work on RMKs suggestion soon along with a couple of other cleanups.
Andrew
PATCH 1/1 ARM: plat-orion: Fix num_resources and id for ge10 and ge11
Quoted 73 lines · Andrew Lunn
Quoted 63 lines · Jason Cooper
Quoted 62 lines · Andrew Lunn
Quoted 58 lines · Gregory CLEMENT
When platform data were moved from
arch/arm/mach-mv78xx0/common.ctoarch/arm/plat-orion/common.cwith 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]>--- arch/arm/plat-orion/common.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/arm/plat-orion/common.c +6
-6@@ -383,7 +383,7 @@ static struct resource orion_ge10_shared_resources[] = {static struct platform_device orion_ge10_shared = { .name =MV643XX_ETH_SHARED_NAME , - .id =1 , + .id =2 , .dev = { .platform_data = &orion_ge10_shared_data, },@@ -398,8 +398,8 @@ static struct resource orion_ge10_resources[] = {static struct platform_device orion_ge10 = { .name =MV643XX_ETH_NAME , - .id =1 , - .num_resources =2 , + .id =2 , + .num_resources =1 , .resource = orion_ge10_resources, .dev = { .coherent_dma_mask =DMA_BIT_MASK (32 ),@@ -432,7 +432,7 @@ static struct resource orion_ge11_shared_resources[] = {static struct platform_device orion_ge11_shared = { .name =MV643XX_ETH_SHARED_NAME , - .id =1 , + .id =3 , .dev = { .platform_data = &orion_ge11_shared_data, },@@ -447,8 +447,8 @@ static struct resource orion_ge11_resources[] = {static struct platform_device orion_ge11 = { .name =MV643XX_ETH_NAME , - .id =1 , - .num_resources =2 , + .id =3 , + .num_resources =1 , .resource = orion_ge11_resources, .dev = { .coherent_dma_mask =DMA_BIT_MASK (32 ),Signature · 1 line
1.8.1.2Hi Gregory
Quoted 8 lines
Quoted 5 lines
My Bad. Thanks for fixing this.
Acked-by Andrew Lunn <[email protected]>Jason, this can go into stable, as far back as 3.0.
Ok, thanks for the heads up. I'll wait for v2 (with rmk's suggestion) and tag it for stable.
Quoted 8 lines
Hi Jason
RMK suggestion would apply to the whole file, not just this one instance. As such, it would be a bigger patch going into -cleanup for the next merge window.
I suggest you take this patch as is for the next -rc and i can work on RMKs suggestion soon along with a couple of other cleanups.
ok, sounds good. I'll queue it up for the next /fixes PR.
thx,
Jason.
PATCH 1/1 ARM: plat-orion: Fix num_resources and id for ge10 and ge11
In reply to Gregory CLEMENTarch/arm/plat-orion/common.c static struct resource orion_ge10_resources[] = { · line 402
Quoted 6 lines · Gregory CLEMENT
static struct
platform_deviceorion_ge10= {arch/arm/plat-orion/common.c +2
-2.name = MV643XX_ETH_NAME, - .id = 1, - .num_resources = 2, + .id = 2, + .num_resources = 1,
Please consider using:
.num_resources = ARRAY_SIZE(orion_ge10_resources),
to help you avoid having the wrong number of resources specified.
Jason Cooper
AppliedPATCH 1/1 ARM: plat-orion: Fix num_resources and id for ge10 and ge11
In reply to Gregory CLEMENTQuoted 10 lines · Gregory CLEMENT
When platform data were moved from
arch/arm/mach-mv78xx0/common.ctoarch/arm/plat-orion/common.cwith 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]>--- arch/arm/plat-orion/common.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
Applied to mvebu/fixes and marked for stable back to v3.0.x
thx,
Jason.