UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <gregory.clement@free-electrons.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Cc: <stable@vger.kernel.org> # v3.0.x
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Gregory CLEMENT 2013-05-19 22:12:43 +02:00 committed by Jason Cooper
parent 8eed481e6f
commit 2b8b279714
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/plat-orion/common.c
View File

@ -383,7 +383,7 @@ static struct resource orion_ge10_shared_resources[] = {
static struct platform_device orion_ge10_shared = { static struct platform_device orion_ge10_shared = {
.name = MV643XX_ETH_SHARED_NAME, .name = MV643XX_ETH_SHARED_NAME,
.id = 1, .id = 2,
.dev = { .dev = {
.platform_data = &orion_ge10_shared_data, .platform_data = &orion_ge10_shared_data,
}, },
@ -398,8 +398,8 @@ static struct resource orion_ge10_resources[] = {
static struct platform_device orion_ge10 = { static struct platform_device orion_ge10 = {
.name = MV643XX_ETH_NAME, .name = MV643XX_ETH_NAME,
.id = 1, .id = 2,
.num_resources = 2, .num_resources = 1,
.resource = orion_ge10_resources, .resource = orion_ge10_resources,
.dev = { .dev = {
.coherent_dma_mask = DMA_BIT_MASK(32), .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 = { static struct platform_device orion_ge11_shared = {
.name = MV643XX_ETH_SHARED_NAME, .name = MV643XX_ETH_SHARED_NAME,
.id = 1, .id = 3,
.dev = { .dev = {
.platform_data = &orion_ge11_shared_data, .platform_data = &orion_ge11_shared_data,
}, },
@ -447,8 +447,8 @@ static struct resource orion_ge11_resources[] = {
static struct platform_device orion_ge11 = { static struct platform_device orion_ge11 = {
.name = MV643XX_ETH_NAME, .name = MV643XX_ETH_NAME,
.id = 1, .id = 3,
.num_resources = 2, .num_resources = 1,
.resource = orion_ge11_resources, .resource = orion_ge11_resources,
.dev = { .dev = {
.coherent_dma_mask = DMA_BIT_MASK(32), .coherent_dma_mask = DMA_BIT_MASK(32),