From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753201AbdC0MU0 (ORCPT ); Mon, 27 Mar 2017 08:20:26 -0400 Received: from mail-eopbgr00124.outbound.protection.outlook.com ([40.107.0.124]:32448 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752893AbdC0MSE (ORCPT ); Mon, 27 Mar 2017 08:18:04 -0400 Authentication-Results: linuxfoundation.org; dkim=none (message not signed) header.d=none;linuxfoundation.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" Subject: [PATCH v11 08/12] i2c: i2c-mux-gpmux: new driver Date: Mon, 27 Mar 2017 14:17:45 +0200 Message-ID: <1490617069-13119-9-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1490617069-13119-1-git-send-email-peda@axentia.se> References: <1490617069-13119-1-git-send-email-peda@axentia.se> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [81.224.171.159] X-ClientProxiedBy: HE1PR0402CA0008.eurprd04.prod.outlook.com (10.175.27.18) To DB6PR0202MB2550.eurprd02.prod.outlook.com (10.169.211.8) X-MS-Office365-Filtering-Correlation-Id: 38948656-6927-4cda-1c50-08d4750b1f23 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:DB6PR0202MB2550; X-Microsoft-Exchange-Diagnostics: 1;DB6PR0202MB2550;3:6i/9oJbbm8Qv5w3m8py4DvsS3J15xRLlW9o9c7YVd/1FE1t4Ef9LGgPnw19DECxoDiq3YqGGMTe/KOZuSh5+VdxdnVnCmzgaqKkYPMNdl3UOqF/3Mvn0QrFv/Kjgud50auMRXMO6HUKE5X5ZBHlfV2Ceer3RqbgHeo81wAMTIIyu7nz4ZJd+vw53b+yBZk5O1Nl26Sv9FY/jIyIF0g9CymMr8QE0n1ekLRDjDAoT+mWEnnp5YTw6gODtKq1E3ACGmdRXv55PAhpN4QklmQB8ig==;25:CQWLMvEvSF4BTaWZ3u5pUa5zRBTAT6z6XcwWhNnFqdRFMbY6B/ZSDDiC130V3jltaEP0nOQZeCPdD8oaNBS1WLHHqRonUtvmkWfHrBV5mu4xHI7yYVGIsybDxiVnuhSCqtD5pAVUGZAclvGctGtByXl7U+EshFDzKMeLFt6i0YIEHSFVOIoH2WDfhVw7nHafkbZ1qjwc+pj7IMoevfDAuSH4BMUiFt1KToDotJg5LAkNzJcUHMnKrmJFU8IB3XYF+8BC4asUVcKny74t8lFlBldJDMlW5m054JtzC2XOYB79Pa81guFX63EwTe/5hBSfkUW3ly0xWwdt9k0s+WtuQZqNo0KfnFGckr5p44WLIirSmH21dIciJFbRnFQH9w6TVLARAcfRxs2zlRhmqvHpwJTm+BDIdHU6kNknMo+v0Irx3H6NNQJdVy/PcvMWEIxjHn52PFKXCMBQiRG/zcu+sg== X-Microsoft-Exchange-Diagnostics: 1;DB6PR0202MB2550;31:pTJEiUPC0YdUIRQbls0Q+YYezm0R3iiEvo8BjWDECdQu6rxJlRXfIxwRHBH4XHG3lFrKzjPjXskZXa56cXSd+FEDGKlgnlyWLHM4Ve1FB+HqlzgcHWuDe4c+Yyofvw6+Bs9CtWt2oun/7LSvRPGkk448vs8yLRySX2L5XSDdJ2ZewTq04gfoGuB0gCkwIbav723/hnvQrt2RGkT+smFVexRrOVMIF/42PqXfZtQTLZBE2jHlvGUewrJVI7T5orpm;4:ouIqK0Qw8IjhR8QZVRe91S1NW3sVYbfAPqGYaDSAZw9FUOWPe71Vxp0oaDCUqoqZWaY4tYrfBrNLFCWPL1hUuO4/PSAiyGvU69Y/WogJvi9pNWFxXmiy9Hyj5GEgk44vS3A+rQKepQYQGWK1zFN9/Vj9N9oLqGvCmEirmyTuV0UCXgyI0TTTBoaDWfz9dNTWgFad4HKo5vd7jV8EAtCshHV75KRt0jhFuXmke2MiJg0B/ZxcepOBS88R6AX/tjewIedVjV8A+MCASr1teqI6GbhhAKBkD5UkbADkZmEsWmxjn3P0atYyxeQu4JiNy/AY5ZorgiIKOPrZ+lyrRIfqHUcB/O3P8EWfMpWSw97DZ4vtJYodQdYgIFC7+YzzY7THgMSX+sviqaZSlTlqU7cFx4lXJsfmBTFWgQdiar3pBckv2gFETbZ/8nimnvhNiYx+wZHf8RDdBjte4F1lEM++mdNI4Y8ZMfQarvuHK6l98EOWIK+djevN+o4lvO0gtGPlWcrs+Rv1oQXEuHMcWpQgY81kIA3kotpNEvM6QfeKWoDxVfoi0BP/BiBoSmlGTyIABfMZU3VoKF9NlWm1McyRS0lfNXsMZOH+EweGV00ML/TN6gKdhO6CYULgzlA6MKaVuhi2exLllp921jxet0Mf9rqU7rTpjmTFCbrylmHT944= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6041248)(20161123555025)(20161123558025)(20161123564025)(2016111802025)(20161123562025)(20161123560025)(6072148)(6043046);SRVR:DB6PR0202MB2550;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0202MB2550; X-Forefront-PRVS: 02596AB7DA X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6069001)(6009001)(39410400002)(39450400003)(39830400002)(36756003)(4326008)(50466002)(5003940100001)(33646002)(76176999)(53936002)(66066001)(6506006)(47776003)(6486002)(7736002)(8666007)(50986999)(54906002)(38730400002)(50226002)(86362001)(48376002)(6512007)(3846002)(6116002)(110136004)(8676002)(2906002)(189998001)(81166006)(42186005)(7416002)(6916009)(305945005)(230783001)(6666003)(74482002)(2950100002)(25786009)(5660300001)(2004002)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:DB6PR0202MB2550;H:localhost.localdomain;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DB6PR0202MB2550;23:nEOkt7EVqbx+jNd9TgchWG4OIBDltDDBY07nMb2?= =?us-ascii?Q?AdbA4kKuTTFChyXFMs/228SrdVIxn9IRqrH9qJOHXKJ7GO1c/1GWxO1ogVTH?= =?us-ascii?Q?kMOXteil49fMczrzDc+5MfDuPzbyGuv3LzPbQOR43dGnSlZUg1KdpjEfyBti?= =?us-ascii?Q?OS1BbhtbQu63CGy925EzG820BJh6QVcnwoSUxJJLn+ZE/nfrFn7EV3mfiGHq?= =?us-ascii?Q?CK83XHhsPh6wG/0vV752HOpZPZu+fJxQAWguXgObov6S5CEowh0O50hWMCwA?= =?us-ascii?Q?e4yB0HlPS2rNFmdFFyexbu02DRLdFu7Mup4qYP8g1MsgMpXoIMngTexSz1j/?= =?us-ascii?Q?OC83uUSZc5ZDmjzA9mB8LIZuaPpMZrFkCBhyu6CL+6Tr/Z0ROG0RWXB5n5pJ?= =?us-ascii?Q?kTi9zbFOb4UxXgy6qvTz2soXbvlu22kra90pEmSiQR0s6khHqzca7oLtfs25?= =?us-ascii?Q?NjXeFtX3z1dN06oh8QYQWpdxv3X4yT2zxJVfUuVzLhOo0oxdmLfOao01J9QG?= =?us-ascii?Q?iDXTuMyPqAlC7HXNXd82LlSywnulnLAkMDbcMdmh1dtY3AcHMVD2CD8hsas1?= =?us-ascii?Q?YaM9ly9ciY4drlr12nabixGxTA6nyRe3rnyv4YEoj9d9260ydoWF+XsotXoo?= =?us-ascii?Q?41n7Xtk0vOXfd2fUS80CLT3HiAQCjG5BsQha+CrHuGhhamLl6grhjpqXN3D1?= =?us-ascii?Q?aEzA6PL8Jx+5ygjhAcl95zAJgcJdlzO2lUkbOUgdwND4zPRw6c7OdnPPTF0U?= =?us-ascii?Q?5vKw8aCkVugxKQLkf38eifMIRAr+v0Y9CgB5siXVhgWONn7qtiSSbNjnso9z?= =?us-ascii?Q?n3WB6/L8F+TeKDg9iAoc6SUu65se7NWXaS/0fyouO2MaY1je0Vl1ITGC6NxD?= =?us-ascii?Q?WzYtDJK1VG538SQ31+DOtS4D5V9xy7ULhN7VTrTSXKj2PGNmqSvkGb7SFIXl?= =?us-ascii?Q?FaMhp6ovCOY2p/0c3Dut9BkuCOr3eKVX7olMTGVEqWWQWNtTBpSFqhfzhv+o?= =?us-ascii?Q?nztvo0CCfMxH15AyPno8AsGZEDCFv9njakQPdM6EIF96alvPY+hS/uAFApOu?= =?us-ascii?Q?odOeB0yt5hYss8hy+ZYbTyZF2yoodmkolGl9mEc9HmCe/7hbWYCvIUnSoozi?= =?us-ascii?Q?Df8dxBGWJ8kQ=3D?= X-Microsoft-Exchange-Diagnostics: 1;DB6PR0202MB2550;6:ixAlMiN3iP8Hr+dsWb3ij/K8s6dQG9y+CnpwkBlMJO0oQ//7RIjqooZuZYKqUUVhiqgrvqAys1qJMkoElDuWOCNSEsnguZK700aNN1L0U/tpuHKObnJRD0cw8OVHcjMf9g+EdOUBI727uSf0/d2qB7qnd0pttA0Drd6G6mre+U6xvhhUGjUeOI8kIwG1bkJN7bqcuzR41/a4RimqfQprQ63feJYmlbW5oFC5cAm3di5NtsiEooZ/eNlP2A4o6nt7myFcjBbX1pb+s6GfXgqWyH5mfdRQTH9vUITPkRKpJhP6mjPAeXShy8VYjWeE3mXKlMDm36z9WqFUbDU7ztqSnokbWtgUqco1SPymx5EbSMy6nkfo9PDmIcgEzVwTjPodC+fk1J7+yCFSYsWmbWOesw==;5:8gc+tRn9aFR1UBPsmdmaTpJcVlWgVxFXCvZSpJamgWCNLPL7G4p95gOXMJThFvZ2BAFUanBTcarufBQPO/gSe3HJbrmbhDPwV/XQ34tIGNkO1bvVlkYaI4oSweKo4CbP5KW9Y4hQvCqg9wBUD7zN6Q==;24:lNEBrj3rmccFI/Ebx7gjB37xEOqj+duzClX/zmx9Wh1t5B6THEb0ldo7Fbuu6C79ZYFd9CVdD/esk+qryOLIralJ86sgdpWNrxR554j69Pk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DB6PR0202MB2550;7:oCw+2iO+h8JFAbLeeFsaQeqBpT5HQ6iFOTdRGLZncFkqDDkWnRstqSvzll1+C/y22XeEuc0vpD9tn/r20QgK0nB9OJK2uNqpFkw/kbAO0rzfXTxWTGFOmkALi6vtULdpbZR8+DQ3UlYqKYY+rGc7dzI+BbzuX5Enfhq9AyWiYldv0E/Imm/38oxypD11yfaW9TTIhHFeux0mMPN2tHFyBajxGNcEluM444OscTm85YMVu8vEfmcy8YwwkTCNDonF3BhAaAsvTkUNbBi45zuOrzx/lLdsl79wWrr86cAa16nO0zvwFtoWFFb8uefVokfRpS8W74uKgQ4hJZt56MQo9g== X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2017 12:16:37.1548 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0202MB2550 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..fb23b2278462 --- /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) { + 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