* [PATCH] ARM: plat-orion: Fix num_resources and id for ge10 and ge11
@ 2013-05-19 20:12 Gregory CLEMENT
2013-05-20 8:22 ` Andrew Lunn
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Gregory CLEMENT @ 2013-05-19 20:12 UTC (permalink / raw)
To: linux-arm-kernel
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 <gregory.clement@free-electrons.com>
---
arch/arm/plat-orion/common.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index 251f827..c019b7a 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -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),
--
1.8.1.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH] ARM: plat-orion: Fix num_resources and id for ge10 and ge11 2013-05-19 20:12 [PATCH] ARM: plat-orion: Fix num_resources and id for ge10 and ge11 Gregory CLEMENT @ 2013-05-20 8:22 ` Andrew Lunn 2013-05-20 17:13 ` Jason Cooper 2013-05-20 9:43 ` Russell King - ARM Linux 2013-05-20 17:44 ` Jason Cooper 2 siblings, 1 reply; 7+ messages in thread From: Andrew Lunn @ 2013-05-20 8:22 UTC (permalink / raw) To: linux-arm-kernel On Sun, May 19, 2013 at 10:12:43PM +0200, Gregory CLEMENT wrote: > 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 <gregory.clement@free-electrons.com> > --- > arch/arm/plat-orion/common.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c > index 251f827..c019b7a 100644 > --- a/arch/arm/plat-orion/common.c > +++ b/arch/arm/plat-orion/common.c > @@ -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), > -- > 1.8.1.2 > Hi Gregory My Bad. Thanks for fixing this. Acked-by: Andrew Lunn <andrew@lunn.ch> Jason, this can go into stable, as far back as 3.0. Andrew ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ARM: plat-orion: Fix num_resources and id for ge10 and ge11 2013-05-20 8:22 ` Andrew Lunn @ 2013-05-20 17:13 ` Jason Cooper 2013-05-20 17:24 ` Andrew Lunn 0 siblings, 1 reply; 7+ messages in thread From: Jason Cooper @ 2013-05-20 17:13 UTC (permalink / raw) To: linux-arm-kernel On Mon, May 20, 2013 at 10:22:05AM +0200, Andrew Lunn wrote: > On Sun, May 19, 2013 at 10:12:43PM +0200, Gregory CLEMENT wrote: > > 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 <gregory.clement@free-electrons.com> > > --- > > arch/arm/plat-orion/common.c | 12 ++++++------ > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c > > index 251f827..c019b7a 100644 > > --- a/arch/arm/plat-orion/common.c > > +++ b/arch/arm/plat-orion/common.c > > @@ -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), > > -- > > 1.8.1.2 > > > > Hi Gregory > > My Bad. Thanks for fixing this. > > Acked-by: Andrew Lunn <andrew@lunn.ch> > > 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. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ARM: plat-orion: Fix num_resources and id for ge10 and ge11 2013-05-20 17:13 ` Jason Cooper @ 2013-05-20 17:24 ` Andrew Lunn 2013-05-20 17:30 ` Jason Cooper 0 siblings, 1 reply; 7+ messages in thread From: Andrew Lunn @ 2013-05-20 17:24 UTC (permalink / raw) To: linux-arm-kernel On Mon, May 20, 2013 at 01:13:01PM -0400, Jason Cooper wrote: > On Mon, May 20, 2013 at 10:22:05AM +0200, Andrew Lunn wrote: > > On Sun, May 19, 2013 at 10:12:43PM +0200, Gregory CLEMENT wrote: > > > 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 <gregory.clement@free-electrons.com> > > > --- > > > arch/arm/plat-orion/common.c | 12 ++++++------ > > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > > > diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c > > > index 251f827..c019b7a 100644 > > > --- a/arch/arm/plat-orion/common.c > > > +++ b/arch/arm/plat-orion/common.c > > > @@ -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), > > > -- > > > 1.8.1.2 > > > > > > > Hi Gregory > > > > My Bad. Thanks for fixing this. > > > > Acked-by: Andrew Lunn <andrew@lunn.ch> > > > > 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ARM: plat-orion: Fix num_resources and id for ge10 and ge11 2013-05-20 17:24 ` Andrew Lunn @ 2013-05-20 17:30 ` Jason Cooper 0 siblings, 0 replies; 7+ messages in thread From: Jason Cooper @ 2013-05-20 17:30 UTC (permalink / raw) To: linux-arm-kernel On Mon, May 20, 2013 at 07:24:24PM +0200, Andrew Lunn wrote: > On Mon, May 20, 2013 at 01:13:01PM -0400, Jason Cooper wrote: > > On Mon, May 20, 2013 at 10:22:05AM +0200, Andrew Lunn wrote: > > > On Sun, May 19, 2013 at 10:12:43PM +0200, Gregory CLEMENT wrote: > > > > 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 <gregory.clement@free-electrons.com> > > > > --- > > > > arch/arm/plat-orion/common.c | 12 ++++++------ > > > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > > > > > diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c > > > > index 251f827..c019b7a 100644 > > > > --- a/arch/arm/plat-orion/common.c > > > > +++ b/arch/arm/plat-orion/common.c > > > > @@ -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), > > > > -- > > > > 1.8.1.2 > > > > > > > > > > Hi Gregory > > > > > > My Bad. Thanks for fixing this. > > > > > > Acked-by: Andrew Lunn <andrew@lunn.ch> > > > > > > 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. ok, sounds good. I'll queue it up for the next /fixes PR. thx, Jason. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ARM: plat-orion: Fix num_resources and id for ge10 and ge11 2013-05-19 20:12 [PATCH] ARM: plat-orion: Fix num_resources and id for ge10 and ge11 Gregory CLEMENT 2013-05-20 8:22 ` Andrew Lunn @ 2013-05-20 9:43 ` Russell King - ARM Linux 2013-05-20 17:44 ` Jason Cooper 2 siblings, 0 replies; 7+ messages in thread From: Russell King - ARM Linux @ 2013-05-20 9:43 UTC (permalink / raw) To: linux-arm-kernel On Sun, May 19, 2013 at 10:12:43PM +0200, Gregory CLEMENT wrote: > static struct platform_device orion_ge10 = { > .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. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ARM: plat-orion: Fix num_resources and id for ge10 and ge11 2013-05-19 20:12 [PATCH] ARM: plat-orion: Fix num_resources and id for ge10 and ge11 Gregory CLEMENT 2013-05-20 8:22 ` Andrew Lunn 2013-05-20 9:43 ` Russell King - ARM Linux @ 2013-05-20 17:44 ` Jason Cooper 2 siblings, 0 replies; 7+ messages in thread From: Jason Cooper @ 2013-05-20 17:44 UTC (permalink / raw) To: linux-arm-kernel On Sun, May 19, 2013 at 10:12:43PM +0200, Gregory CLEMENT wrote: > 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 <gregory.clement@free-electrons.com> > --- > 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. ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-05-20 17:44 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-05-19 20:12 [PATCH] ARM: plat-orion: Fix num_resources and id for ge10 and ge11 Gregory CLEMENT 2013-05-20 8:22 ` Andrew Lunn 2013-05-20 17:13 ` Jason Cooper 2013-05-20 17:24 ` Andrew Lunn 2013-05-20 17:30 ` Jason Cooper 2013-05-20 9:43 ` Russell King - ARM Linux 2013-05-20 17:44 ` Jason Cooper
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).