lkml.org 
[lkml]   [2013]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 004/127] ARM: plat-orion: Fix num_resources and id for ge10 and ge11
    Date
    3.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Gregory CLEMENT <gregory.clement@free-electrons.com>

    commit 2b8b2797142c7951e635c6eec5d1705ee9bc45c5 upstream.

    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>
    Signed-off-by: Jason Cooper <jason@lakedaemon.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm/plat-orion/common.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    --- a/arch/arm/plat-orion/common.c
    +++ b/arch/arm/plat-orion/common.c
    @@ -373,7 +373,7 @@ static struct resource orion_ge10_shared

    static struct platform_device orion_ge10_shared = {
    .name = MV643XX_ETH_SHARED_NAME,
    - .id = 1,
    + .id = 2,
    .dev = {
    .platform_data = &orion_ge10_shared_data,
    },
    @@ -388,8 +388,8 @@ static struct resource orion_ge10_resour

    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),
    @@ -425,7 +425,7 @@ static struct resource orion_ge11_shared

    static struct platform_device orion_ge11_shared = {
    .name = MV643XX_ETH_SHARED_NAME,
    - .id = 1,
    + .id = 3,
    .dev = {
    .platform_data = &orion_ge11_shared_data,
    },
    @@ -440,8 +440,8 @@ static struct resource orion_ge11_resour

    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),



    \
     
     \ /
      Last update: 2013-06-06 02:01    [W:7.889 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site