From patchwork Sun Jun 19 23:28:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Azael Avalos X-Patchwork-Id: 9186287 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 A2204601C0 for ; Sun, 19 Jun 2016 23:28:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94D7F205AA for ; Sun, 19 Jun 2016 23:28:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8929A212DA; Sun, 19 Jun 2016 23:28:10 +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=ham 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 03CD3205AA for ; Sun, 19 Jun 2016 23:28:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751423AbcFSX2J (ORCPT ); Sun, 19 Jun 2016 19:28:09 -0400 Received: from mail-ob0-f195.google.com ([209.85.214.195]:34763 "EHLO mail-ob0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751364AbcFSX2I (ORCPT ); Sun, 19 Jun 2016 19:28:08 -0400 Received: by mail-ob0-f195.google.com with SMTP id s7so2072312obo.1; Sun, 19 Jun 2016 16:28:06 -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=+EMq38npMy44ImQe2viS2YlUk+gTxWO7kt1q3Xy1jVI=; b=FpcRCqqG9rGfbmM6Hn7Nr+qyA+OIoKcvlTSdRvn+94e8lKf8UgzVy9pZOM36dFECrJ KyuFtDdA/LCKyshP+gyvJt70YtG2Jlgq0yT7vFaGlAectNtHNQ0GulP6YKibyRuE4d+4 0Q7qrG+26XNIUtXmsyq1hRF3s+x+qQImk2FFDqiOMr5euYwbv41U1lH5WfNa7vTzq5OI M0D45Ox2vsmNZ0wtpUk9Z2D6X/o0b1HOsEwXLkveFnBUzEUJ/3y8etUKFG9x3Sj+giS6 kpTLMYX7KSlvtp8AqNImQqzOfT9665cEOSi1N/Y+5pDjWB7DJ5AO7tG5qMizra3ZgOqE A7oA== 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=+EMq38npMy44ImQe2viS2YlUk+gTxWO7kt1q3Xy1jVI=; b=Q+UvxujqNL2tgJLCsRtnm8fSS8akhjUHRreZoJWNwoyYs8PRDK6/Uc1Nsvs+8MZdkU +ZzAquhgwlVEgUMG9hMMY8CbdXgv35ov7/3ZN7bvqKOUdAsMeK3qsxJaTKwtCFdox1Hx xgIdGFwXCZ5mWSe5mn4S5DNDn+y5NOBa5NiIrnxbmGU1v3txuizHzQMGPvN8g+PDdPV8 Hgb05uD+bRyu32Sj3zJjxwMFkTcPN8jMuY3LGfcAEB9sM0vf+B+a+yif9014QaNp4cHD CFGaXxFNBY9CQTl/7LocHDP9FS50S2Tw7L43n/hOLTbxil6vOz4CgEyMurmPLGnjJO1J qf7Q== X-Gm-Message-State: ALyK8tKIZCHNXBC15iLWHERxp35+OnUvt5uKQwPwvGODJf+HOa7Buj1xeKV7eQbvJPBrTw== X-Received: by 10.157.12.246 with SMTP id o51mr7665440otd.72.1466378886413; Sun, 19 Jun 2016 16:28:06 -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 a40sm4544963ota.8.2016.06.19.16.28.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 19 Jun 2016 16:28:06 -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 v2 1/3] toshiba_acpi: Add IIO interface for accelerometer axis data Date: Sun, 19 Jun 2016 17:28:04 -0600 Message-Id: <20160619232804.8875-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 Acked-by: Jonathan Cameron --- 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..7949929 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,83 @@ static void toshiba_acpi_kbd_bl_work(struct work_struct *work) } /* + * IIO device + */ + +enum toshiba_accel_chan { + AXIS_X, + AXIS_Y, + AXIS_Z +}; + +static int toshiba_accel_get_axis(enum toshiba_accel_chan chan) +{ + u32 xyval; + u32 zval; + int ret; + + xyval = zval = 0; + 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_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_accel_get_axis(chan->channel); + if (ret == -EIO || ret == -ENODEV) + return ret; + + *val = ret; + + return IIO_VAL_INT; + } + + return -EINVAL; +} + +#define TOSHIBA_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_accel_channels[] = { + TOSHIBA_ACCEL_CHANNEL(X, AXIS_X), + TOSHIBA_ACCEL_CHANNEL(Y, AXIS_Y), + TOSHIBA_ACCEL_CHANNEL(Z, AXIS_Z), +}; + +static const struct iio_info toshiba_accel_info = { + .driver_module = THIS_MODULE, + .read_raw = &toshiba_accel_read_raw, +}; + +/* * Misc device */ static int toshiba_acpi_smm_bridge(SMMRegisters *regs) @@ -2904,6 +2984,11 @@ static int toshiba_acpi_remove(struct acpi_device *acpi_dev) remove_toshiba_proc_entries(dev); + if (dev->accelerometer_supported) { + 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 +3136,28 @@ 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) + return -ENOMEM; + + pr_info("Registering Toshiba accelerometer iio device\n"); + + dev->indio_dev->info = &toshiba_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_accel_channels; + dev->indio_dev->num_channels = + ARRAY_SIZE(toshiba_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); + return ret; + } + } toshiba_usb_sleep_charge_available(dev);