lkml.org 
[lkml]   [2010]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] OLPC: register XO-1 platform devices
    Date
    The upcoming XO-1 rfkill driver (for drivers/platform/x86) will register
    itself with the name "xo1-rfkill", and the already-merged XO-1 poweroff
    code uses name "olpc-xo1"

    Add the necessary mechanics so that these devices are properly
    initialized on XO-1 laptops.

    Signed-off-by: Daniel Drake <dsd@laptop.org>
    ---
    arch/x86/kernel/olpc.c | 24 ++++++++++++++++++++++++
    1 files changed, 24 insertions(+), 0 deletions(-)

    Needed for the just-merged XO-1 poweroff support to be useful.
    Replaces earlier patch titled "OLPC: register XO-1 RF kill device"
    The rfkill driver got an ack from the drivers/platform/x86 maintainer,
    I presume he's just waiting for the merge of this one before applying it.

    diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c
    index 37c49934..cb34ecf 100644
    --- a/arch/x86/kernel/olpc.c
    +++ b/arch/x86/kernel/olpc.c
    @@ -17,6 +17,7 @@
    #include <linux/spinlock.h>
    #include <linux/io.h>
    #include <linux/string.h>
    +#include <linux/platform_device.h>

    #include <asm/geode.h>
    #include <asm/setup.h>
    @@ -220,8 +221,25 @@ static bool __init platform_detect(void)
    return true;
    }

    +static int __init add_xo1_platform_devices(void)
    +{
    + struct platform_device *pdev;
    +
    + pdev = platform_device_register_simple("xo1-rfkill", -1, NULL, 0);
    + if (IS_ERR(pdev))
    + return PTR_ERR(pdev);
    +
    + pdev = platform_device_register_simple("olpc-xo1", -1, NULL, 0);
    + if (IS_ERR(pdev))
    + return PTR_ERR(pdev);
    +
    + return 0;
    +}
    +
    static int __init olpc_init(void)
    {
    + int r = 0;
    +
    if (!olpc_ofw_present() || !platform_detect())
    return 0;

    @@ -248,6 +266,12 @@ static int __init olpc_init(void)
    olpc_platform_info.boardrev >> 4,
    olpc_platform_info.ecver);

    + if (olpc_platform_info.boardrev < olpc_board_pre(0xd0)) { /* XO-1 */
    + r = add_xo1_platform_devices();
    + if (r)
    + return r;
    + }
    +
    return 0;
    }

    --
    1.7.2.3


    \
     
     \ /
      Last update: 2010-10-13 20:13    [W:0.032 / U:0.464 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site