From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755078AbdDMQn4 (ORCPT ); Thu, 13 Apr 2017 12:43:56 -0400 Received: from mail-eopbgr10123.outbound.protection.outlook.com ([40.107.1.123]:28087 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754705AbdDMQm2 (ORCPT ); Thu, 13 Apr 2017 12:42:28 -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 v13 08/10] i2c: i2c-mux-gpmux: new driver Date: Thu, 13 Apr 2017 18:43:12 +0200 Message-ID: <1492101794-13444-9-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1492101794-13444-1-git-send-email-peda@axentia.se> References: <1492101794-13444-1-git-send-email-peda@axentia.se> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [81.224.171.159] X-ClientProxiedBy: AM4PR05CA0010.eurprd05.prod.outlook.com (10.171.184.151) To AM5PR0202MB2547.eurprd02.prod.outlook.com (10.173.89.8) X-MS-Office365-Filtering-Correlation-Id: 9a80fff4-31f4-4fad-69d3-08d4828c05b9 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075);SRVR:AM5PR0202MB2547; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2547;3:lu8103K0xQgyrBNtW48F2rP1P2dMz85jEMpjMxi5/oCspZkNyqmIKRlwaycWpR7ZGhjMcs3fw4FUy2tShKRZ2jENsQynAw1OHyberlvfxaq7op7ovpW7Vbc+CPvNt8Kuu1tHjmOgbKlPhCflQlJIYpwBtpdKegfSBWFaTr3wEKP3B+YuTHVkpgrAg0qRRmy5dE+G+O3FECNOwuExYciA8ryf3B4K5sehzgkk4Y6lCkUD0AOqr926Lj60Cc3+eCxobsDSpkv12e+Q5GdJk37Kk8k5AlwhfUQamv7/WL/v2zY70tzSXgivpgM0/dy3DD1X;25:BfJIxu/kVwBcISCRsb2QdHbwDkxwOfOv7061L9whcGINuYFfIUfcajPxnNyvaNtnnuxYSiGKBYvOh9rS1FnhDjtjlWXOo5vfkx1p26QnjEq446x27UDg1poyML0B6gMxFd13l2qASIKN6oiysiB+WpJeZ/lQizJYWnPbIccaCZ1xrwTIzF9gFERjKFO+qfhaTS4LbPZ/KDkk9LV8FGkNHtwOnnk+jtqQ1Vig59POtBxTZpy8qMzSgwvSlB3XdW1eLpRe9tQay4qG6eH0SIh5L+XmX45q2oDJJTRRmEHgicMxT09S3uMNeyMg2Vm/Hr9Ibbgyz/D+5xyEVIKIZ1u2pnWKZdmIg1CTbWjzvtJlIvxOlX+HKpBg5LzgDhLGj+vTdqTpMmEonM31Ip6shP78HBjfeiq6J/IerDbBMOMJFav+xQzXmr4w9fkFx1rEaPsL0JdihyE1r4MtZpsDLoJqjw== X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2547;31:m0Ugn7PorktIVbUrT1N5hFDp0pW/YO5s38VMXWFu45+OJ9vHu4mFx56ZFw1kMD3pJf8bhB6HddECOgnH+u/EE4iv23Y/LupgZvNqjs4YEKxMytgxdBEK04wP8x7n5gQUgFs3PGuk97ROPRigQO2cdWcW7PDeMeV3N7hJYd2aQ76vVGcSmWcrrbFhi5QDHNnszqFM8ObZB/h+MAymzcKbjXt6wPiV3CKoeZwXyFRCMHw= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(6041248)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(20161123562025)(2016111802025)(20161123555025)(20161123560025)(6043046)(6072148);SRVR:AM5PR0202MB2547;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0202MB2547; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2547;4:8eBEux9KvJ2aowXGiuH0+PMV6UZhOpHw9rKKe6jHBqt5kuVWMo0piLik4SfbRadk8EYbiaoRpESh078LHusLHiEpLciixQisBxG/p+xKMxpsP3SjotrFFLetJLFnjkwQlBgxYmSO/8IN9hzaTCgBc2SOpiu3tZp461duGuwK8sDlnuX6VaH2ffNsg/ENQyeIBEuNghDUv92MTnTMDfuhn3Q4MxDSs+29qFMsQ5c/zNohcGgTmV4ZnK5OGzfsl7QzlUOKg8Wb1gClsAFsmMZK3tH0k/YeP/W+RRhQzYLJc4GzU151XJSD3vvyug5pg+Zn2lc3Ix/SRmXoPOjFoZMyOa5PjTF1FSKH2oPzkqtx7Vaun65omZsVc6RWDwYM3kI57dT4hQcy3YfLMBlBuKidpgdvZZ/+ZwQz9ZUvvnil/3L7neAif3RXfyORVmqLA55Cn87UVfRnH7SPXZOyxgswhZfumN5k8meGJNY1/i8FOrDCRdXEwX8QPRytLXcdU4NhfU0c+iiFXYVxq7p3Q80qxOPukSeZsSNbA2yiwCQW0yO8JMMn7FT7I1d8QVTFwqxL0mw1xmcBf0JtyMMwIk+GcPgWO+YTk00iP+TId5yhO839rjkKV+knK3qU4SwjOxlP2AxxC15s6VMNYP3aICwdBp+hNtWhYCkVH02gSsT5sXWWUd6xEENRFBo2903P7gcqI80cBaMw7zwAznbbaRi7LCUx/KLUdG7si/0O7DgUde+qrsgfesnQ/Ua7hyET/fNo764JVFCu8XYJWj8xjYdY9Q== X-Forefront-PRVS: 02760F0D1C X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6069001)(39450400003)(39410400002)(39840400002)(4326008)(25786009)(48376002)(47776003)(50466002)(6116002)(8666007)(50986999)(81166006)(33646002)(74482002)(86362001)(189998001)(66066001)(3846002)(6486002)(230783001)(6512007)(305945005)(2950100002)(6666003)(53936002)(54906002)(76176999)(7736002)(5660300001)(7416002)(42186005)(38730400002)(8676002)(36756003)(6506006)(50226002)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:AM5PR0202MB2547;H:localhost.localdomain;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AM5PR0202MB2547;23:DZ56fcv+HAabgE9fSGToSEgqZiBtIS5/UV+4ZPb?= =?us-ascii?Q?eqNHkLxfz7iLu6WBk7dMrG1o9Wpc/3DIXazowTr7pCX+wiy1Ptwo7mInZTdn?= =?us-ascii?Q?rkRaAVxt8EnZ2a7w6bjfacSf6E7oPoIh5InFMltQfS1GblahB2CzZ9ejtu3A?= =?us-ascii?Q?rl81ci/j74ygg+VceF/dILDIK5sS0TYSdCBNm716x/87k0wFBuY7CzfTH/fH?= =?us-ascii?Q?BER9h1zP6Migc2tsM0N13w8HsQSZdJuGINqrFWfimQXoJtbgUTruxzemnAP4?= =?us-ascii?Q?qVZcNhcVZ40qlDzYVw9QigOmM7sEKLbmLepuhuvV8uKV9jTig5RO2jkSmp0/?= =?us-ascii?Q?5iwQ1UjXPTaVOIa1svMoq868gIIMCfopgfc3I8J1iyjDyFYIXHuHZ4/ZaREE?= =?us-ascii?Q?sh40QaVoCtHJ9DuDe/3vfOXE3NT0lk/KtOxb+Smqt3NbPJJFlZ7otGKjd76Q?= =?us-ascii?Q?YGRMfGSvG6nqwNACr01PDqQUoE3nKKMOI4Rt0Dh68siLOXUgnKSx0Cw4cQpu?= =?us-ascii?Q?y1NV5VoFVO9+uZULJRDkUREZud66/zou724Qp7Uih3pjrWZp51VMV6106tVl?= =?us-ascii?Q?R9CVnLNcLf+jK8J2cYUJFGYDBZ8pVK129aVCWLt9eOr/zURAB03yVBRZ8wol?= =?us-ascii?Q?f+TUdVb9PQVnr8ZIwRE0idDGf6HKdfwQYO/97/h7Y8H1sCPqCAV3JcHHi+kx?= =?us-ascii?Q?6EDt3fYv47A9W4fW2GFvEyaMY1UBLMTCupkSJmxc9ZkKYsa8YQ+SkPZHHSTU?= =?us-ascii?Q?92tFzTXEx3HSECwmrfCCl7abRpa2jIvVWsAY1A+YpdoRjIIBSsNdJErTV6Gr?= =?us-ascii?Q?udqN22qLG8ogmj5eW1COMZKVvadleXsmzbdAqKmGQsBq1WfbO7TZhq/s+4Co?= =?us-ascii?Q?kcgWkmoFldvtc/1uQKz+5AUCYHCtDRA+9+KiS4aXxMI5+qAEVkXJJnoTFcLB?= =?us-ascii?Q?K1zxkwpQZLl9f3E3mTIIKVD+WWr17wTe6dTsK8g4ylTF356vIDl3rAQKW6zx?= =?us-ascii?Q?27u4=3D?= X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2547;6:NMeLSG0kp9zVM11up+8MH7qnkyENLqnHNMw2FEHJyCXiTSthblN8vx1ngln5o85vwy9ttkZ6/sEOhlnSr251dibPRf/rjZpKFeFZ9BYb680gBVBcrGP6q9XetRSyr8sF9hHs7fuinRbOW35+m7qcMXjcScmavYsfBTwkZTFqSDzEAL63tJA5PRP4+jLgoELUQW3qbLjiyZWV+f6PGQgSxH2pLBPhCmISRtxxdWp9a8Tw4uIpSkqSCfMHwDg7C8VmU11oMkqeD5FziJhYJ9sTIII6vLHRrEDKYK4/Odgk2IZVGNlMSjwdjgucINfw4iDqkZP24qWJ3hGTK8BGH0YL3OBirkG+LfX7r8gWMuuOqwEOSdjUUVwh7PYBbUv8jMPD+aHKjpAUNKOPgDqNUPeWBZFY9hPJV/UmGFM0kB607AzdndVfHfU45sTHQ8RjzCxZ8++1JQnEe5Agw4Jne6Sg/A==;5:dm/Ned7IrZbwcOuucQuAwwI1YrB/8HNrfH+F7+6Iflj46HRcz5gGgYG0mBDFgtptaNCpReP17YPBOQEABkYnKmyc/+tDXWW2QRv1F4OU/iAXKbZ2NRgxBcQivrTNiBUB1r65Z6JDyBuLd7T0Lc0qGXu4rJEDPtblGyB0lUbdNY4=;24:DVriTfw/hfcRd0uP1o7Kv43d4vl32qZDK60xav9Jct4KHkj7/pFTs1lxUZeK8vHudONfZMGjurnaGPq56Z4erZGtP/12EDrGn+77CMVeZ68= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2547;7:nKnqT1dogHuDer7LaJ4OZIwAlFHQfLLKFZiEme8Pxn6afgNYZNy7b/kw3+J75sS6q+IvzAJOpRFp9LL+CQJbYkHse4o0bobkcn+XLW4huYCIOk1oZSrNUAkWkxj69s2ME3rLjk7S2pddx0GZTYNREFZsqfeWWp8/iUCB2LNKzymM2fSI6HvwHgPrDFOUR0MA05r6K54Is2WuuAfnOLkEBuuOKrKUaFfzV152mH6iTH0jlyQmOfHHw+WgZZIt1VqCwcAcQnWvQWLWYStTUMoETztWDOCPr52tDCvLbJ0aH+XZ4rHh/dT8/OagyB+a+xY0I2i9VKMAmHuL/eAvHgkPvA== X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2017 16:42:05.4269 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0202MB2547 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