From: Ike Panhc <ike.pan@canonical.com>
To: platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org
Cc: Thomas Renninger <trenn@suse.de>, Alan Cox <alan@linux.intel.com>,
Andrew Morton <akpm@linux-foundation.org>,
Corentin Chary <corentincj@iksaif.net>,
David Woodhouse <David.Woodhouse@intel.com>,
Randy Dunlap <randy.dunlap@oracle.com>,
Len Brown <len.brown@intel.com>, Matthew Garrett <mjg@redhat.com>
Subject: [PATCH 7/8] ideapad: rewrite the sw rfkill set
Date: Wed, 18 Aug 2010 16:38:42 +0800 [thread overview]
Message-ID: <1282120722-11598-1-git-send-email-ike.pan@canonical.com> (raw)
In-Reply-To: <1282120564-11324-1-git-send-email-ike.pan@canonical.com>
Control power of rf modules by ec commands
Signed-off-by: Ike Panhc <ike.pan@canonical.com>
---
drivers/platform/x86/ideapad_acpi.c | 37 +++++++++++-----------------------
1 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/drivers/platform/x86/ideapad_acpi.c b/drivers/platform/x86/ideapad_acpi.c
index 9d0e23f..7c414e5 100644
--- a/drivers/platform/x86/ideapad_acpi.c
+++ b/drivers/platform/x86/ideapad_acpi.c
@@ -37,18 +37,19 @@
struct ideapad_private {
acpi_handle handle;
struct rfkill *rfk[5];
-};
+} *ideapad_priv;
static struct {
char *name;
int cfgbit;
+ int opcode;
int type;
} ideapad_rfk_data[] = {
- { "ideapad_camera", 19, NUM_RFKILL_TYPES },
- { "ideapad_wlan", 18, RFKILL_TYPE_WLAN },
- { "ideapad_bluetooth", 16, RFKILL_TYPE_BLUETOOTH },
- { "ideapad_3g", 17, RFKILL_TYPE_WWAN },
- { "ideapad_killsw", 0, RFKILL_TYPE_WLAN }
+ { "ideapad_camera", 19, 0x1E, NUM_RFKILL_TYPES },
+ { "ideapad_wlan", 18, 0x15, RFKILL_TYPE_WLAN },
+ { "ideapad_bluetooth", 16, 0x17, RFKILL_TYPE_BLUETOOTH },
+ { "ideapad_3g", 17, 0x20, RFKILL_TYPE_WWAN },
+ { "ideapad_killsw", 0, 0, RFKILL_TYPE_WLAN }
};
/*
@@ -162,24 +163,6 @@ static int write_ec_cmd(acpi_handle handle, int cmd, unsigned long data)
}
/* the above is ACPI helpers */
-static int ideapad_dev_set_state(int device, int state)
-{
- acpi_status status;
- union acpi_object in_params[2];
- struct acpi_object_list input = { 2, in_params };
-
- in_params[0].type = ACPI_TYPE_INTEGER;
- in_params[0].integer.value = device + 1;
- in_params[1].type = ACPI_TYPE_INTEGER;
- in_params[1].integer.value = state;
-
- status = acpi_evaluate_object(NULL, "\\_SB_.SECN", &input, NULL);
- if (ACPI_FAILURE(status)) {
- printk(KERN_WARNING "IdeaPAD \\_SB_.SECN method failed %d\n", status);
- return -ENODEV;
- }
- return 0;
-}
static ssize_t show_ideapad_cam(struct device *dev,
struct device_attribute *attr,
char *buf)
@@ -219,7 +202,10 @@ static int ideapad_rfk_set(void *data, bool blocked)
if (device == IDEAPAD_DEV_KILLSW)
return -EINVAL;
- return ideapad_dev_set_state(device, !blocked);
+
+ return write_ec_cmd(ideapad_priv->handle,
+ ideapad_rfk_data[device].opcode,
+ !blocked);
}
static struct rfkill_ops ideapad_rfk_ops = {
@@ -317,6 +303,7 @@ static int ideapad_acpi_add(struct acpi_device *adevice)
priv->handle = adevice->handle;
dev_set_drvdata(&adevice->dev, priv);
+ ideapad_priv = priv;
for (i = IDEAPAD_DEV_WLAN; i <= IDEAPAD_DEV_KILLSW; i++) {
if (!devs_present[i])
continue;
--
1.7.0.4
next prev parent reply other threads:[~2010-08-18 8:38 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-18 8:36 [PATCH 0/8] [Resend] ideapad: using EC command to control rf/camera power Ike Panhc
2010-08-18 8:36 ` [PATCH 1/8] ideapad: add ACPI helpers Ike Panhc
2010-08-18 8:37 ` [PATCH 2/8] ideapad: check VPC bit before sync rfkill hw status Ike Panhc
2010-08-18 8:37 ` [PATCH 3/8] ideapad: make sure we bind on the correct device Ike Panhc
2010-08-18 13:27 ` Matthew Garrett
2010-08-19 2:51 ` Ike Panhc
2010-08-18 8:38 ` [PATCH 4/8] ideapad: use return value of _CFG to tell if device exist or not Ike Panhc
2010-08-18 8:38 ` [PATCH 5/8] ideapad: use EC command to control camera Ike Panhc
2010-08-18 8:42 ` Oliver Neukum
2010-08-18 8:51 ` Ike Panhc
2010-08-18 8:38 ` [PATCH 6/8] ideapad: rewrite the hw rfkill notify Ike Panhc
2010-08-18 8:38 ` Ike Panhc [this message]
2010-08-18 8:38 ` [PATCH 8/8] ideapad: Change the driver name to ideapad_laptop Ike Panhc
2010-08-25 20:56 ` Len Brown
2010-08-26 5:43 ` Corentin Chary
2010-08-26 6:16 ` Ike Panhc
2010-08-26 7:43 ` Corentin Chary
2010-09-01 11:55 ` Ike Panhc
2010-08-18 10:35 ` [PATCH 0/8] [Resend] ideapad: using EC command to control rf/camera power David Woodhouse
2010-08-18 13:04 ` Ike Panhc
2010-08-18 15:51 ` Mario 'BitKoenig' Holbe
2010-08-19 3:21 ` Ike Panhc
2010-08-19 13:28 ` David Woodhouse
2010-08-19 19:31 ` Mario 'BitKoenig' Holbe
2010-08-20 7:01 ` Ike Panhc
2010-08-20 9:08 ` Mario 'BitKoenig' Holbe
2010-08-23 8:22 ` Ike Panhc
2010-08-25 11:59 ` Ike Panhc
2010-08-30 18:19 ` Mario 'BitKoenig' Holbe
2010-09-01 11:49 ` Ike Panhc
2010-09-01 19:56 ` Mario 'BitKoenig' Holbe
2010-09-03 9:06 ` Ike Panhc
2010-09-09 18:17 ` Mario 'BitKoenig' Holbe
2010-09-10 6:44 ` Ike Panhc
2010-09-10 7:11 ` Mario 'BitKoenig' Holbe
2010-09-15 10:13 ` Ike Panhc
2010-09-15 11:48 ` Mario 'BitKoenig' Holbe
2010-09-15 12:39 ` Ike Panhc
2010-09-16 11:59 ` Ike Panhc
2010-09-21 13:47 ` Mario 'BitKoenig' Holbe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1282120722-11598-1-git-send-email-ike.pan@canonical.com \
--to=ike.pan@canonical.com \
--cc=David.Woodhouse@intel.com \
--cc=akpm@linux-foundation.org \
--cc=alan@linux.intel.com \
--cc=corentincj@iksaif.net \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mjg@redhat.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=randy.dunlap@oracle.com \
--cc=trenn@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®