From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1166964AbdDXIgl (ORCPT ); Mon, 24 Apr 2017 04:36:41 -0400 Received: from mail-db5eur01on0126.outbound.protection.outlook.com ([104.47.2.126]:19703 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1166908AbdDXIfv (ORCPT ); Mon, 24 Apr 2017 04:35:51 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=axentia.se; From: Peter Rosin To: , Greg Kroah-Hartman CC: Peter Rosin , Wolfram Sang , Rob Herring , Mark Rutland , Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Jonathan Corbet , , , , , Andrew Morton , Colin Ian King , Paul Gortmaker , Philipp Zabel , Subject: [PATCH v14 09/11] i2c: i2c-mux-gpmux: new driver Date: Mon, 24 Apr 2017 10:36:33 +0200 Message-ID: <1493022995-16917-10-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1493022995-16917-1-git-send-email-peda@axentia.se> References: <1493022995-16917-1-git-send-email-peda@axentia.se> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [81.224.171.159] X-ClientProxiedBy: DB6PR0501CA0040.eurprd05.prod.outlook.com (10.168.78.154) To AM5PR0202MB2548.eurprd02.prod.outlook.com (10.173.89.9) X-MS-Office365-Filtering-Correlation-Id: 34281d5d-80f3-4651-0302-08d48aecdb6e X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075);SRVR:AM5PR0202MB2548; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2548;3:qyvrVWapORSr+2xKPceLzurFIE7yMtaVWLS98svSKON9rGtnO4D4IOh8v+txG8Z6/G/e0+8lcxW1zuDJpMOZ0BvGTdzE3Bcz45r2C+TH/9cM6IgEL75caFz7hxDMQVtYwkYyUaI/jO6lgyHl0sXSYFpMztrEJEkgaC+P3OOOziJmEsrLRUKKxPmWKOYD42OlXmjMUlM/gjo3Mnx85jpkUqJJAYOd904nIKR4qj7FH7bb3+9uSw0eFtbfS3accicuuvcL79NrWuAQoIJbIA0525OANbRNv30bj6wzBqKBaFvM+BxV1+5O1AHGoSB7tAsH;25:cKmvuXhKW/xseLtkxbOAVBs5TTmE7FWDgtGs2YV79bcQTuPI4SGfrKGHkPKOwUTm0tL66RJ9SQlU1Qbx4vU/7nDPSV7oQPhnt/oWKqMchXSkooumnxR57NUX6Au6ZjcwpsYmDaFwCVDAjMf/h9tOYR2d9hISxDbvml3Aw5dzjJELt5Lf6M5FByjW9t4nFDbeotkP4lKeJYZP7TO4oVczUXy3/oKDneRTrR6RMHgdn4nHNjg3/q1cJjFlP7w83icAoshWVmD+topWHWTehcORiR6j2FrXohqd/c9El34pywk/6coag6N3XXYok139hIo9VL5d+DLQZLpW5pjkTq3r2cuL8pmy83DhGhXyiJmoMcJryEMUBo2kTWfpZYdbwv/v2+SiQdi/LzVivF/ZlArSGZ8xY0ACapiqoQ8nZUj/KvwODlP4jQDRM5nFUnQTJFMYGMJG4cUbVgfgtGGIOPzvAg== X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2548;31:XxjI2JmsxsWqgQjY2+76KpHGW+Ut2ko7FssQlLVI+f4vBH7GbpLMzAPi5EXjfooGtoFlW1eX0hsIN3y2nmtSgv0NfkQNlCkpPPqN9Cm7lOnWwE+OdYWAn7z9JikBzWPM7o2hbYTgXiMWgJN38TTviyoADWq+SAKUql+Yngm2lKs4Stn89L1A5jRC9FIxtzsvMxCMJt+C/Pb6n4uNWd13Sp6FpKNScKg0i+5MuGQuaSDR5RTnYUs0Bvmv4wS/tC2m X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(20161123560025)(2016111802025)(20161123562025)(20161123555025)(20161123564025)(6072148)(6043046);SRVR:AM5PR0202MB2548;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0202MB2548; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2548;4:v+zuiko7YHfFPvwR0bGdK0M0HbdQLsIS9r+h5MvA2aUUB8y0FCugA34R3YUENjH9hhAICN3sMShJYTu3D1FRiJhesAMyZVrz4qSJVmY4ChjHDXu/KTySXc294H8WVkbNFpDI/SkJQV6AR2NnCO5toslPCsGxW1sRZEV6mNvDRmhoZ5G3iigYXkDxEFUcNUUuvud0EBo/Iz0G6SZeiSGi79PKkNqJfXisC0YKRAKzhj9HbejHdQdEmQyk7LcdhH5qsgVbAh5VJgphqCWb/gM1kDPQ2p+17vyLzjPi5eptHr+Mc/G2HnAY5Ic7C5v+8CJc6dCDAPbXldbFv3na6k1V/oy+SizMyoc8wlSo3PhLVva4Od+sMgizMJGxWdxnlTng5LjuIHipoCDvcmhJgdIsi8r84r3ZjSoUb5TC/uwb6cMTTqK8vfs6nu/y1BZ37D2OvqH9u3O/b36Vn7tKrCWbtSH9AAHW27/UFQjaAo1w6xjI4e9VLvGn9uFpnxT9giGe6Tgs9DgEOecHW691z2IKKh50tLCLFmv8/Tb54xYz3YbhNOrDxG/pGiZhs8NfbFGRinY/vX4ZAzhQUgQ9rYd+LVTirX/7PH6ZkiC6kek/i62CxqHT3kdpLITV797RLnMacI4MxRu6b7ggjBI54+F8AjV03RmIgzj+bKobvzD77zKvIkNtqr07EXbMNGqilrz5g6LFxD73tunMKko1zALJkYouUogvfPlRo8lgYFC4sNSEa5aW70Ekqj5NtLwrvnuJ8ewk4nUNEfcyRfgEwAL0vw== X-Forefront-PRVS: 0287BBA78D X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6069001)(39450400003)(39840400002)(39400400002)(39410400002)(6506006)(47776003)(4326008)(189998001)(6486002)(42186005)(8676002)(50226002)(81166006)(50466002)(48376002)(38730400002)(5660300001)(7736002)(86362001)(6666003)(305945005)(76176999)(50986999)(7416002)(2950100002)(54906002)(8666007)(25786009)(66066001)(6512007)(53936002)(36756003)(5003940100001)(2906002)(74482002)(33646002)(3846002)(6116002)(230783001)(2004002)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:AM5PR0202MB2548;H:localhost.localdomain;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AM5PR0202MB2548;23:7y4Q4zgSMzXIVHqpG/QXekj99Ywhoi+ZuehpPrE?= =?us-ascii?Q?NaheK46/ZKE0jUNXJP0swyf2hNoxjOoOL/v6eQpOUslrIxI1A3bE4Z3vEYjx?= =?us-ascii?Q?6VlXfPn9ERR4JurEGkfUt1I30KvlN2Yhifx+21G0F3kiI6A7JZ/yneo4Teey?= =?us-ascii?Q?jepLNLdgn4gZQdEOTm20Rw/Vo01GHrvyJF8zrqjPOn3XZLLQ/h2uYSGi7vmR?= =?us-ascii?Q?3HpZ+utqDEnF9yw0ctysYwCHnKsv61q31YzV+dVURWWRDEtzmKlDBHmCm575?= =?us-ascii?Q?Z4j31UW1/bg1L6SM+uTv3q2A39WDI9yJdd7x2AxfxvcRdtoKY8pYoGzu6LIo?= =?us-ascii?Q?spMgYoNz8M3fPYess2ewTA4xr6yfOe9DU2ISfD1rTUsUmMH2fyktIeFecMMM?= =?us-ascii?Q?1X33PxsLUeVWwTimqEA1OMrwwgi5qP4GpOem8HVY11q1x7GTxwnKDRmIOA4W?= =?us-ascii?Q?IAeBUMuWz+GSmGgs/YP0xrcu/G2jARAPniHd6EDEp+3koJUY0jHBRTb/M+ej?= =?us-ascii?Q?WQmDW1d5a52b+mAb7Dbcs5Jx8U3yek86B3lxl7ZXi6oZITP702p7MdnOeZhQ?= =?us-ascii?Q?bOZtR7PlMhAYuGOamYa598Z+uDaaAf0e82TJpqyjKX/WQl6kdr90pcJFlrQw?= =?us-ascii?Q?U8lL/XczH9EVznoW9jmlsMU1jln1yDYzrtKCOJ1wkL24X7XFcjrOPB0eTvjC?= =?us-ascii?Q?abuVuU0gPH4pyAHy1H2Q1QAQsCESuChKcE20rqpdMSRlXN71ZASwmv8OAw26?= =?us-ascii?Q?9bstCLZH84ZjrdPmnt+zS8yl5hyfqPWmoDyUiv8azB+uI3sFAB7wC1bft2QD?= =?us-ascii?Q?4cosvZ6qRHy50mZU5/59+S9HkVYbu7z1D3JCmK43KtjTe9+IRWjSNSHgpP45?= =?us-ascii?Q?+Ws/hI8gcz7Z7wvYvE+z6DaoQ0WSX12M7hlZUnSjcSZIJBrPTDmxaDrNxK2u?= =?us-ascii?Q?wPglXAcHmtmh80m5yYkrLrNS12Nxlt0eP6IbgB4FBo1ONVMdUGnGEh7P0zkB?= =?us-ascii?Q?o8QOX9YIdAyMNqmyo2JA2iQ4EaHbKMdN/mtmVLIR9Q8NSXhcoYMoUfV24pec?= =?us-ascii?Q?LEJvbd05ABM58BAxOYU7HLoY+kD69bDln1EuXOT3cXAw18Vt9Cg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2548;6:tB2t8myCv5TbPQG+QtyyXfBmJnsigmcmEY2tm7aik5IJ8je9KTSrOuzl76Xrkk2MCh/Hbd08Esw0cnxHf/XXTfoHWXkov/jNbLHIlrFlw39M+Dwze5Dj2KhDenBvR0umHdOGuDPngrrnXMV990Lv7AmYqkpg/4g33jnRf0yAYcUtYDN+L3sCxwI/iMpM5hEbiC3+zIBlL4MhIyA6G7VOg02arhtww/IY/lm7Yj2BDRrr4hl0/E1Sigc6iYwxHak4zQ+eWbN7LuNkD+TLNk4tMYA3N0mjDrvrVUa7RD7K1xxrVcrhlAUnn3TGs8pReFoG+xEQYhJogcys/dN4xUccktaJVA5QSePw6GtHs06GHIUnQ9xmkfJic2FQFGYHjOWOzvJCupzvMxpwzt6oDKwk47aBY3HqfP8WCFtzuCG5bzg+41gnRGEoxIauL6NzSZL1Wf9nzj1cbm0+YlFIg8Rop9YMEpjhRK99i0UgebwPMFpOk1o71q44+5B3JXtPTPhvxyenN7PCeoGBZ5TIxGLqKA==;5:aLJyswFbMOGcQMiRwPbNDf2K4wII0ODKwn4M8e182BJI2ZWrk4m41c+XSw+g82kBOxx8hLargKefaWXUMX2x4xO3JTQlQVxoRk4ToJ/jbjBbMMPlQyltstEMBUh0xAz5TQsA8/GVDtC3mOUbqs4XNA==;24:Mpb4jH6k5v0bUx6WDYj99TiJMvN3YfWKUBBU4oAfbTFLgbjCa2qip2Zx2IkVqYcmM31VRl2z2rL4RMqBkpC+j3AH56SVBZyyeOnYLQZsWb0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2548;7:88Tv2o1WP6m5BbrLacKRzAyjbnd7sM1hWWY7UaulXHC+chFtZ0W1X4DXWAGRW2Z+cLzHoh4FR9Aj58F2Bi7JeyJqhlO/7vYK2PrMNdQCXRic/bp49ti3zbFmYlpB8nOP+PRy73rNC8ngseCPfnhw8FZnzDIg7G4sFcb9WhDMfsmef/B3bhaeof6hZ++qH+7wDhGhlRA2ZdAFHAcU3lpllJBJhSQNCnb0up0DfwizNBlQFA6xOnMLtLDhC3tDbiGi428GJH9WzsH6X+BeqwKVpguZq9rAptzfqA0A6Aj3SP1zKPT2e8hWjsQP8ClsQO82J6lfwGyIZV2OFH4IPqFFkA== X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2017 08:35:24.0667 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0202MB2548 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a general purpose i2c mux that uses a multiplexer controlled by the multiplexer subsystem to do the muxing. The user can select if the mux is to be mux-locked and parent-locked as described in Documentation/i2c/i2c-topology. Acked-by: Jonathan Cameron Acked-by: Wolfram Sang Signed-off-by: Peter Rosin --- drivers/i2c/muxes/Kconfig | 13 +++ drivers/i2c/muxes/Makefile | 1 + drivers/i2c/muxes/i2c-mux-gpmux.c | 173 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 187 insertions(+) create mode 100644 drivers/i2c/muxes/i2c-mux-gpmux.c diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig index 10b3d17ae3ea..11115fb34f24 100644 --- a/drivers/i2c/muxes/Kconfig +++ b/drivers/i2c/muxes/Kconfig @@ -30,6 +30,19 @@ config I2C_MUX_GPIO This driver can also be built as a module. If so, the module will be called i2c-mux-gpio. +config I2C_MUX_GPMUX + tristate "General Purpose I2C multiplexer" + select MULTIPLEXER + depends on OF + help + If you say yes to this option, support will be included for a + general purpose I2C multiplexer. This driver provides access to + I2C busses connected through a MUX, which in turn is controlled + by a MUX-controller from the MUX subsystem. + + This driver can also be built as a module. If so, the module + will be called i2c-mux-gpmux. + config I2C_MUX_PCA9541 tristate "NXP PCA9541 I2C Master Selector" help diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile index 9948fa45037f..af43c6c3e861 100644 --- a/drivers/i2c/muxes/Makefile +++ b/drivers/i2c/muxes/Makefile @@ -6,6 +6,7 @@ obj-$(CONFIG_I2C_ARB_GPIO_CHALLENGE) += i2c-arb-gpio-challenge.o obj-$(CONFIG_I2C_DEMUX_PINCTRL) += i2c-demux-pinctrl.o obj-$(CONFIG_I2C_MUX_GPIO) += i2c-mux-gpio.o +obj-$(CONFIG_I2C_MUX_GPMUX) += i2c-mux-gpmux.o obj-$(CONFIG_I2C_MUX_MLXCPLD) += i2c-mux-mlxcpld.o obj-$(CONFIG_I2C_MUX_PCA9541) += i2c-mux-pca9541.o obj-$(CONFIG_I2C_MUX_PCA954x) += i2c-mux-pca954x.o diff --git a/drivers/i2c/muxes/i2c-mux-gpmux.c b/drivers/i2c/muxes/i2c-mux-gpmux.c new file mode 100644 index 000000000000..92cf5f48afe6 --- /dev/null +++ b/drivers/i2c/muxes/i2c-mux-gpmux.c @@ -0,0 +1,173 @@ +/* + * General Purpose I2C multiplexer + * + * Copyright (C) 2017 Axentia Technologies AB + * + * Author: Peter Rosin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include + +struct mux { + struct mux_control *control; + + bool do_not_deselect; +}; + +static int i2c_mux_select(struct i2c_mux_core *muxc, u32 chan) +{ + struct mux *mux = i2c_mux_priv(muxc); + int ret; + + ret = mux_control_select(mux->control, chan); + mux->do_not_deselect = ret < 0; + + return ret; +} + +static int i2c_mux_deselect(struct i2c_mux_core *muxc, u32 chan) +{ + struct mux *mux = i2c_mux_priv(muxc); + + if (mux->do_not_deselect) + return 0; + + return mux_control_deselect(mux->control); +} + +static struct i2c_adapter *mux_parent_adapter(struct device *dev) +{ + struct device_node *np = dev->of_node; + struct device_node *parent_np; + struct i2c_adapter *parent; + + parent_np = of_parse_phandle(np, "i2c-parent", 0); + if (!parent_np) { + dev_err(dev, "Cannot parse i2c-parent\n"); + return ERR_PTR(-ENODEV); + } + parent = of_find_i2c_adapter_by_node(parent_np); + of_node_put(parent_np); + if (!parent) + return ERR_PTR(-EPROBE_DEFER); + + return parent; +} + +static const struct of_device_id i2c_mux_of_match[] = { + { .compatible = "i2c-mux", }, + {}, +}; +MODULE_DEVICE_TABLE(of, i2c_mux_of_match); + +static int i2c_mux_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct device_node *child; + struct i2c_mux_core *muxc; + struct mux *mux; + struct i2c_adapter *parent; + int children; + int ret; + + if (!np) + return -ENODEV; + + mux = devm_kzalloc(dev, sizeof(*mux), GFP_KERNEL); + if (!mux) + return -ENOMEM; + + mux->control = devm_mux_control_get(dev, NULL); + if (IS_ERR(mux->control)) { + if (PTR_ERR(mux->control) != -EPROBE_DEFER) + dev_err(dev, "failed to get control-mux\n"); + return PTR_ERR(mux->control); + } + + parent = mux_parent_adapter(dev); + if (IS_ERR(parent)) { + if (PTR_ERR(parent) != -EPROBE_DEFER) + dev_err(dev, "failed to get i2c-parent adapter\n"); + return PTR_ERR(parent); + } + + children = of_get_child_count(np); + + muxc = i2c_mux_alloc(parent, dev, children, 0, 0, + i2c_mux_select, i2c_mux_deselect); + if (!muxc) { + ret = -ENOMEM; + goto err_parent; + } + muxc->priv = mux; + + platform_set_drvdata(pdev, muxc); + + muxc->mux_locked = of_property_read_bool(np, "mux-locked"); + + for_each_child_of_node(np, child) { + u32 chan; + + ret = of_property_read_u32(child, "reg", &chan); + if (ret < 0) { + dev_err(dev, "no reg property for node '%s'\n", + child->name); + goto err_children; + } + + if (chan >= mux_control_states(mux->control)) { + dev_err(dev, "invalid reg %u\n", chan); + ret = -EINVAL; + goto err_children; + } + + ret = i2c_mux_add_adapter(muxc, 0, chan, 0); + if (ret) + goto err_children; + } + + dev_info(dev, "%d-port mux on %s adapter\n", children, parent->name); + + return 0; + +err_children: + i2c_mux_del_adapters(muxc); +err_parent: + i2c_put_adapter(parent); + + return ret; +} + +static int i2c_mux_remove(struct platform_device *pdev) +{ + struct i2c_mux_core *muxc = platform_get_drvdata(pdev); + + i2c_mux_del_adapters(muxc); + i2c_put_adapter(muxc->parent); + + return 0; +} + +static struct platform_driver i2c_mux_driver = { + .probe = i2c_mux_probe, + .remove = i2c_mux_remove, + .driver = { + .name = "i2c-mux-gpmux", + .of_match_table = i2c_mux_of_match, + }, +}; +module_platform_driver(i2c_mux_driver); + +MODULE_DESCRIPTION("General Purpose I2C multiplexer driver"); +MODULE_AUTHOR("Peter Rosin "); +MODULE_LICENSE("GPL v2"); -- 2.1.4