From patchwork Tue Jun 28 01:48:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Azael Avalos X-Patchwork-Id: 9201679 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 41F836075F for ; Tue, 28 Jun 2016 01:48:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30BF8285D4 for ; Tue, 28 Jun 2016 01:48:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 236A3285DC; Tue, 28 Jun 2016 01:48:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE6D1285D4 for ; Tue, 28 Jun 2016 01:48:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752074AbcF1BsR (ORCPT ); Mon, 27 Jun 2016 21:48:17 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:35000 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752042AbcF1BsQ (ORCPT ); Mon, 27 Jun 2016 21:48:16 -0400 Received: by mail-oi0-f66.google.com with SMTP id d132so417096oig.2; Mon, 27 Jun 2016 18:48:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=kbHODVp9wxUZ8FPkdfUNhGMZ72JqmoQgwR6k0jUa+3Q=; b=GqHF//xdlmOHK8TX0Pw/hOSEi3C4FyEbNh9y+OgxXyh0Zt9SZsJbKK2PrhBB+auKlq W8SJNJTDhuifzvypLyPVg5K2FzLU6PKnKVpRY6riWvu6qZ0eGNOBreurAwH8mrKfBOq0 qrGobvn5ILDJhHYfZUI513VvO5t2WvRkk1z3QzYi+JCjLQW5nZXkjsaGe3+TapE0+SHG zk7y8NKZHIfhD+ZlwOF4YlmvAaNFiouEI6OWCp4k8eitO5qhaD0tjfilk5TMk4kU77Fd MCLEN5/2PJ1mB8yNwkcmWJt7ZuLT4HJurUnFEusqTqKnqLLm/WS8hCFbeU0h1+ENUZUk YRrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=kbHODVp9wxUZ8FPkdfUNhGMZ72JqmoQgwR6k0jUa+3Q=; b=KEX+qiAHV3gdrtuj1VfHaYHWijSd96ZslwSOGIx4hA46L0+VUUK/DhF9oEoKhrqdLi IQiHpHxHvOYaRtPjpNffcuwMbr83EYmkyPQnrN+facEesST4YVwEaRkCoYCNSzg8ZWk4 fcXlI8P0Mq0T3eIc6kEOfYm/SyW1Nb9V/LI0m9ZZcF+O0HBQXP5s8LGgt3IiHcxhwKpb OwG2zyjPs+1Ous8CxSG4VkYbkcQEurR6Rxt6DoL8yNm2r3f18lmau9nr2UyD3WHuFGLQ PnxX41dy/Qftb+XeCcpCEFEOzbnG1vn/l46sJGWAtWpOlFxWhqbxxw1rUc/XYjG82LgH TyCQ== X-Gm-Message-State: ALyK8tL6xOpxRbENhQTXmP86fmSgl1JeT1zWMDPgFnRNBYQNzi36gU5rdVPZfwrEEDxQBA== X-Received: by 10.202.4.204 with SMTP id 195mr155164oie.173.1467078495700; Mon, 27 Jun 2016 18:48:15 -0700 (PDT) Received: from Shakuras.scurra.org (148-240-208-153.ftth.dynamic.axtel.net. [148.240.208.153]) by smtp.gmail.com with ESMTPSA id s132sm10140883oif.3.2016.06.27.18.48.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Jun 2016 18:48:15 -0700 (PDT) From: Azael Avalos To: Darren Hart , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron , linux-iio@vger.kernel.org Cc: Azael Avalos Subject: [PATCH v3 1/3] toshiba_acpi: Add IIO interface for accelerometer axis data Date: Mon, 27 Jun 2016 19:48:08 -0600 Message-Id: <20160628014808.8495-1-coproscefalo@gmail.com> X-Mailer: git-send-email 2.8.4 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds the accelerometer axis data to the IIO subsystem. Currently reporting the X, Y and Z values, as no other data can be queried given the fact that the accelerometer chip itself is hidden behind the Toshiba proprietary interface. Signed-off-by: Azael Avalos --- drivers/platform/x86/toshiba_acpi.c | 107 ++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index 01e12d2..bd9b346a 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -53,6 +53,7 @@ #include #include #include +#include #include #include @@ -134,6 +135,7 @@ MODULE_LICENSE("GPL"); /* Field definitions */ #define HCI_ACCEL_MASK 0x7fff +#define HCI_ACCEL_DIRECTION_MASK 0x8000 #define HCI_HOTKEY_DISABLE 0x0b #define HCI_HOTKEY_ENABLE 0x09 #define HCI_HOTKEY_SPECIAL_FUNCTIONS 0x10 @@ -178,6 +180,7 @@ struct toshiba_acpi_dev { struct led_classdev eco_led; struct miscdevice miscdev; struct rfkill *wwan_rfk; + struct iio_dev *indio_dev; int force_fan; int last_key_event; @@ -2420,6 +2423,81 @@ static void toshiba_acpi_kbd_bl_work(struct work_struct *work) } /* + * IIO device + */ + +enum toshiba_iio_accel_chan { + AXIS_X, + AXIS_Y, + AXIS_Z +}; + +static int toshiba_iio_accel_get_axis(enum toshiba_iio_accel_chan chan) +{ + u32 xyval, zval; + int ret; + + ret = toshiba_accelerometer_get(toshiba_acpi, &xyval, &zval); + if (ret < 0) + return ret; + + switch (chan) { + case AXIS_X: + return xyval & HCI_ACCEL_DIRECTION_MASK ? + -(xyval & HCI_ACCEL_MASK) : xyval & HCI_ACCEL_MASK; + case AXIS_Y: + return (xyval >> HCI_MISC_SHIFT) & HCI_ACCEL_DIRECTION_MASK ? + -((xyval >> HCI_MISC_SHIFT) & HCI_ACCEL_MASK) : + (xyval >> HCI_MISC_SHIFT) & HCI_ACCEL_MASK; + case AXIS_Z: + return zval & HCI_ACCEL_DIRECTION_MASK ? + -(zval & HCI_ACCEL_MASK) : zval & HCI_ACCEL_MASK; + } + + return ret; +} + +static int toshiba_iio_accel_read_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int *val, int *val2, long mask) +{ + int ret; + + switch (mask) { + case IIO_CHAN_INFO_RAW: + ret = toshiba_iio_accel_get_axis(chan->channel); + if (ret == -EIO || ret == -ENODEV) + return ret; + + *val = ret; + + return IIO_VAL_INT; + } + + return -EINVAL; +} + +#define TOSHIBA_IIO_ACCEL_CHANNEL(axis, chan) { \ + .type = IIO_ACCEL, \ + .modified = 1, \ + .channel = chan, \ + .channel2 = IIO_MOD_##axis, \ + .output = 1, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ +} + +static const struct iio_chan_spec toshiba_iio_accel_channels[] = { + TOSHIBA_IIO_ACCEL_CHANNEL(X, AXIS_X), + TOSHIBA_IIO_ACCEL_CHANNEL(Y, AXIS_Y), + TOSHIBA_IIO_ACCEL_CHANNEL(Z, AXIS_Z), +}; + +static const struct iio_info toshiba_iio_accel_info = { + .driver_module = THIS_MODULE, + .read_raw = &toshiba_iio_accel_read_raw, +}; + +/* * Misc device */ static int toshiba_acpi_smm_bridge(SMMRegisters *regs) @@ -2904,6 +2982,11 @@ static int toshiba_acpi_remove(struct acpi_device *acpi_dev) remove_toshiba_proc_entries(dev); + if (dev->accelerometer_supported && dev->indio_dev) { + iio_device_unregister(dev->indio_dev); + iio_device_free(dev->indio_dev); + } + if (dev->sysfs_created) sysfs_remove_group(&dev->acpi_dev->dev.kobj, &toshiba_attr_group); @@ -3051,6 +3134,30 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev) dev->touchpad_supported = !ret; toshiba_accelerometer_available(dev); + if (dev->accelerometer_supported) { + dev->indio_dev = iio_device_alloc(sizeof(*dev)); + if (!dev->indio_dev) { + pr_err("Unable to allocate iio device\n"); + goto iio_error; + } + + pr_info("Registering Toshiba accelerometer iio device\n"); + + dev->indio_dev->info = &toshiba_iio_accel_info; + dev->indio_dev->name = "Toshiba accelerometer"; + dev->indio_dev->dev.parent = &acpi_dev->dev; + dev->indio_dev->modes = INDIO_DIRECT_MODE; + dev->indio_dev->channels = toshiba_iio_accel_channels; + dev->indio_dev->num_channels = + ARRAY_SIZE(toshiba_iio_accel_channels); + + ret = iio_device_register(dev->indio_dev); + if (ret < 0) { + pr_err("Unable to register iio device\n"); + iio_device_free(dev->indio_dev); + } + } +iio_error: toshiba_usb_sleep_charge_available(dev);