From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752303Ab3LAG3B (ORCPT ); Sun, 1 Dec 2013 01:29:01 -0500 Received: from mail-lb0-f173.google.com ([209.85.217.173]:57578 "EHLO mail-lb0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752265Ab3LAG26 (ORCPT ); Sun, 1 Dec 2013 01:28:58 -0500 From: Sergei Ianovich To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Sergei Ianovich , Rob Landley , Arnd Bergmann , Greg Kroah-Hartman , linux-doc@vger.kernel.org (open list:DOCUMENTATION) Subject: [PATCH 09/11] misc: support for I-8041 in LP-8x4x Date: Sun, 1 Dec 2013 10:26:22 +0400 Message-Id: <1385879185-22455-10-git-send-email-ynvich@gmail.com> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1385879185-22455-1-git-send-email-ynvich@gmail.com> References: <1385879185-22455-1-git-send-email-ynvich@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Status of I-8041 32 digital output channels can be managed via sysfs now. http://www.icpdas.com/products/Remote_IO/i-8ke/i-8041w.htm Signed-off-by: Sergei Ianovich --- Documentation/misc-devices/lp8x4x_bus.txt | 4 ++ drivers/misc/lp8x4x_bus.c | 67 ++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/Documentation/misc-devices/lp8x4x_bus.txt b/Documentation/misc-devices/lp8x4x_bus.txt index 9285fdc..74df10b 100644 --- a/Documentation/misc-devices/lp8x4x_bus.txt +++ b/Documentation/misc-devices/lp8x4x_bus.txt @@ -49,3 +49,7 @@ active_slot model RO - shows expansion module model number + +output_status + RW - set status of digital output channels on the module in + the expansion slot. Value can be read back. diff --git a/drivers/misc/lp8x4x_bus.c b/drivers/misc/lp8x4x_bus.c index b2d4a04..d177735 100644 --- a/drivers/misc/lp8x4x_bus.c +++ b/drivers/misc/lp8x4x_bus.c @@ -27,6 +27,9 @@ MODULE_DESCRIPTION("ICP DAS LP-8x4x parallel bus driver"); struct lp8x4x_slot { void *data_addr; unsigned int model; + struct mutex lock; + unsigned int DO_len; + u32 DO; struct device dev; }; @@ -89,6 +92,45 @@ static void lp8x4x_slot_release(struct device *dev) { } +static void lp8x4x_slot_set_DO(struct lp8x4x_slot *s) +{ + int i; + mutex_lock(&s->lock); + for (i = 0; i < s->DO_len; i++) + iowrite8((s->DO >> (i * 8)) & 0xff, s->data_addr + 2 * i); + mutex_unlock(&s->lock); +} + +static ssize_t output_status_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct lp8x4x_slot *s = container_of(dev, struct lp8x4x_slot, dev); + + return sprintf(buf, "0x%08x\n", s->DO); +} + +static ssize_t output_status_store(struct device *dev, + struct device_attribute *attr, const char *buf, size_t count) +{ + struct lp8x4x_slot *s = container_of(dev, struct lp8x4x_slot, dev); + + if (!buf) + return count; + if (0 == count) + return count; + + if (kstrtouint(buf, 16, &s->DO) != 0) { + dev_err(dev, "bad input\n"); + return count; + } + + lp8x4x_slot_set_DO(s); + + return count; +} + +static DEVICE_ATTR_RW(output_status); + static ssize_t model_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -105,6 +147,13 @@ static struct attribute *slot_dev_attrs[] = { }; ATTRIBUTE_GROUPS(slot_dev); +static struct attribute *do_slot_dev_attrs[] = { + &dev_attr_model.attr, + &dev_attr_output_status.attr, + NULL, +}; +ATTRIBUTE_GROUPS(do_slot_dev); + static void lp8x4x_master_release(struct device *dev) { struct lp8x4x_master *m = container_of(dev, struct lp8x4x_master, dev); @@ -178,8 +227,10 @@ static void devm_lp8x4x_bus_release(struct device *dev, void *res) dev_info(dev, "releasing devices\n"); for (i = 0; i < LP8X4X_MAX_SLOT_COUNT; i++) { s = &m->slot[i]; - if (s->model) + if (s->model) { device_unregister(&s->dev); + mutex_destroy(&s->lock); + } iounmap(s->data_addr); } device_unregister(&m->dev); @@ -203,13 +254,25 @@ static void __init lp8x4x_bus_probe_slot(struct lp8x4x_master *m, int i, dev_set_name(&s->dev, "slot%02i", i + 1); s->dev.parent = &m->dev; s->dev.release = lp8x4x_slot_release; - s->dev.groups = slot_dev_groups; s->model = model; + mutex_init(&s->lock); + + switch (model) { + case 41: + s->DO_len = 4; + lp8x4x_slot_set_DO(s); + s->dev.groups = do_slot_dev_groups; + break; + default: + s->dev.groups = slot_dev_groups; + break; + }; err = device_register(&s->dev); if (err < 0) { dev_err(&s->dev, "failed to register device\n"); s->model = 0; + mutex_destroy(&s->lock); return; } } -- 1.8.4.2