From patchwork Thu Jan 20 12:13:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Rudolph X-Patchwork-Id: 534168 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68A36C433F5 for ; Thu, 20 Jan 2022 12:14:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232720AbiATMOV (ORCPT ); Thu, 20 Jan 2022 07:14:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232770AbiATMOT (ORCPT ); Thu, 20 Jan 2022 07:14:19 -0500 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A303DC061751 for ; Thu, 20 Jan 2022 04:14:18 -0800 (PST) Received: by mail-wm1-x32e.google.com with SMTP id e9-20020a05600c4e4900b0034d23cae3f0so13256817wmq.2 for ; Thu, 20 Jan 2022 04:14:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=H36YrbiGOn2dmwMZgkzdW8WEj8aMCcESSiL6M40TDbA=; b=W64G4Gd4ZxgARXL0HhvYAA+1EY/yVo8+EVDkLfan63Et+NfeLDxf0NkirD3X2MJgOg xvqIvJ/AOCdf1bdo5PLhqWqcA4aQEjvRGr/zX7H03FoIIzzhekjYegOTZIHEgGigPau3 dQ3ROyd6iZkmtFPDae5BWAZOliV/ovBZVC5XKmH3h0gmoGUpuFm0kqdNYD02BCEfMPf3 oAJ492i1+Wl0A01ZEgwfaEYiRAr6rGOes1BHTpt3i/EJmTI9QJ7s9cjp+WUHYLGuu4Lx KYmMgQC+SM0hkJ4TIaHDyCXdJ3a56BUBvNg22lQDG5Fy5fe2CHNYKEwsJqXhxliPBg0m qELg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=H36YrbiGOn2dmwMZgkzdW8WEj8aMCcESSiL6M40TDbA=; b=6Mmam0BdNrXmLVnSCsgQVtKvd1s8M1u/mMuRZNBXytvT4K4p13fBF5o61275Bf/2KZ 4+90t7pdqY9xLjrc6m+A5Jwep2BsWJ+NmDZ/TnL0ToJapireNt9Nk19gMZkWwDMv5G0G xfWCJy8HozysB1qPRH4zVmUKssIr0N08qND1TgWZA1TnnaVbKiGUVIcWmZ53RhvvbsZJ Ky2UefolUsbHZbB5mFOafbYB85LtYjog/s3+bvaMKte0leMs376JiCH4NywFyAbzCEGF AH3cqS5GWnW419xJPl8xTQYrG6yOgFcIfF1M1IxNxD/X1Q4Di06am+TqKrWj6Fs06HS4 u4kQ== X-Gm-Message-State: AOAM5308WQj4F8EedM4hZ1w8rPSIHbcW++RiKYKy/F0LfGfyjQv2URZN cR8xMM07ZXJS8d9CC4l+oOP23OEQFXIAtg== X-Google-Smtp-Source: ABdhPJySb22nCJLK0QuZkUxK3WffgAPGW9iFzkJWzncczeENXFWwZcNXDP+0AYEYh+kAGlaPUtl1fQ== X-Received: by 2002:a05:6000:1543:: with SMTP id 3mr29491724wry.683.1642680857269; Thu, 20 Jan 2022 04:14:17 -0800 (PST) Received: from fedora.sec.9e.network (ip-088-153-139-166.um27.pools.vodafone-ip.de. [88.153.139.166]) by smtp.gmail.com with ESMTPSA id x4sm2853863wrp.13.2022.01.20.04.14.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 04:14:16 -0800 (PST) From: Patrick Rudolph To: Peter Rosin , Laurent Pinchart Cc: Patrick Rudolph , Rob Herring , linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [v3 1/3] dt-bindings: i2c: Add Maxim MAX735x/MAX736x variants Date: Thu, 20 Jan 2022 13:13:11 +0100 Message-Id: <20220120121314.463944-2-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120121314.463944-1-patrick.rudolph@9elements.com> References: <20220120121314.463944-1-patrick.rudolph@9elements.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Update the pca954x bindings to add support for the Maxim MAX735x/MAX736x chips. The functionality will be provided by the exisintg pca954x driver. While on it make the interrupts support conditionally as not all of the existing chips have interrupts. For chips that are powered off by default add an optional regulator called vdd-supply. Signed-off-by: Patrick Rudolph --- .../bindings/i2c/i2c-mux-pca954x.yaml | 43 ++++++++++++++----- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml b/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml index 9f1726d0356b..e7650e2a777e 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml +++ b/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml @@ -4,21 +4,47 @@ $id: http://devicetree.org/schemas/i2c/i2c-mux-pca954x.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: NXP PCA954x I2C bus switch +title: NXP PCA954x I2C and compatible bus switches maintainers: - Laurent Pinchart description: - The binding supports NXP PCA954x and PCA984x I2C mux/switch devices. + The binding supports NXP PCA954x and PCA984x I2C mux/switch devices, + and the Maxim MAX735x and MAX736x I2C mux/switch devices. allOf: - $ref: /schemas/i2c/i2c-mux.yaml# + - if: + properties: + compatible: + contains: + enum: + - maxim,max7367 + - maxim,max7369 + - nxp,pca9542 + - nxp,pca9543 + - nxp,pca9544 + - nxp,pca9545 + then: + properties: + interrupts: true + + "#interrupt-cells": + const: 2 + + interrupt-controller: true properties: compatible: oneOf: - enum: + - maxim,max7356 + - maxim,max7357 + - maxim,max7358 + - maxim,max7367 + - maxim,max7368 + - maxim,max7369 - nxp,pca9540 - nxp,pca9542 - nxp,pca9543 @@ -38,14 +64,6 @@ properties: reg: maxItems: 1 - interrupts: - maxItems: 1 - - "#interrupt-cells": - const: 2 - - interrupt-controller: true - reset-gpios: maxItems: 1 @@ -59,6 +77,9 @@ properties: description: if present, overrides i2c-mux-idle-disconnect $ref: /schemas/mux/mux-controller.yaml#/properties/idle-state + vdd-supply: + description: A voltage regulator supplying power to the chip. + required: - compatible - reg @@ -79,6 +100,8 @@ examples: #size-cells = <0>; reg = <0x74>; + vdd-supply = <&p3v3>; + interrupt-parent = <&ipic>; interrupts = <17 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; From patchwork Thu Jan 20 12:13:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Rudolph X-Patchwork-Id: 533743 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 083E8C433F5 for ; Thu, 20 Jan 2022 12:14:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240037AbiATMOk (ORCPT ); Thu, 20 Jan 2022 07:14:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232845AbiATMOZ (ORCPT ); Thu, 20 Jan 2022 07:14:25 -0500 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F256C06173F for ; Thu, 20 Jan 2022 04:14:24 -0800 (PST) Received: by mail-wm1-x330.google.com with SMTP id c66so11641003wma.5 for ; Thu, 20 Jan 2022 04:14:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O0k8KhFMdBtBZFFVKWcjCSCyxGIr4s4QCXxRmW6v5O8=; b=Y6lanlwLN0MAxX37X4Zsde4MHqeCIF0i68zTNHrcRYOhCojL8/XCjWWNxs3lOGlOLN hMoOEh8bfcX7UyqgnF08D3V/XmBG9FoDbvpiTEU2ohFcpGur8fn7wCRQGLJ4GJ958e3h 06mStnVAwCGDP8ZwHYtPgsSu7bmsv/Djv1ykuCQzX5Wx7Q5lD/Fa2hdlLd195VuXTKG5 8xhPezUppbOoWa5WYEF6mFDrbrzCNiTBVBHrRLmIlxlfEe0F6Adl0qT7hcuvRzCFsJtk fDFROLAJdKcyIRXKD0snN3pzxVTf8P8LQ1LclPwbINMpOOFZcyeUa6sjDE9kqG9/n5ij jmhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O0k8KhFMdBtBZFFVKWcjCSCyxGIr4s4QCXxRmW6v5O8=; b=HLWyLALWnqFH4Qy1bEF7FDHeq1OQookY/gGkIchszAc16fNCzG7S0s8dc+Yggd2qQT Txp8cZ5DUNV68GF6AMeM1GXUDMhf1tocm/hzogjsklzKqqJLBQYewDVcAdKYZDtYVyON +tULh9l390m2jz/P9gkv1SP18Y6HObcJFxFiE1O2P27xvcVfsQT/Sqs9bi4VOuFuVh66 029VGaMrQuTxVMgGCsdoVc9w9OtvH70I09kDUvL5XVzBdeNYarKEK6RfAPZoS7CNoo3U xT1vDYMdey2uywTsLMWkZids9NI9T1wxkv4rLAftEA8jlrKqZOtdhhiJSV6LH0a9zbWt HsIQ== X-Gm-Message-State: AOAM532wBpTuuFvZBCgYNPFJeWgWfhzEIa+NeKpWl/Br3ygbHqMJ1Xxy qC8JTxPE8LyB/KPJmHbyrjLLbXRH+oMEcw== X-Google-Smtp-Source: ABdhPJwLYO0KYW7jtMQfzZHcJ/xmD/xp9J44b8rdtf1bGKQalsH6OHBt9R+p6TFsKtr2v5stLc9yyw== X-Received: by 2002:a05:6000:18a3:: with SMTP id b3mr11283836wri.470.1642680862932; Thu, 20 Jan 2022 04:14:22 -0800 (PST) Received: from fedora.sec.9e.network (ip-088-153-139-166.um27.pools.vodafone-ip.de. [88.153.139.166]) by smtp.gmail.com with ESMTPSA id x4sm2853863wrp.13.2022.01.20.04.14.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 04:14:22 -0800 (PST) From: Patrick Rudolph To: Peter Rosin Cc: Patrick Rudolph , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [v3 2/3] i2c: muxes: pca954x: Add MAX735x/MAX736x support Date: Thu, 20 Jan 2022 13:13:12 +0100 Message-Id: <20220120121314.463944-3-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120121314.463944-1-patrick.rudolph@9elements.com> References: <20220120121314.463944-1-patrick.rudolph@9elements.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Add support for the following Maxim chips using the existing PCA954x driver: - MAX7356 - MAX7357 - MAX7358 - MAX7367 - MAX7368 - MAX7369 All added Maxim chips behave like the PCA954x, where a single SMBUS byte write selects up to 8 channels to be bridged to the primary bus. The MAX7357 exposes 6 additional registers at Power-On-Reset and is configured to: - Disabled interrupts on bus locked up detection - Enable bus locked-up clearing - Disconnect only locked bus instead of all channels While the MAX7357/MAX7358 have interrupt support, they don't act as interrupt controller like the PCA9545 does. Thus don't enable IRQ support and handle them like the PCA9548. Tested using the MAX7357 and verified that the stalled bus is disconnected while the other channels remain operational. Signed-off-by: Patrick Rudolph --- drivers/i2c/muxes/Kconfig | 4 +- drivers/i2c/muxes/i2c-mux-pca954x.c | 92 +++++++++++++++++++++++++++-- 2 files changed, 90 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig index 1708b1a82da2..2ac99d044199 100644 --- a/drivers/i2c/muxes/Kconfig +++ b/drivers/i2c/muxes/Kconfig @@ -65,11 +65,11 @@ config I2C_MUX_PCA9541 will be called i2c-mux-pca9541. config I2C_MUX_PCA954x - tristate "NXP PCA954x and PCA984x I2C Mux/switches" + tristate "NXP PCA954x/PCA984x and Maxim MAX735x/MAX736x I2C Mux/switches" depends on GPIOLIB || COMPILE_TEST help If you say yes here you get support for the NXP PCA954x - and PCA984x I2C mux/switch devices. + and PCA984x and Maxim MAX735x/MAX736x I2C mux/switch devices. This driver can also be built as a module. If so, the module will be called i2c-mux-pca954x. diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index 4ad665757dd8..33b9a6a1fffa 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -4,6 +4,7 @@ * * Copyright (c) 2008-2009 Rodolfo Giometti * Copyright (c) 2008-2009 Eurotech S.p.A. + * Copyright (c) 2022 Patrick Rudolph * * This module supports the PCA954x and PCA984x series of I2C multiplexer/switch * chips made by NXP Semiconductors. @@ -11,6 +12,12 @@ * PCA9540, PCA9542, PCA9543, PCA9544, PCA9545, PCA9546, PCA9547, * PCA9548, PCA9846, PCA9847, PCA9848 and PCA9849. * + * It's also compatible to Maxims MAX735x I2C switch chips, which are controlled + * as the NXP PCA9548 and the MAX736x chips that act like the PCA9544. + * + * This includes the: + * MAX7356, MAX7357, MAX7358, MAX7367, MAX7368 and MAX7369 + * * These chips are all controlled via the I2C bus itself, and all have a * single 8-bit register. The upstream "parent" bus fans out to two, * four, or eight downstream busses or channels; which of these @@ -50,7 +57,30 @@ #define PCA954X_IRQ_OFFSET 4 +/* + * MAX7357 exposes 7 registers on POR which allow to configure additional + * features. Disable interrupts, enable bus locked-up clearing, + * isolate only the locked channel instead of all channels. + */ +#define MAX7357_CONF_INT_ENABLE BIT(0) +#define MAX7357_CONF_FLUSH_OUT BIT(1) +#define MAX7357_CONF_RELEASE_INT BIT(2) +#define MAX7357_CONF_LOCK_UP_CLEAR BIT(3) +#define MAX7357_CONF_DISCON_SINGLE_CHAN BIT(4) +#define MAX7357_CONF_BUS_LOCKUP_DETECTION BIT(5) +#define MAX7357_CONF_ENABLE_BASIC_MODE BIT(6) +#define MAX7357_CONF_PRECONNECT_TEST BIT(7) + +#define MAX7357_CONF_DEFAULTS (MAX7357_CONF_FLUSH_OUT | \ + MAX7357_CONF_DISCON_SINGLE_CHAN) + enum pca_type { + max_7367, + max_7368, + max_7369, + max_7356, + max_7357, + max_7358, pca_9540, pca_9542, pca_9543, @@ -69,6 +99,7 @@ struct chip_desc { u8 nchans; u8 enable; /* used for muxes only */ u8 has_irq; + u8 max7357; enum muxtype { pca954x_ismux = 0, pca954x_isswi @@ -90,8 +121,42 @@ struct pca954x { raw_spinlock_t lock; }; -/* Provide specs for the PCA954x types we know about */ +/* Provide specs for the PCA954x and MAX735x types we know about */ static const struct chip_desc chips[] = { + [max_7356] = { + .nchans = 8, + .muxtype = pca954x_isswi, + .id = { .manufacturer_id = I2C_DEVICE_ID_NONE }, + }, + [max_7357] = { + .nchans = 8, + .muxtype = pca954x_isswi, + .max7357 = 1, + .id = { .manufacturer_id = I2C_DEVICE_ID_NONE }, + }, + [max_7358] = { + .nchans = 8, + .muxtype = pca954x_isswi, + .id = { .manufacturer_id = I2C_DEVICE_ID_NONE }, + }, + [max_7367] = { + .nchans = 4, + .muxtype = pca954x_isswi, + .has_irq = 1, + .id = { .manufacturer_id = I2C_DEVICE_ID_NONE }, + }, + [max_7368] = { + .nchans = 4, + .muxtype = pca954x_isswi, + .id = { .manufacturer_id = I2C_DEVICE_ID_NONE }, + }, + [max_7369] = { + .nchans = 4, + .enable = 0x4, + .muxtype = pca954x_ismux, + .has_irq = 1, + .id = { .manufacturer_id = I2C_DEVICE_ID_NONE }, + }, [pca_9540] = { .nchans = 2, .enable = 0x4, @@ -177,6 +242,12 @@ static const struct chip_desc chips[] = { }; static const struct i2c_device_id pca954x_id[] = { + { "max7356", max_7356 }, + { "max7357", max_7357 }, + { "max7358", max_7358 }, + { "max7367", max_7367 }, + { "max7368", max_7368 }, + { "max7369", max_7369 }, { "pca9540", pca_9540 }, { "pca9542", pca_9542 }, { "pca9543", pca_9543 }, @@ -194,6 +265,12 @@ static const struct i2c_device_id pca954x_id[] = { MODULE_DEVICE_TABLE(i2c, pca954x_id); static const struct of_device_id pca954x_of_match[] = { + { .compatible = "maxim,max7356", .data = &chips[max_7356] }, + { .compatible = "maxim,max7357", .data = &chips[max_7357] }, + { .compatible = "maxim,max7358", .data = &chips[max_7358] }, + { .compatible = "maxim,max7367", .data = &chips[max_7367] }, + { .compatible = "maxim,max7368", .data = &chips[max_7368] }, + { .compatible = "maxim,max7369", .data = &chips[max_7369] }, { .compatible = "nxp,pca9540", .data = &chips[pca_9540] }, { .compatible = "nxp,pca9542", .data = &chips[pca_9542] }, { .compatible = "nxp,pca9543", .data = &chips[pca_9543] }, @@ -401,9 +478,16 @@ static int pca954x_init(struct i2c_client *client, struct pca954x *data) else data->last_chan = 0; /* Disconnect multiplexer */ - ret = i2c_smbus_write_byte(client, data->last_chan); - if (ret < 0) - data->last_chan = 0; + if (data->chip->max7357) { + ret = i2c_smbus_write_byte_data(client, data->last_chan, + MAX7357_CONF_DEFAULTS); + if (ret < 0) + data->last_chan = 0; + } else { + ret = i2c_smbus_write_byte(client, data->last_chan); + if (ret < 0) + data->last_chan = 0; + } return ret; } From patchwork Thu Jan 20 12:13:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Rudolph X-Patchwork-Id: 534167 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E58EC433EF for ; Thu, 20 Jan 2022 12:14:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232851AbiATMOr (ORCPT ); Thu, 20 Jan 2022 07:14:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232823AbiATMOe (ORCPT ); Thu, 20 Jan 2022 07:14:34 -0500 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12ED2C06174E for ; Thu, 20 Jan 2022 04:14:27 -0800 (PST) Received: by mail-wm1-x330.google.com with SMTP id c2so11691844wml.1 for ; Thu, 20 Jan 2022 04:14:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=esc1uJ/1b1Bl5sIRdBGqAaIciPpRZPZmuwi/GvPIASI=; b=HTONie7dMdtGsPLTyvbZfSGUG6+xqdnKWgOaR+qCVxHQRkzxY+vMBxXGXg/5BpxV+b IsDXlYTyi+qXSq+o2cF6MB4vfE+NibpgVZTErgz7kRO3NbuFwIHHojyWk+NGNIO9UnnA QOgrlhvgK9+7zJCfkdZu1+NdcAJ5BJC0d6F9tqWwopjxTY93nBMXwovpVIAtO1PSZys2 +xRTK4eY62C1fAimw/6q6j6jT0brcpFfNvdDkVT1WB8+d/jFM/UAWtE9vklfOYwBTxAB 6lGJnLsH7bcwADr01qo5DiEENNOMYSuZWWjf+DKi97Se3DRIZhayFeeO2V1ARqdAX5/c 9cnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=esc1uJ/1b1Bl5sIRdBGqAaIciPpRZPZmuwi/GvPIASI=; b=Lo56I8I63hjNkoDzfK+6fRRK1mBkXtu5uYzY4TCT5w9aqAADGp3GyLYp1GM1zieQRr xfEdGl3LLHATftnwpaCQ+PRl6/qtVDtuhMeM4z7iVyxXelPhtyEG9zitfHTatooUQMLd 25zdxUDWTu6kwIHoz/9xSmbEYzfrXGMqtzRVJ/RsvcCzXjG+uWIhkfXoCdFD1hpPQV2A NtB731mYz0rEfJgZuR5Ck+IxesWFF/WKAWH5c1HjeBv9dVcVrC/Rne3CrwJUBMUFIR+I +AV4Mmrg+ot9UDuzMBepkGEIUZlW2EEmOSLC0Ge27Ohl6gL8FnzUfdOxdPB7biMm1pRX mndA== X-Gm-Message-State: AOAM53125q0NO5jz4v1XSvKGfwAt2aLekubJQNjR/pko5rUgIM0XKbEg A9UxrllUD6tVpy/qjnDA02qPh4p2P4GW4Q== X-Google-Smtp-Source: ABdhPJzyrsxABb5+2MQcEebguHu+jFibhrZ6TUJ8eIM4jhWsekHkOasUh0vYuPh5kGAaTeCWgnT/RA== X-Received: by 2002:a5d:548b:: with SMTP id h11mr33145701wrv.12.1642680865670; Thu, 20 Jan 2022 04:14:25 -0800 (PST) Received: from fedora.sec.9e.network (ip-088-153-139-166.um27.pools.vodafone-ip.de. [88.153.139.166]) by smtp.gmail.com with ESMTPSA id x4sm2853863wrp.13.2022.01.20.04.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 04:14:25 -0800 (PST) From: Patrick Rudolph To: Peter Rosin , Liam Girdwood , Mark Brown Cc: Patrick Rudolph , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [v3 3/3] i2c: muxes: pca954x: Add regulator support Date: Thu, 20 Jan 2022 13:13:13 +0100 Message-Id: <20220120121314.463944-4-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120121314.463944-1-patrick.rudolph@9elements.com> References: <20220120121314.463944-1-patrick.rudolph@9elements.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Add an optional vdd regulator and enable it when found for devices that are powered off by default. Signed-off-by: Patrick Rudolph --- drivers/i2c/muxes/i2c-mux-pca954x.c | 32 ++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index 33b9a6a1fffa..086647193ea9 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -119,6 +120,7 @@ struct pca954x { struct irq_domain *irq; unsigned int irq_mask; raw_spinlock_t lock; + struct regulator *supply; }; /* Provide specs for the PCA954x and MAX735x types we know about */ @@ -459,6 +461,9 @@ static void pca954x_cleanup(struct i2c_mux_core *muxc) struct pca954x *data = i2c_mux_priv(muxc); int c, irq; + if (!IS_ERR_OR_NULL(data->supply)) + regulator_disable(data->supply); + if (data->irq) { for (c = 0; c < data->chip->nchans; c++) { irq = irq_find_mapping(data->irq, c); @@ -513,15 +518,30 @@ static int pca954x_probe(struct i2c_client *client, pca954x_select_chan, pca954x_deselect_mux); if (!muxc) return -ENOMEM; + data = i2c_mux_priv(muxc); i2c_set_clientdata(client, muxc); data->client = client; + data->supply = devm_regulator_get_optional(dev, "vdd"); + if (IS_ERR(data->supply)) { + if ((PTR_ERR(data->supply) == -EPROBE_DEFER)) + return -EPROBE_DEFER; + } else { + ret = regulator_enable(data->supply); + if (ret) { + dev_err(dev, "Failed to enable regulator vdd: %d\n", ret); + return ret; + } + } + /* Reset the mux if a reset GPIO is specified. */ gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); - if (IS_ERR(gpio)) - return PTR_ERR(gpio); + if (IS_ERR(gpio)) { + ret = PTR_ERR(gpio); + goto fail_cleanup; + } if (gpio) { udelay(1); gpiod_set_value_cansleep(gpio, 0); @@ -538,7 +558,7 @@ static int pca954x_probe(struct i2c_client *client, ret = i2c_get_device_id(client, &id); if (ret && ret != -EOPNOTSUPP) - return ret; + goto fail_cleanup; if (!ret && (id.manufacturer_id != data->chip->id.manufacturer_id || @@ -546,7 +566,8 @@ static int pca954x_probe(struct i2c_client *client, dev_warn(dev, "unexpected device id %03x-%03x-%x\n", id.manufacturer_id, id.part_id, id.die_revision); - return -ENODEV; + ret = -ENODEV; + goto fail_cleanup; } } @@ -565,7 +586,8 @@ static int pca954x_probe(struct i2c_client *client, ret = pca954x_init(client, data); if (ret < 0) { dev_warn(dev, "probe failed\n"); - return -ENODEV; + ret = -ENODEV; + goto fail_cleanup; } ret = pca954x_irq_setup(muxc);