forked from Minki/linux
bc7ab495c7
The XO-1 rfkill driver should only send EC commands when changing between blocked/unblocked state. The rfkill switch is asked to be unblocked on every resume (even when the card was never blocked before) and sending a EC_WLAN_LEAVE_RESET command here upsets the resume sequence of the libertas driver. Adding the check to avoid the spurious EC_WLAN_LEAVE_RESET fixes the wifi resume behaviour. The rfkill state is maintained by the hardware over suspend/resume so no extra consideration is needed here. Signed-off-by: Daniel Drake <dsd@laptop.org> Signed-off-by: Matthew Garrett <mjg@redhat.com>
86 lines
1.7 KiB
C
86 lines
1.7 KiB
C
/*
|
|
* Support for rfkill through the OLPC XO-1 laptop embedded controller
|
|
*
|
|
* Copyright (C) 2010 One Laptop per Child
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/rfkill.h>
|
|
|
|
#include <asm/olpc.h>
|
|
|
|
static bool card_blocked;
|
|
|
|
static int rfkill_set_block(void *data, bool blocked)
|
|
{
|
|
unsigned char cmd;
|
|
int r;
|
|
|
|
if (blocked == card_blocked)
|
|
return 0;
|
|
|
|
if (blocked)
|
|
cmd = EC_WLAN_ENTER_RESET;
|
|
else
|
|
cmd = EC_WLAN_LEAVE_RESET;
|
|
|
|
r = olpc_ec_cmd(cmd, NULL, 0, NULL, 0);
|
|
if (r == 0)
|
|
card_blocked = blocked;
|
|
|
|
return r;
|
|
}
|
|
|
|
static const struct rfkill_ops rfkill_ops = {
|
|
.set_block = rfkill_set_block,
|
|
};
|
|
|
|
static int __devinit xo1_rfkill_probe(struct platform_device *pdev)
|
|
{
|
|
struct rfkill *rfk;
|
|
int r;
|
|
|
|
rfk = rfkill_alloc(pdev->name, &pdev->dev, RFKILL_TYPE_WLAN,
|
|
&rfkill_ops, NULL);
|
|
if (!rfk)
|
|
return -ENOMEM;
|
|
|
|
r = rfkill_register(rfk);
|
|
if (r) {
|
|
rfkill_destroy(rfk);
|
|
return r;
|
|
}
|
|
|
|
platform_set_drvdata(pdev, rfk);
|
|
return 0;
|
|
}
|
|
|
|
static int __devexit xo1_rfkill_remove(struct platform_device *pdev)
|
|
{
|
|
struct rfkill *rfk = platform_get_drvdata(pdev);
|
|
rfkill_unregister(rfk);
|
|
rfkill_destroy(rfk);
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver xo1_rfkill_driver = {
|
|
.driver = {
|
|
.name = "xo1-rfkill",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
.probe = xo1_rfkill_probe,
|
|
.remove = __devexit_p(xo1_rfkill_remove),
|
|
};
|
|
|
|
module_platform_driver(xo1_rfkill_driver);
|
|
|
|
MODULE_AUTHOR("Daniel Drake <dsd@laptop.org>");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS("platform:xo1-rfkill");
|