From patchwork Mon Apr 30 10:14:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Baptiste Maneyrol X-Patchwork-Id: 10371337 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 174D76032A for ; Mon, 30 Apr 2018 10:14:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0625928A0C for ; Mon, 30 Apr 2018 10:14:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED7BE28A15; Mon, 30 Apr 2018 10:14:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 357D42899C for ; Mon, 30 Apr 2018 10:14:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752303AbeD3KOo (ORCPT ); Mon, 30 Apr 2018 06:14:44 -0400 Received: from mail-sn1nam01on0053.outbound.protection.outlook.com ([104.47.32.53]:14688 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751994AbeD3KOn (ORCPT ); Mon, 30 Apr 2018 06:14:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=invensense.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=YU1ulSMXbiR5AAnjCy1EcwW9VuCAz0YQq7vhlgx2JYo=; b=f2UiJemQ01mxlSObwUiPs4MBByK10eECOPxMljAcr6QfcBPA53wX5kCdIRWXpWcoLuU10l4v+nIBRGEV5cw/jaUxWWgP9NWS8r9n2oAeuSYpPBEb7Ix43x6utBW+6xDzYjXXW3lNnlKmnyberFB4mBg56QdETLv8R9BwRMue4pM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=JManeyrol@invensense.com; Received: from frgnb-l-34296kv.invcorp.invensense.com (2a01:e35:87fd:c140:3da3:d062:883a:d6cf) by CY4PR1201MB0183.namprd12.prod.outlook.com (2603:10b6:910:1d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.13; Mon, 30 Apr 2018 10:14:40 +0000 From: Jean-Baptiste Maneyrol To: linux-iio@vger.kernel.org Cc: Jean-Baptiste Maneyrol Subject: [PATCH 1/4] iio: imu: inv_mpu6050: use i2c mux only for chip with i2c aux bus Date: Mon, 30 Apr 2018 12:14:08 +0200 Message-Id: <1525083251-8368-1-git-send-email-jmaneyrol@invensense.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [2a01:e35:87fd:c140:3da3:d062:883a:d6cf] X-ClientProxiedBy: LO2P265CA0031.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:61::19) To CY4PR1201MB0183.namprd12.prod.outlook.com (2603:10b6:910:1d::12) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:CY4PR1201MB0183; X-Microsoft-Exchange-Diagnostics: 1; CY4PR1201MB0183; 3:GbhCEXVv6z8lw9O0MFDWhQcMFy/OMZP/v9507jCW7difWW+rwN9Jwh2TeWFLNJMzgkJmFA6iBiKA/qjGr0GnvNQ2kRIKqYfFOsZ1pqNgbYvaBljcX7J7pcFgIKvX8r29JnWumUmHSKz3VVRxAvHM3XIp7vZhmvNWbWspN2WcsZ81EbdSS+x2Vj1Pf0/uXsnO8x+HCh8Oy998RkTuYDOwBlT7f/xONJDulljVLJyNRT0FB3MplIQDEQJv9+CYiPe1; 25:tw6VLnGV6qSnN3SdcSyfkZuycixe1yhk4dUm/VZIagQ5hsUMPMm4LxAGJYVfK7rYpCMMzKPAdmVL1DBkj3jU4vcEpfxw3oMvBHHtY/Vwlj2QuvNc5A2RP19dUDFeY+KOUOzJW/4aPW5hmMc9IYljejTv17Ld2DenviY76dTlvU9Cf0wnYylD1Hb8Q4UxiUNcF1wpdH7Q21Cw5haJ5VenGSylBLVNH9TeBGPYo5gpYpCp3zAnr1eyjhXAOleNQ1HOlwyE1TTr8CCGXXOjEeOkFBhEPfMPuB5XFlZLYu055i/yJu5z/1LdiSUwqHgX3BoMh787Lmq0ftJFQCd4sFTjlQ==; 31:neJGGNnrPYo+TKcnk9CBRz6bqgvsEAlzagna4dxrSDkQeb9XRHbsEaciuHNq/JG5KiQhZMDNO7dqEXEm++I/+Y25L/v6JY5S6dMjZPWMLD7L4eiVYNnwD/CTZvsSEbjHdgxbVHjD1/2Cbz+6yiNZFbl2GKZM9A4AUuM2ARqvTvpEZJm2HxNmwcsb9X5lgC0cJIXb9mn0PK1SEGzGYwnQuLmGYu1ya/cJi+DtYMcZdiE= X-MS-TrafficTypeDiagnostic: CY4PR1201MB0183: X-Microsoft-Exchange-Diagnostics: 1; CY4PR1201MB0183; 20:ZXpq2hhCHFFwR0evYSDc7iE8rz9flyJl5UkuZN9n+gLLkHhwY3XETw9hPRVPuOoIAQ8L7Ocdcn3ckrxasWCiwrSXzgq8fNWkq7ubnRNzGYvBc9o+/JJkZ0YbcvC/6iwg4i5ag9MedKQsDQlj2OmaSkj+kErevHsyiR1MDBtVwthhj7bXfpooSxymHD0K1Nt82V0dZsh/cyysKVLIV7/KZcjh9i9wXsMoK82gntcXeUrIM6VHXHzRPHe1rLFjcvwJZiQaYQgp2XCqqg/RR56gy5eDJbwVtdHLnO2rRv4rY91te4uTtkXGnXG1GBAjP/cvrRdaNO4B+lXDQukiuLJrP+bszQbmb8HUJgVMmkDP3564HLMHhFlzBW5LS5sAPMwy4akSa9G967AXT/pvLj7DVngEGCtHiCdEZEzMq3LIqG2LIIXqKUx2sKrjAFlbe4XZ2rRUVxm9KuNUm22xKROeq/OfWr79hwhLxQ0kuQBOdKelWC9FMbrm8XgDRCZoWTWV; 4:HHclW21NdTXYHXPziG0OhKCgXf5Gh99QXHm36cSltNo0Cz8YcJtQ/6R12/igD9YU4um0GkZ4GYJ9Q0PIrpICAi48DTuSF6PiOHsWNo4l9gqOPW8Yr4HAkCkb9ZQ/LIWFLMh3loaNStcpmFe76izjA6qNW3R4SGaD/7k9XdU6t3+//OSgbAJp+rhxq7zT5SvqLKdO1MVDw0senC3HCw6W5mPEu3i9EkBzNIN0iXm7PJ8em2FxsP2xK/uj1uqeghtieFtYt1cHEnNpdmp70CGwU34Qkz9tLKMq3R8giZviboAPL1YDY+3idCC+H/AQq0be X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(257004950022427); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231254)(944501410)(52105095)(6041310)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:CY4PR1201MB0183; BCL:0; PCL:0; RULEID:; SRVR:CY4PR1201MB0183; X-Forefront-PRVS: 0658BAF71F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(39380400002)(396003)(366004)(39850400004)(346002)(189003)(199004)(5660300001)(6486002)(7736002)(305945005)(478600001)(47776003)(2351001)(2361001)(72206003)(4326008)(106356001)(105586002)(316002)(107886003)(53936002)(2906002)(50466002)(81166006)(50226002)(486006)(80792005)(7696005)(46003)(6666003)(386003)(86362001)(36756003)(16586007)(476003)(97736004)(52116002)(8936002)(16526019)(6116002)(81156014)(51416003)(186003)(8676002)(48376002)(6916009)(68736007)(52396003)(25786009)(2616005)(59450400001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR1201MB0183; H:frgnb-l-34296kv.invcorp.invensense.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: invensense.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR1201MB0183; 23:C0FWklNnR3p7IM+xWRWRsAPxlL/CpsXoPOUGYbz?= =?us-ascii?Q?+VtTE9Itk0SPsU1NY2DOkVxd6gsCJnGusqCtzfxdIfKyy2GhBd8pFOLKLlky?= =?us-ascii?Q?kr8/sCGKxkEh/r8SZPWl/n+4ZyEJgVUHhdKz0l7y/fIONOY9gagB+Bufq3Xh?= =?us-ascii?Q?ZyS47WMGLyIWlAt+MiYLeiJGomAHq9qiDsTbQMWQ38XayhiiY7AKPutwSIZq?= =?us-ascii?Q?aQrgXjTIvFrJCd1hWAn8JT1l+kJqzDHiHwTo+dtItO7X2TLqFPt72S3U4fMM?= =?us-ascii?Q?yCpUvNgpmbkIYwjpxCoU966vruPgnWH9gbmK9lALlNn9MZigTZuL4Pt5RcQg?= =?us-ascii?Q?/CxGuct0bWO6DVdMG53Lj2MheMumb+aSLBRvvdNr9BOHlsbveaQ8F53FliaU?= =?us-ascii?Q?V4BQRStZ9/fpSQP+TtlGOAWnr2XUmgKhlToClcorm+wL9iJkhZPdBI5jKKYU?= =?us-ascii?Q?jBHN5Vq9dv1Y5LfP/4HkEWacjz2inajthptS9tgeAlgRTQY1dkZpFz6g0M+0?= =?us-ascii?Q?uY1DC4yMPXJJHQCDHSQ1PLEibi65CGg3/JMA8Jp667qN7qtACTCR9nL6w67r?= =?us-ascii?Q?rn6/1z3t2btfy3IJ65Xw8dcv7CeSKsQX+56QN5T8dqOpALN6/8PjwgRS+/XO?= =?us-ascii?Q?fs2nbHSzFK9I911GjrMyT4Os7qE9pOXNRAEOFt35gVwl3SIrzGmjf9wMM06d?= =?us-ascii?Q?SVlzTj52CpYc5UfJw/dPxx/VenckMbJFZWuM4le+DNuBHbrl+Mj5u3D0MZwJ?= =?us-ascii?Q?LmizCrk8Uy7bQ0vIho3zmDqMgNH+1wgigIblFiU0rROHfYXPZwMoMcyKqGJY?= =?us-ascii?Q?TR7LoNzwXB/G0Qkx+Z0NzBIT20D9HYKhY/lICM66O6ys5PuDIjuIKn2SJh3v?= =?us-ascii?Q?FAHDNU4RWTum8NgGpQ4FxANMaLfF7ywiPE8MoxTxznFSIV6z1f47eLpENBuw?= =?us-ascii?Q?fuLgiuUIKJvFRY2yhMrS0W8hjw0BxYFMtsGzOjaoGSmswvPBhGpsjVhFgsH8?= =?us-ascii?Q?6O8FLcLL5jhgOHkLEBBULv0UakP7WTspkekLKRpKitd3pt/ctRHnshPWZbub?= =?us-ascii?Q?x5LifjaM3q1C88G0xcECSwGokzQaxYDX/Ak42UH0I3q7MReJbqfpo3PETLEC?= =?us-ascii?Q?Z7DiJ1B9FdziZc8IHd95RUFm1IJIw7pMYwY+BS/4/kl9YfWoi5tnkxM5kHLb?= =?us-ascii?Q?k/AKwNgXzV9QG1hpnreoC495vQjJ5xUQgvVnU?= X-Microsoft-Antispam-Message-Info: HsM0tRhl0calE8xe9ddhXQdQcUEw9k5T7rY8a4GB/m4ooI2p2Rsvl4U9xTh7j4LYCuvXWH9KNEeGb8YAZOQC01WIcjrgPy1OgNiZxydJfCtgUruC15Ax9ITph22B5qRqd/2Vg76Ug/6UlSjfsLBBGGJIdkdIBvhY0BeHSWNSp9q3C9HdwsoatmJAx8HZEtBQ X-Microsoft-Exchange-Diagnostics: 1; CY4PR1201MB0183; 6:g4aNXVxvGyGU0b4zL4krWTrebAbB9FygTRXCgEtkB3iCFt5azV8VHmi1ALOU/XU+SQ11keUqHLyy/xKP5P7zltD4ngxHnGBkwFb5Tw5E7AR09Y/DhT33RBdC5rPJQ0+6xpzzXLnJ3m5xxKTuVxtk42aRoF1pkYxQY+dTjzyVPBRWwZ465pZznu54VxECz0cuXzYL04sTzRAN2i35jKBSDPhzIY5No7DzvzrpZ6wjEG0pPragVCo1IIH0TN+qhPSn53RAa4UaGsNYCViu+SFyq/j9g/3wfnM+NZ//nC5LqQJtHYFjJCV5/LfUFB5a/U1WYXq0Vvh0TrV+XGFRxA4efHc8nJjiznQt6TJ6Q5eHTR9MTmgk3TS3sESxcLhYkqxLA0ss/QKZVJBf+HLEgziig4JCNbanCagcXfGnjmgUurcYScHf86rNwsyVh3+tl0fb8a90uiLa750rAofTgZkybQ==; 5:4xTXspc7nsrkdK7Df3XLah3LpBRw/hbr6/EpLm6dm1LqPFW7nIlMcr5BpFR/v2K5ZdQENUn765WnTQNjdqSdDOziVHPgRzjhcum6nUuRUTSwMPZ468xrRTVOrgLzsKjVLz70AAU6gZ4QTYYRZHhBLId+FBLbynN9L/GAw4WMxbI=; 24:7+AWhF0VX7MkeTHUEwyW/URGr5vnU/YB+HvuHHewNd+OLwIUbwO/YWgwFZpyVDFqfoyEpUq0iUtt4r1NHbs6VGepPHO74NwY0Nccu/zIYl8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR1201MB0183; 7:KlFVZbsQXJ+zoRG3e+b2A0c5Ou2Sc/5CFW5HHm9eg9fyX5udw0EW+2bpDRK9tkaV+28MUrz37pObx4iuh49TdK4ssSa3F48aadPiOff5c57+N11xdFO7gO6qf6mgSZ0T8+eCFyLTPH3AUYdLtLMFXBdr1Qm3/DJaHzrQjm80EuDjdCKfaCrxUk/nlUQdq8c0ObqU6Ve2PWFW7DcWCVXJbivwOV/sUW13f82oo8WaX+MDaknvXQde40P7zMM4awOu X-MS-Office365-Filtering-Correlation-Id: 30f7120f-3a64-4e9c-3880-08d5ae832fbf X-OriginatorOrg: invensense.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2018 10:14:40.1084 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 30f7120f-3a64-4e9c-3880-08d5ae832fbf X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 462b3b3b-e42b-47ea-801a-f1581aac892d X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB0183 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP icm20608 does not have i2c aux bus, so it does not make sense to allocate an i2c mux for this chip. Signed-off-by: Jean-Baptiste Maneyrol --- drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 41 +++++++++++++++++++------------ 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c index 90fdc5e..f11ae29 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c @@ -125,20 +125,27 @@ static int inv_mpu_probe(struct i2c_client *client, return result; st = iio_priv(dev_get_drvdata(&client->dev)); - st->muxc = i2c_mux_alloc(client->adapter, &client->dev, - 1, 0, I2C_MUX_LOCKED | I2C_MUX_GATE, - inv_mpu6050_select_bypass, - inv_mpu6050_deselect_bypass); - if (!st->muxc) - return -ENOMEM; - st->muxc->priv = dev_get_drvdata(&client->dev); - result = i2c_mux_add_adapter(st->muxc, 0, 0, 0); - if (result) - return result; - - result = inv_mpu_acpi_create_mux_client(client); - if (result) - goto out_del_mux; + switch (st->chip_type) { + case INV_ICM20608: + /* no i2c auxiliary bus on the chip */ + break; + default: + /* declare i2c auxiliary bus */ + st->muxc = i2c_mux_alloc(client->adapter, &client->dev, + 1, 0, I2C_MUX_LOCKED | I2C_MUX_GATE, + inv_mpu6050_select_bypass, + inv_mpu6050_deselect_bypass); + if (!st->muxc) + return -ENOMEM; + st->muxc->priv = dev_get_drvdata(&client->dev); + result = i2c_mux_add_adapter(st->muxc, 0, 0, 0); + if (result) + return result; + result = inv_mpu_acpi_create_mux_client(client); + if (result) + goto out_del_mux; + break; + } return 0; @@ -152,8 +159,10 @@ static int inv_mpu_remove(struct i2c_client *client) struct iio_dev *indio_dev = i2c_get_clientdata(client); struct inv_mpu6050_state *st = iio_priv(indio_dev); - inv_mpu_acpi_delete_mux_client(client); - i2c_mux_del_adapters(st->muxc); + if (st->muxc) { + inv_mpu_acpi_delete_mux_client(client); + i2c_mux_del_adapters(st->muxc); + } return 0; }