From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753191AbcHONl5 (ORCPT ); Mon, 15 Aug 2016 09:41:57 -0400 Received: from mail-db5eur01on0137.outbound.protection.outlook.com ([104.47.2.137]:2648 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753131AbcHONlx (ORCPT ); Mon, 15 Aug 2016 09:41:53 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; From: Peter Rosin To: CC: Peter Rosin , Wolfram Sang , Rob Herring , Mark Rutland , Guenter Roeck , "David S. Miller" , Geert Uytterhoeven , Andrew Morton , Greg Kroah-Hartman , Mauro Carvalho Chehab , , , Crestez Dan Leonard Subject: [PATCH v2 5/8] i2c: mux: add support for 'i2c-mux', 'i2c-arb' and 'i2c-gate' DT subnodes Date: Mon, 15 Aug 2016 15:40:28 +0200 Message-ID: <1471268431-5148-6-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1471268431-5148-1-git-send-email-peda@axentia.se> References: <1471268431-5148-1-git-send-email-peda@axentia.se> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [217.210.101.82] X-ClientProxiedBy: DB4PR02CA0038.eurprd02.prod.outlook.com (10.242.174.166) To DB6PR0201MB2309.eurprd02.prod.outlook.com (10.169.222.148) X-MS-Office365-Filtering-Correlation-Id: 71529e22-9086-4c80-882c-08d3c511e114 X-Microsoft-Exchange-Diagnostics: 1;DB6PR0201MB2309;2:lSeMZHuaHAU+Z3oXkfpPsse2wHfkDWxRumvFDwH2Ix4zAxS/xZmT39GBEltXq6iU/pfex61N+JIP+UnFiXnHIQPG//FdXrs1uEw4iRdxDqRv883A/A80ePRjtg0DwH2jETJ9X4vumcNGoHtx7Qy2X8ZHTSOlyC75n/gGB5OFa4GLIFmvvRLNICwXeHigpQU1;3:l3gkxVMLe5J6iyM+8tOR6FMC/ENiIa7x/tXvqyxXlU21+vNhA1eLQUNfBTjG+h03fZduf7CWvJij6RaYHO+oOifPwkpoCbDuPxS1qc02FNJPvP42Jc2mxsGWzhNsu4Pq X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0201MB2309; X-Microsoft-Exchange-Diagnostics: 1;DB6PR0201MB2309;25:/1h14BsSc78FNY7ToVViynORjPDvjMJ0WCmNmgr2rLFRViypEA7KZYCCrBIaPib4hZuWtfL8aQgDA4o+h7NY5bcCsszegbuK1c0ISRI16hD5mGbsCxKQUB25/rAuUzl98sOetQbPuPPkgfrUvzOPAhyTR5FmV3RPuDizDLl2T6YGctVM2WQvYGRu11mCXDaAJaDY0GOQCT8KBPn90Jmiu6NkffQlI/9PZNnIOV8C4t6q4Rqte2yUNgrAPZeodRSkimDNGOYKEKDVaMmjTcOPEPYFg8ECSq1F577ng4ksCEEZlKwer7szjMp/CoRRLdB152CPvMres5O4E9GE7euczx2rIZVMkPAHTgWB88RIdqE2dPd8FgS9MYkDPv+BcElcFk0+DJzBxXXlTRM3JVOZW4tN+fk978sPsIX3L+shUlG1XhTypb9txd1TOe978+KrQPAdXSNoqqPS4K2Xb0/mYkfOmauWdBatfbs0Ia1PKxPeY1POS4RqojAJqJSms2NgFcY9JiijcltGx7D2K/BRKBHqocr0NB7MmVNAMuiuDfVgCX3zpHQU7V0cY1iO8++d5wvrkYQyyOBC1BBhvfRRne0lrhrufOlff7P9O9Dp9hQycYdBssX0xdzuAshQlw6rZo22YqfVG3P9DHkXVcfac34FBsPC/D2MRBpmgpEgAU/PebZxkKXgl4en3X6t7l2agTB1EC8dd3BdDQG5dtCpmA8YpU1sktIAzPdJbvSpC94= X-Microsoft-Exchange-Diagnostics: 1;DB6PR0201MB2309;31:lOTl0KkWtazvSkQf8EWhjNj7DrAgJwmCwWlICnuCcotTz77fT72q3D77+bBxvKph+nBLhgh7TGR5egP2c/bGACwKjQVlpLsExBXyEh6HyiYE6Jl0Wg051yAEL3iJQ+VZ9tAISuCJycETYzjfemQcjOJzxmHQ3ok3SaaNsTfuQDs9ql+8r7ucxhchElHOsjyZJnc1dP0eZiMxkM51kPJ0kkVUEphRTc2KITwj4VElZLs=;4:7fVVmObrcnrKtAAlo58Qik7mGnAR/QoB/UgM8mZ5KwJHNqpUX4mLuA+CoBPnUl3Lb4bfLgxOTSXIaW/yNKPPg7akSb0iIRFVr7xtMzd9H9UWcu3Iw6nNl8Vz/4aX4moM08JYXnmarBrl9bmAsaxlROMXR7HcPBjtAmmy8Y64I24SzvB1Wy4Xeg0qQeJ3UtRP7txpw6Rhl/Le1EwFK+KLIMk5URUsHREv9oA9kBfp4eHWEKAe921HyfQZzknao+1kMHCwn4nhNiKlkY01e47lg1VAbSI4diA0JomaQYX1EtchAaCyLVBem6+iaJe+ICLhtvsEfxtYzpM7Z73mkIme0iA9ZyU/axrDJUaRjzf6auNuz0xfL/W1i4gm6nkfDTkU14PZUDtytdLgrAVNOlPcqMH2AHa2Egk3e2Xs7rAV93I= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6042046)(6043046);SRVR:DB6PR0201MB2309;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0201MB2309; X-Forefront-PRVS: 0035B15214 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6069001)(7916002)(189002)(199003)(19580405001)(50226002)(106356001)(101416001)(3846002)(36756003)(2351001)(77096005)(74482002)(6116002)(229853001)(105586002)(586003)(19580395003)(189998001)(86362001)(42186005)(5003940100001)(8676002)(7416002)(76176999)(66066001)(2950100001)(50986999)(48376002)(68736007)(47776003)(81166006)(7846002)(92566002)(33646002)(97736004)(305945005)(2906002)(4326007)(110136002)(7736002)(81156014)(50466002)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:DB6PR0201MB2309;H:localhost.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DB6PR0201MB2309;23:2JXaRdu4tvSN+Ups/yiX4wpEWHpUI4EVNWfLE14?= =?us-ascii?Q?cNbvw+gnnewykME/wANEaqEZGKLdrVhc3TdmPDNSJ2IY/qiYwwvenM6lHWvw?= =?us-ascii?Q?AOyuG+uw9yIPsDC8yXGrSfOVUa4+P02PvwRgyaaeQJkEWPAZHbKvlSkbE2e3?= =?us-ascii?Q?7SOAW6XawoT1Zbkxm3468MV/VM9mhR5c5eLyLfId6Za03TiEHh1nTjTaHhJN?= =?us-ascii?Q?a9pLvKH2wykELd5i6ZUuVz3d0qaL5Zx0U5dycZZjRemta0yMv2bd0YdI8/hL?= =?us-ascii?Q?XWkyHl9ZWAuAcMtH1kYh7Om2x3GGrqq0ymQiywdGP2np8DXQeSO+jCTwwLpz?= =?us-ascii?Q?3jh3HSijh+P1Tx+qbpjXICyu51Rg9Q+HZ0rFSqJLnNGhZxH/iTOuafIjPowX?= =?us-ascii?Q?6dnJqiYeUMeBKrLfj6kxuwbeOvf8aLp79YisoD5kKDcxqNwEOpHKGaARMFZT?= =?us-ascii?Q?5fYG6ByXu6E1Hyr9MGc+hbCt9YvCi3+kq9tVLZ9h4jiM0gIjQyTJDBBSEb16?= =?us-ascii?Q?zk+bXnFs501No64u5nbZCnQxtP9zr/7/aHQvhsL2Jned7heLaz7qQfujNor6?= =?us-ascii?Q?6VoNpGc6U8tiwfwGfWHMyxUZcEfIOrpMsuvGNBb/8+d3gMi3NoH2jSq2o80F?= =?us-ascii?Q?+k1O4QvPIpjWMEVlk3dRMGKqQkSPQMU/zYTZgfpCXCjdaN5KTvELQbthZqR/?= =?us-ascii?Q?MFVZI4UWndDRxiM9X8kgFIYC0FN6AKeDMRQqefn2vDhveXzINmIazt4pg4mv?= =?us-ascii?Q?oukTmc0TLV3b3mm2xZeyo6YAKeRSAVm1Ndz1/tW2lpWiudw+GIV3qHqx611b?= =?us-ascii?Q?+QMpfRQwSN2NEpERDWPTrvQ4GKkPcgjK5tpBw5o5Z4myLENViIHQjaPWHhV8?= =?us-ascii?Q?PUpx9Tpa2E8sI4hoEbkUdHspxM/ajROPN4Y6bBGG0u/wa36NOinBOrmVtsHu?= =?us-ascii?Q?hWx7UmMtiSMx7VRYFdPrkG6MRHoigTy1Jw6PZuF2UTO1PRqhBwcMzgwIxIBA?= =?us-ascii?Q?4EUpLk/tqnVo9yWznuqoj1DdjeRHKQ3EKY6dxol/Ebm+6/fuwWXBqHd5kjnm?= =?us-ascii?Q?Y68hxEkvSViN44kZqROvhowwlLI/MYjNyj9FlBoPiY2b3rjZESB4Ru2zCvu8?= =?us-ascii?Q?TOBE7TCR93/Xj7D8GD8Xxm7s0q+LZq3AL?= X-Microsoft-Exchange-Diagnostics: 1;DB6PR0201MB2309;6:tG+FQrRBikyoPi3FvbwhyMraqKiKj1DUPyK1ytlyHpY4e5P+I1gCos8mxIpuMSbZltDhAHG7bHM9xV3s/YREX3U2KuVzvycGhb04R9uUbvFDLJt2YBWaH4/j6ettebF6pIlpdlSpDEKNB4BbTwA4bALtL6CgDuXorvm7DjIQf1z1PIbwSoVb7N/T2uNnnwR4iijo31uDhTgPsifenxjyyrWrpmLxkjg2p+lxiYWvZ5P02LsrCkiagMKtYRvZJ9pEz42OzMTYSgoI+I91OqiAp1jUis28RJ0NhItA09haBWBT6KEO3a3V2tRyQU1mP8fn;5:Rj8M1U0G18Ar34EvFCpuFdeYBu8Z8YEBVmI3PJLgyMdaQspcUO8AjcZXOvfBnUUjmURu/qv/zb5yMpIkA0VJKSVeDscwumlAvcwGUPHdFry9/gCBXTmM9ao1d3D3euS1LG0u5v6BgaEOIdlDdXewig==;24:6cqroqKxbEzyyt8lA7sWt/e0dZ8a/F8ayzjmR5LslVforqT7ZkopmerHIRp+e2J2LdcbIfSKee8Vp8QA0JzAmeo6rBnvcfzUmAJiXkdagIM=;7:o315NqqSymfdDnQwCYXmLEGhBEU1iw8AC91PoJsmNnfau0xw56LMJXMHceL7F4CcsGYE1H8rNd3tfzfMuxnc1YWlxnlYzn6R37sfJBn7U87csh3u5JH4Arp2QE1vvB1w0Mt+eFEkbTWokGjbcsA5dwHDpWdsCVVXR7HD3ZCygnB98EFiUO+ngwyrWMwuNx2XA93WY3fCAw4P/tw8rvoMQpolZAAy57OtA5s7Q0MdzG3MvLLw03ZqNSUENcs7ZpQd SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2016 13:41:35.3072 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0201MB2309 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Backwards compatibility is preserved; the subnodes are in practice optional. However, the mux core needs to know what subnode it should examine, so add a couple of new flags for i2c_mux_alloc for this purpose. The rule is that if the mux core finds a 'reg' property in the appropriate subnode, e.g. if 'reg' exists in the 'i2c-mux' subnode, then the mux core will assume that this is an old style entry and not an i2c-mux subnode (correspondingly for arbitrators and gates with 'i2c-arb' and 'i2c-gate'). Signed-off-by: Peter Rosin --- drivers/i2c/i2c-mux.c | 44 ++++++++++++++++++++++++++++++++++++-------- include/linux/i2c-mux.h | 8 ++++++-- 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index 8eee98634cda..c1ae719d1a7a 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -255,6 +255,10 @@ struct i2c_mux_core *i2c_mux_alloc(struct i2c_adapter *parent, muxc->dev = dev; if (flags & I2C_MUX_LOCKED) muxc->mux_locked = true; + if (flags & I2C_MUX_ARBITRATOR) + muxc->arbitrator = true; + if (flags & I2C_MUX_GATE) + muxc->gate = true; muxc->select = select; muxc->deselect = deselect; muxc->max_adapters = max_adapters; @@ -335,18 +339,42 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc, * nothing if !CONFIG_OF. */ if (muxc->dev->of_node) { - struct device_node *child; + struct device_node *dev_node = muxc->dev->of_node; + struct device_node *mux_node, *child = NULL; u32 reg; - for_each_child_of_node(muxc->dev->of_node, child) { - ret = of_property_read_u32(child, "reg", ®); - if (ret) - continue; - if (chan_id == reg) { - priv->adap.dev.of_node = child; - break; + if (muxc->arbitrator) + mux_node = of_get_child_by_name(dev_node, "i2c-arb"); + else if (muxc->gate) + mux_node = of_get_child_by_name(dev_node, "i2c-gate"); + else + mux_node = of_get_child_by_name(dev_node, "i2c-mux"); + + if (mux_node) { + /* A "reg" property indicates an old-style DT entry */ + if (!of_property_read_u32(mux_node, "reg", ®)) { + of_node_put(mux_node); + mux_node = NULL; + } + } + + if (!mux_node) + mux_node = of_node_get(dev_node); + else if (muxc->arbitrator || muxc->gate) + child = of_node_get(mux_node); + + if (!child) { + for_each_child_of_node(mux_node, child) { + ret = of_property_read_u32(child, "reg", ®); + if (ret) + continue; + if (chan_id == reg) + break; } } + + priv->adap.dev.of_node = child; + of_node_put(mux_node); } /* diff --git a/include/linux/i2c-mux.h b/include/linux/i2c-mux.h index d4c1d12f900d..bd74d5706f3b 100644 --- a/include/linux/i2c-mux.h +++ b/include/linux/i2c-mux.h @@ -32,7 +32,9 @@ struct i2c_mux_core { struct i2c_adapter *parent; struct device *dev; - bool mux_locked; + unsigned int mux_locked:1; + unsigned int arbitrator:1; + unsigned int gate:1; void *priv; @@ -51,7 +53,9 @@ struct i2c_mux_core *i2c_mux_alloc(struct i2c_adapter *parent, int (*deselect)(struct i2c_mux_core *, u32)); /* flags for i2c_mux_alloc */ -#define I2C_MUX_LOCKED BIT(0) +#define I2C_MUX_LOCKED BIT(0) +#define I2C_MUX_ARBITRATOR BIT(1) +#define I2C_MUX_GATE BIT(2) static inline void *i2c_mux_priv(struct i2c_mux_core *muxc) { -- 2.1.4