From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753029AbdC0OWX (ORCPT ); Mon, 27 Mar 2017 10:22:23 -0400 Received: from mail-db5eur01on0100.outbound.protection.outlook.com ([104.47.2.100]:11432 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753492AbdC0OV7 (ORCPT ); Mon, 27 Mar 2017 10:21:59 -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 v12 08/10] i2c: i2c-mux-gpmux: new driver Date: Mon, 27 Mar 2017 16:22:03 +0200 Message-ID: <1490624525-15865-9-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1490624525-15865-1-git-send-email-peda@axentia.se> References: <1490624525-15865-1-git-send-email-peda@axentia.se> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [81.224.171.159] X-ClientProxiedBy: DB6PR0202CA0048.eurprd02.prod.outlook.com (10.171.70.34) To DB6PR0202MB2550.eurprd02.prod.outlook.com (10.169.211.8) X-MS-Office365-Filtering-Correlation-Id: b1ce1937-b7a0-4b58-7844-08d4751c75c5 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:DB6PR0202MB2550; X-Microsoft-Exchange-Diagnostics: 1;DB6PR0202MB2550;3:c5jEPENHE0APbzOzk2HBlCsY4rPa42qaTlpY1bZyhB3sW980uiONhZV1BBmJBhUxcQ2uJl6RsYeazrGnq78zg4+sAPNukBUMxrb9KCcZ9A0DkAzd61CASl/D01ayvmla3eb972F6wE1Y+xJuLAMyaaX7lyR0pnYtHgTKXeYSLmmREW4d0VBD8ecYHIO1PSA3UyEYw2C5Yn4PerflPTE7EyceupAtBEWfUNr4rMuW1NVJPMrcw9+D9e/sKz2GMWdbxnOrqKGDAeK563umteyCig==;25:W3T7zL1JXAxOeLVrkOrzNRUI185oNowiZcopxflyaCboWJzxb91+lhH2tBlvqcQmb04CYHLCFf31C9ZC+d1kxbgsQo5WCBDB3i9F7vQD/d3o1N60EB9LPHaf3MlFGd28M/aOfiwwEwmlTWfeAV79VozUBsPz6FinshxCnWD/ClVQgjtcWlXcZAFnE3AttYRIFrwHY1HMxiiixeWlKntR/J21ZpnlbLAoXOTvI03jQOYQy24N33DjpkEc0EtDZaG/colY17Iy42lgKnaONF4RY78/adMkAIWKbqC3unfPQqb5gWRmJWDMOFx2+oPAY0WWlXX32hYoDIQZty4l7k2HOCKgEUL6mTAMecHwEQqF4oP6cGcu7+8X2o5rf13pFVr87bujolzFDWlSe09YXSYVlzDjyRarxo14Io4z/YDwLWIPxajT0VZ7HxZPQoUpssPTkKKa1bjEirBVGa4ggRg9ZQ== X-Microsoft-Exchange-Diagnostics: 1;DB6PR0202MB2550;31:42v4SNlEp/8mUST+qGB6yKGnDYJbPkdj2ezchSFJhCjqHcVAzcezpbsGFFenYPXbJUYRajaghWa7TRvGjBv9gJIyM+0XQhtOnS8H7dm66O2slBDt6Qzdj1NpHagxl6aMrm8UpXVMq45d0JUP5GgYX+wydJIQNSMxs/1HqQEBiesujQaYAX4OV6Xdb2gCZl53gQ4EO2+afMPxv1VjJiS10JvAnzM9xlxmCh+ZfLovRRs=;4:Il3KlsPCCA4KnMemMxdZryrw9Oaoe1bCVdKYdZI+aAhf9tk8Bz8s/kvaEf6fUoMXrokGgzgvMXuVeLeg6h6Kcs0g9+3O318cYk0lQ40huAx4vboiZ4+EoT9uKy/185XhOFStIWp2Dq1S7nljeQMDzSZTVv6Ip+Mee3NI+Ekce5GZ9RXU8tDO21Jaik85OeabRVs+/fIZzJm8fAs4ahIB9J5a9zf7C3iBmxZDEv84up9RwiBkbF9hIkLY8PfirKlwcpeZxLCKAlV2Gemhu1UtbDX2k1Fno4EwMuXJKsjeXj7FPJdzduGg4QhKyIhZFoE2DCPCw/zaigXbcDRilqAYl/tXWJ4o2vqTlGNGsOqYbwNjU47C8VEJNJ2x7a+WZdv7WVGtzqfHtzE9f3TqcyPaTGYJfX/mRJH9EiiyadPZqsHKstJG2DciyQOZFLi2QePbkDY4FMEZ75qCSI+xLCX56Tem+Grk/U2lMPkq3M53wL/FFtIDrb0blvjhftnnboSEqqtg9RZmoAl1uQWBm5u1YnFTi9ZRWtCzmvqrlA590g4I9HoScQ7P79/qLNK2jCD2KId2Kfpnz3uBCeSttBv0icu5creTuNi86DoC3gqVajTIUOIez0rqJsP+owihqhv5zsr3oWFLr8B9/7ye2YxexMjuo2BbWPWe+cAeuyNmLdg= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6041248)(20161123564025)(20161123558025)(20161123555025)(20161123560025)(20161123562025)(2016111802025)(6072148)(6043046);SRVR:DB6PR0202MB2550;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0202MB2550; X-Forefront-PRVS: 02596AB7DA X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6069001)(39840400002)(39410400002)(39450400003)(4326008)(36756003)(5003940100001)(33646002)(50466002)(53936002)(76176999)(66066001)(47776003)(6506006)(6486002)(7736002)(8666007)(50986999)(54906002)(38730400002)(50226002)(86362001)(6512007)(48376002)(3846002)(6116002)(8676002)(110136004)(2906002)(81166006)(42186005)(7416002)(189998001)(6916009)(305945005)(230783001)(6666003)(25786009)(2950100002)(74482002)(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:pcQypqmizUW8hda+abvQAKkhaZW/jYYcucN7aUU?= =?us-ascii?Q?07s6p3zcKqeY9GyX20dGTfGgySufeCk2uxYF13/XXLfiQ910fjAmxdRrUexk?= =?us-ascii?Q?oacGwllf22mxQ9l1zBvizbiCE4ncVTxEo+vmVxkFn+ApDXzmFL8dpE0UNBfU?= =?us-ascii?Q?smpanvku83Uy25E74hNBIuvdXlTbLCXKhyr6vMn8+Tqpqp3AjbU0jRVMjg9t?= =?us-ascii?Q?QiBGb4+np0e+/M1DXrpeBA92MxvSSOv6UHiphlqt8cOeFS/EG4Om+HukLLMg?= =?us-ascii?Q?Yblo/57yBi6WusZwgI8tz2FdKrLCfYXfRVAz5iE85lCA9rfIPtZgmVUlHc0n?= =?us-ascii?Q?bjsniW+F/yhNkezrvZWUK0ELbj2svaF64XqyzlAnjbKJLEayxphYTCzHeJHu?= =?us-ascii?Q?s65eWSURqdNDcl86rt6OYOyZTU/xiGFdeXZEpA6J5XhRSxKSyYS/wZXJU29o?= =?us-ascii?Q?UM1N21Tr6E282m5TbtYW+eMgy+muvQZ9QKoWQpkYqUEViLGsB2JLkR6W5Ex6?= =?us-ascii?Q?gSeSqtrI6ROr8UU2APAYYtue/OgxC2SsMxuRJEa3qgNSu7wuEGM8OuIOCj7L?= =?us-ascii?Q?Xj82eKNLfNeXbyOFFYLbNVes1sUFwVT5M6T+yY6q7F7f9r7uE0iSK8ZdQxzR?= =?us-ascii?Q?uc+sTs/HHhLYT2emFY02f0bkzkonpDqv/AeiVqa4iytpK77fTl4wurPQmKZb?= =?us-ascii?Q?0NWWn7pRLBkD/YubUjXqc5wcosChifVdcceJlFevW2t7AMCtlXC9MSYuDeoI?= =?us-ascii?Q?M9/C0HPSr9/pr08aDrTUl1WNrpvxzjKfqoqiUewjl4zIzwSS9GlKdUg79DH5?= =?us-ascii?Q?OxxTphcpPVX6y1kGoM44PoNWLK81tCELfwaFdtUJimK2q+Gau0/VvoOy+LTP?= =?us-ascii?Q?Mq4GRJrm7tUZU9rX1kJ7d3g+bbQcYjiQguGekDdoGhWBBL7CK8KoAuENurVO?= =?us-ascii?Q?e3Gf1n26oBM0gPHhql70fzRV0em/eec+6jtB/MNQqIrm1TJKOvxirhboPR7e?= =?us-ascii?Q?gu+wVaWQ2x5aINAd9M9upil6t9ClamIYfWVNDo5uWtO22AV4tnSBRZNZmKbQ?= =?us-ascii?Q?uB/qkJMALtCO/oSul6MecpCfS1PIhGJGzZvJrMHFrxHd62jzR8S0X8O+XL4x?= =?us-ascii?Q?lynPqQow57ss=3D?= X-Microsoft-Exchange-Diagnostics: 1;DB6PR0202MB2550;6:ykc2RnRzeAoE6vZblHWVca1Mz+ewy8k/DGJHSdawqyyoCPYpW/LR5MQwjHrWkRpBsF4u7UMr170ifZ4NGEds4ET5fvYL5fcnyvw4h2Q3hm4hsG7D+jiXNFB1A9p+tZkJUfSuaa1Pisc/qXb1doab80U7dak8WxO4neh71n5qIf0AF+4z6lf4O0VoRID3SQoLSkjfOeynbbqUX8a1pmJGu7X1Q6nef4V7jVedx1Ufp8L+T7V03/9PDIc4UELl3163JgvquKkUU3UXL1bRH+5bhemZvsZKmUIywAQhQhKARTfCIQXjHs1spb4X2pMP3kxUELtC1En2mNmZjHtIv3uR5D1lJUZo1F80XaI2FQF0qfIMj2s30blxr/pRNsx2VrLMgQvZdDX2ENvwf1475i3kYQ==;5:55CSV5GNZB74Pyj9QC5+up700/ObA3ZSvhJm1mazmzoLCfdc6E9YU/4FTQR7vAwr2cFx3QlgLiGvm23JOK0rb26paJJJSSXEpQHZDOdAA/ZQ/K/JxTWmPikvvdTvGiIuN8uDYJFBfG6Il7TPHxKMpQ==;24:r9tOhcW+TqVxaay5auWzEw1dmulue2CP/5xpGIm7EEbgV9DaqR9hp6iNh4VzeBd30K2kRYXy0i46KcKS8srJkuoD2L+JqP2zvYYHlMh4yfc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DB6PR0202MB2550;7:9KzotJOrLgVdu11PJewREn/LmrZZ35Vv57830CKwn9nyvs6U3Y1Qkwt3lgDPKJGO2Rq4Tzaglw8859Ex0LE4HfLUDoy4RWQzsMzZyqidTMY8XC+aWBtPiZL7R/dJOYBGHcryF4HEIIHLEafalX3jmyk7+krLnWaDLjoVvCsUNreqOtjWsNytPDI9HzOR+pqb97UEZ+LjROCZCJKz/GgG1dxw4PURmylNxiPgLdAA9+YDfzgrSmMUoGY1SEj2gFTuXu9f5zc0ZcfLrLDM5asR8fgsNXYmE/5HDDO2aG6ce4ItvdEgiaBDmTRW82i7it40v3SbCUr1uva4gge6txaWNA== X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2017 14:20:44.4538 (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