From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932537AbdBGV5e (ORCPT ); Tue, 7 Feb 2017 16:57:34 -0500 Received: from mail-db5eur01on0136.outbound.protection.outlook.com ([104.47.2.136]:4448 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932176AbdBGV5a (ORCPT ); Tue, 7 Feb 2017 16:57:30 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; From: Peter Rosin To: CC: Peter Rosin , Peter Korsgaard , Wolfram Sang , "Jonathan Corbet" , , Subject: [PATCH] i2c: i2c-mux-gpio: rename i2c-gpio-mux to i2c-mux-gpio Date: Tue, 7 Feb 2017 22:41:55 +0100 Message-ID: <1486503715-9224-1-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [217.210.101.82] X-ClientProxiedBy: DB5PR08CA0008.eurprd08.prod.outlook.com (10.163.102.146) To AM5PR0202MB2545.eurprd02.prod.outlook.com (10.173.88.151) X-MS-Office365-Filtering-Correlation-Id: bcc9c104-ee72-49da-de49-08d44fa21c91 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:AM5PR0202MB2545; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2545;3:nzkGdo6kFXmXpQVKIKW6vhNwaDJovWTtYOZB7XrH2fItN1tjk4mKNQ4DgZb4maLv8LbWtJ4WfiNL6e6IOi4xn6MA8IK8kEb8vkj8W15GQXNueXRfM9GweQXuNi8XRp9qp+/8KUgK+XY+BcOf9LKkyWn7pKe7eBW1md3Au62bj1RdCIZ4sdK7wMYIVm6xBSNwbdqMllbLFtvhkNUTA32onxyUUmSFKkNo27nGh92HC3b+sx6MpbNTMvQux3ySpfJ7AV+DCIuhp/6chw/GgDZHcg==;25:g6zfUXeaTKM90XOfoHkdQqdfVeQ3H5LcT5nJDeBpNRpc75rfAwd6BFD6cdOalss1v3eN5pd2QY46XRfp+gpul9U2oqvYhVy6xGFPioQ7OWDvL9sGLYYQU9vrbEFRaDOdBQDrPVtrS8IfI1e07FASRluHGPUvZP/e+3AR5YknMIvFEwli4pMVlZNI8e5gzrLWaKEHRim5f/MPrH3SoTL/L6+02WdKJMNskOhXAKN2yDMSY2e91Wrv2clGoj7s4ST5G9IhCVc+CsJd8wJH0NQh3KsNBaJypqUCHNffFA9fORMzNr1GGsuAaq5Vwgd6AM5G7LJpLcFJ7iXD5Flp8YZDOxnfXTcHOsrtzHVt9NO5YZU3Dp4aqoqPQckl2ViScoPSquCYV+lzvITPs41hiKDqYNZtYa8uiGowvJRMahlpxCChK3xJLVNuByYVLWnhwTKAmFtzCTLEo0UjImsuj0NOSA== X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2545;31:ia0AFjfwNsCokZFFGKUtSaRkodeLUVPKcA9amrKjHzmIY7HYlwc0uiRaJrLp/A5Mm3Lef6mhj/ADolkwcSsvl0k9ZDzjfNZLwCYI/tM3uFsdEzj1p0dNzLvz/7ko209rsxS9Zu+JGjo+loJpQAjJyUqsH4bnxd/q1niBhrsRbzZxbdR+sN7Ollc/USo4NviS+mpNrkhC7K+NKBGGboojniHYpza0P7bV8q78ANb3vJnLxdP5apYpdsvaaSAuvrwweikzOMunW66/QseslDjJzw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(2017020603029)(5005006)(20170203043)(8121501046)(10201501046)(3002001)(6041248)(20161123562025)(20161123560025)(20161123564025)(2016111802025)(20161123555025)(20161123558025)(6043046)(6072148);SRVR:AM5PR0202MB2545;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0202MB2545; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2545;4:07R6Nh7/qAKMUM1eErrga6KF195NFc6+WA+MR9a4x2lb3vD4BWhhUadz8vjd00wT5oWa9u98qGDOxpMwoyuhQXMqgI2V4RmHDJgeXDXez4+/Um+DkSYLjJ/ZA297Ei0SgRGEu12KEC8eK9LIQ5pXMaB5d6pooSuv0cgh5E73w7uDLhfGxv9MYM30NuS5uBve3B5T1EuO82SDF0zje55yaRK4Dnbir8eu3X8EnrYUbvBxoYWVRhfk0+BbgGDs6RPNcwr832Di8vL66k3IsJwIydPO7IjxEkEqcDw/LHLvalJwvmisP0aSyqO8tdDGX6LBl+S747EB0sOiYC/9ow1y1oBnKcRpanF+Ua9n8iB3IoCu56rCjvBif0PVRp46LbBr84cEaOaiZtATA7uDgb1meIaiTO2wdKl9s9smi5GGd3BnT3iWiHZGnORFWUPwLIkjejP08HhrVJx+QhCAVTsBoFmUwjbMp3ekRKRK32hpCqEIdCHfYx3Ta/Qz+dCoVymenOGs3JyA8qJc77m0KijL7o136oeQaMYvd/B4/dvuw8Ujky/P08vRADV57o5lt197dZIiTj4LlukSkJuuqRUuIJAy6cECHlQAe7sF7YX01P/1yzkMPiZ+x7DL2JkLJdBs2G8WMr9mrKHIhRxml9cVsH8oTgzFaVkSz7Z6cEaAjxiMB4BaYP223e6Jry8vKoKK4iwq3E/ZRvckwJWCAhwY0A== X-Forefront-PRVS: 0211965D06 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6069001)(6009001)(7916002)(39450400003)(39830400002)(39410400002)(37524003)(199003)(189002)(230783001)(74482002)(33646002)(50986999)(50466002)(48376002)(42186005)(2351001)(105586002)(106356001)(101416001)(36756003)(86362001)(8676002)(81156014)(81166006)(68736007)(6116002)(3846002)(2906002)(50226002)(4326007)(6506006)(54906002)(25786008)(6486002)(38730400002)(110136004)(6512007)(5660300001)(6666003)(6916009)(305945005)(7736002)(92566002)(189998001)(53936002)(47776003)(97736004)(66066001)(5003940100001)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:AM5PR0202MB2545;H:localhost.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AM5PR0202MB2545;23:sWbfFLFGh61BL/9+USxickhkhEsZj6ieZLqOGRR?= =?us-ascii?Q?6OyGf38zjvfGi0Qj9GmOdH7T0SgBW0XG99VyCzw0xvVtjXTTT91FhcLzqPIp?= =?us-ascii?Q?9aOKlaLMjHfl0pmII7SIhmW3ILcv+IaGahEytDbCS6mRKefJcZ8huRu+oYKD?= =?us-ascii?Q?W2o75D7UiHrTIiyLUjEKjfiasFIVgSfNULy2bZGYRSqKXB4edBzWd1h/ErMh?= =?us-ascii?Q?pSVGoQoePfD4XqVzfoHkiSwSp22XRUaVKkaXCIGVETIWnz4ZqocbaXOQyXdB?= =?us-ascii?Q?xnhDCohpVTY1ECPRgw8e4ExkV9UqaaV28KXX0jUiU7HlFraA58njRbUT7sPi?= =?us-ascii?Q?QD9W23G129oEOadTtx12otTVuK02lpKMN+RxmBQng90QWya8LshBNTQ5jMg+?= =?us-ascii?Q?doki2zr0P+5qvbNdNZ7+08iIGTqA5Ii0KSrSfB8aGHCNVLTdlXUEQCPGYaIi?= =?us-ascii?Q?HSMLhch7kec0oJ20E/eszWqKmFp9at9SjYuB0GE+I8qDe9Tgo0DZcTdVaRuI?= =?us-ascii?Q?bkzpgyQrasVhXM6hDRa3XY0qN36ki7sdtpb8eEZO3w7BOJtN/W9TzMUOm8jT?= =?us-ascii?Q?kMJaYjPfv7CVWrBnz6tMMDkaiQHRpVSfOrX0/7TIU/lNYeYR099gu7CClRWK?= =?us-ascii?Q?/yEZhi1vdsE5lOisD1svExSejSSp49h4t2nKbvzfCU8+oQjMzBX9r31W0ZDh?= =?us-ascii?Q?tN7aczuOcWQ5zdjkynAub0ClxKUX3phyAmcCDdZa9Dm24F5vODUHJAAZoIa9?= =?us-ascii?Q?x/JGiHvoIMaX2luNspciTwR/DHAvjxSQJdtpGRHepZjecCmj9Zp4x0Vcrc9z?= =?us-ascii?Q?nHSVkp9Yp5yrFN4aQ3Jo+/rD3O036zfxywRdUA13K3IZJ96zRqZNCgN48Wi4?= =?us-ascii?Q?jk9eux4JW7T4Q9WsE6b8FpT1JyPOYgxG/5r6/9YjsQX8W1BXTiNFqNICpiqY?= =?us-ascii?Q?Q4VseEOyrPRHFfTFJGvp9UThhzCkidBEOCVEHV5Vv2JH4G5FZGhdH+DCTy16?= =?us-ascii?Q?k7OepaKqEyrqUb68eSo7XGZWIAlwypUD0DrkjYfBA8v/l5LWO2GFBpWqMGxe?= =?us-ascii?Q?7UwMlUZKwlJjeoJqPcGJI950Cc8OOKycsRhB9mV2Waukf4CcVTw6tJgON6Ev?= =?us-ascii?Q?c0KQiJWciOvln89uoo9H1q7TWsPrv6G27OVzxHS0cn8xUusrZmb8T2XyH6U0?= =?us-ascii?Q?mxDOdiWOiqTOz4vIjdlypK9caNCVepJPdXTR1WKSaEaUVNvYt4RWgQ7LkFwJ?= =?us-ascii?Q?OR9ZHNhpvNKCXYzM10XI=3D?= X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2545;6:XPXxL+qJeABnLGtR3Nn1mANc7yxPMKhrxCoPGY66NtkJ7Eg6zEkZWOrPg8J9Fqd3P4romLFM8iBAd/B1BtMX30RiH8Cf/PhuZ+yiYabSYmNkbFZGwho54lSvIbasQcOEGljvT1RFJ4qUBdpFt0Kg9v0ypyds1cww8J4J1OvnjiVJIqF45J1RcNZelEqXHCnkdBtjRsQEPai7pPVOphYJIOjLC1rVXknb2TgSkJm0DXApD0j1Ox2CdgXmerLmObS2bchLQNoa5LQZpVcNZGDLwcBTDFlWRXo7o2dfjJBcbO7G2LqA9ULA0PI2jUzaPwV3xfSbDFo5jKy76CxCHPuG4Xm9iIjEMOI+qzjHLa06MnMeAiQ1q8cnK/6JZSNvwM9wvTOxaHz1VYbYc2PrbQRYvg==;5:4iBpvIwWSku5M4SiubRK4z245rI+WPmQimlVje5i/Aw+TZgmLxaX0WiGZqFjQleOzsN88DMCO755QXK/tYdjun15qbLRMRMFjuYPhoDl7SHh4XnglixzoEKLFdO01t/5A6q0l+xLL6482SszIr/vaQ==;24:5KEgyOO3IdwW86MgJoG6YW0l5vuaZvQawiyhHxvhOt7Cn8ZwK3cnvHPpqX1c2n/ZkF8/QFY9oGdYWGzRimucwnIVmtojVxKc2yjX1uS03Ew= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2545;7:aknPil6LaMr/UXkvDK3yq7rHmWY0dablLRNFBgJpgp/sfkbdYsHYk213H6NiRKBhfX3CyktOB7RDTYDvLP7QZ+DpvTkydSiGVGYoOr6b5qZjzLKUfb1YJLUfRGuHdIOkowIU0SsZqaXuBiOYfViXc6bYun+T4DLcpliXcRhiOpdqQ9aUUNQKsSGl1YchYI1Rhooj9tfF2LDxpSHkEL+cK9YdUtvJLLti0HDSwH9wUeEdWYasecvlxC+d+iZFODmsPb5EQMVrlFzbXTqgxMqYpTDQdLO7xo9k+rvz22uLk+GKv3fP1UVmuSXuF7dWZWQLExlSkiLP85GxlTMBHIncfspZp/ReqpOfrqoIoctUOUC26Ssk270PJnGAXaI/+wCy/l8NWYA5uWKjIh9dYi7Cm2TlPzdHEvIaqUETtw6A1A8YNhJkaFn+nE/n+bs0kdfffQP+LpfahHjtliub4Pdd3+LSclbNuHpiSPH2REzUIEX761KHtLkgILaSdyiTiWnocFYVDUNdF0LzqaHsy9uF2g== X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2017 21:41:43.9522 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0202MB2545 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The rename did the wrong thing for this documentation file all those years ago. Fix that as well as the neglected rename of the platform data structure. Fixes: e7065e20d9a6 ("i2c: Rename last mux driver to standard pattern") Signed-off-by: Peter Rosin --- Documentation/i2c/muxes/i2c-mux-gpio | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/i2c/muxes/i2c-mux-gpio b/Documentation/i2c/muxes/i2c-mux-gpio index d4d91a53fc39..7a8d7d261632 100644 --- a/Documentation/i2c/muxes/i2c-mux-gpio +++ b/Documentation/i2c/muxes/i2c-mux-gpio @@ -1,11 +1,11 @@ -Kernel driver i2c-gpio-mux +Kernel driver i2c-mux-gpio Author: Peter Korsgaard Description ----------- -i2c-gpio-mux is an i2c mux driver providing access to I2C bus segments +i2c-mux-gpio is an i2c mux driver providing access to I2C bus segments from a master I2C bus and a hardware MUX controlled through GPIO pins. E.G.: @@ -26,16 +26,16 @@ according to the settings of the GPIO pins 1..N. Usage ----- -i2c-gpio-mux uses the platform bus, so you need to provide a struct +i2c-mux-gpio uses the platform bus, so you need to provide a struct platform_device with the platform_data pointing to a struct -gpio_i2cmux_platform_data with the I2C adapter number of the master +i2c_mux_gpio_platform_data with the I2C adapter number of the master bus, the number of bus segments to create and the GPIO pins used -to control it. See include/linux/i2c-gpio-mux.h for details. +to control it. See include/linux/i2c-mux-gpio.h for details. E.G. something like this for a MUX providing 4 bus segments controlled through 3 GPIO pins: -#include +#include #include static const unsigned myboard_gpiomux_gpios[] = { @@ -46,7 +46,7 @@ static const unsigned myboard_gpiomux_values[] = { 0, 1, 2, 3 }; -static struct gpio_i2cmux_platform_data myboard_i2cmux_data = { +static struct i2c_mux_gpio_platform_data myboard_i2cmux_data = { .parent = 1, .base_nr = 2, /* optional */ .values = myboard_gpiomux_values, @@ -57,7 +57,7 @@ static struct gpio_i2cmux_platform_data myboard_i2cmux_data = { }; static struct platform_device myboard_i2cmux = { - .name = "i2c-gpio-mux", + .name = "i2c-mux-gpio", .id = 0, .dev = { .platform_data = &myboard_i2cmux_data, @@ -66,14 +66,14 @@ static struct platform_device myboard_i2cmux = { If you don't know the absolute GPIO pin numbers at registration time, you can instead provide a chip name (.chip_name) and relative GPIO pin -numbers, and the i2c-gpio-mux driver will do the work for you, +numbers, and the i2c-mux-gpio driver will do the work for you, including deferred probing if the GPIO chip isn't immediately available. Device Registration ------------------- -When registering your i2c-gpio-mux device, you should pass the number +When registering your i2c-mux-gpio device, you should pass the number of any GPIO pin it uses as the device ID. This guarantees that every instance has a different ID. -- 2.1.4