From patchwork Tue Dec 17 19:37:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Yanovich X-Patchwork-Id: 3364741 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5E5E49F314 for ; Tue, 17 Dec 2013 19:45:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 625AB203AA for ; Tue, 17 Dec 2013 19:45:01 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 70FEB20268 for ; Tue, 17 Dec 2013 19:44:56 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vt0Ym-0004Py-K9; Tue, 17 Dec 2013 19:44:05 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vt0YY-0008L3-Fi; Tue, 17 Dec 2013 19:43:50 +0000 Received: from mail-lb0-x22d.google.com ([2a00:1450:4010:c04::22d]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vt0VZ-00080C-DV for linux-arm-kernel@lists.infradead.org; Tue, 17 Dec 2013 19:40:52 +0000 Received: by mail-lb0-f173.google.com with SMTP id z5so1664341lbh.32 for ; Tue, 17 Dec 2013 11:40:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Tnj4Z3K+iBUuv7QumGYEEHeniZ+3gnBTPKlVnUNh/DY=; b=omK4IXB9lUzMLvWGmvH01aIUw/SpZn8NBhx9HOL9Og1jsiO2uzK2472RBTI2BgnNIF +oRD9AhneaWQ6BrMDVXPRP28fmI13xAU5XnD5we8xoK2bvZT1pZ4y1DPYHAblC+jNQpf AqX4TSAdrEqJ+919hS/HfMjJ2p1TvtbF5fhr0j265AFTqt2mIICaIvWvpeAv+tSCwnG9 XBvgMQAki2ew4lkrl3OfI2vabRFKM9Mn8Kk+Ubd5BvxqlH23uoHK4nq1lcNuJQQO6Vr6 jv9As7xt4ggHWrAtWSa4F/MReogkxReT94HNPVlCQrz0+RIDtuvIgCkLpTxUcBXYPryu vLyA== X-Received: by 10.112.167.228 with SMTP id zr4mr278685lbb.56.1387309226041; Tue, 17 Dec 2013 11:40:26 -0800 (PST) Received: from host5.omatika.ru (0893675324.static.corbina.ru. [95.31.1.192]) by mx.google.com with ESMTPSA id dw1sm2299009lbc.4.2013.12.17.11.40.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Dec 2013 11:40:25 -0800 (PST) From: Sergei Ianovich To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 19/21] misc: support for I-8041 in LP-8x4x Date: Tue, 17 Dec 2013 23:37:49 +0400 Message-Id: <1387309071-22382-20-git-send-email-ynvich@gmail.com> X-Mailer: git-send-email 1.8.5.1 In-Reply-To: <1387309071-22382-1-git-send-email-ynvich@gmail.com> References: <1386901645-28895-1-git-send-email-ynvich@gmail.com> <1387309071-22382-1-git-send-email-ynvich@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131217_144045_729365_DE3D697A X-CRM114-Status: GOOD ( 17.11 ) X-Spam-Score: -1.9 (-) Cc: Sergei Ianovich , Greg Kroah-Hartman , Arnd Bergmann , Rob Landley , "open list:DOCUMENTATION" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SBL, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- v2..v3 v0..v2 * no changes (except number 14/16 -> 19/21) 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 09380fd..68fefde 100644 --- a/Documentation/misc-devices/lp8x4x_bus.txt +++ b/Documentation/misc-devices/lp8x4x_bus.txt @@ -58,3 +58,7 @@ slot_count 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 59dc767..5af788d 100644 --- a/drivers/misc/lp8x4x_bus.c +++ b/drivers/misc/lp8x4x_bus.c @@ -26,6 +26,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; }; @@ -91,6 +94,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) { @@ -107,6 +149,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); @@ -242,8 +291,10 @@ static void devm_lp8x4x_bus_release(struct device *dev, void *res) dev_dbg(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); + } } device_unregister(&m->dev); bus_unregister(&lp8x4x_bus_type); @@ -261,13 +312,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; } }