From patchwork Mon May 1 09:15:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Rudolph X-Patchwork-Id: 678512 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 10A7AC7EE21 for ; Mon, 1 May 2023 09:16:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232117AbjEAJQC (ORCPT ); Mon, 1 May 2023 05:16:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232192AbjEAJQA (ORCPT ); Mon, 1 May 2023 05:16:00 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32087B9 for ; Mon, 1 May 2023 02:15:58 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-94eff00bcdaso465855566b.1 for ; Mon, 01 May 2023 02:15:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1682932556; x=1685524556; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PeUBY+RnRkv7Uj0pwjxAuaeSePuTuD/H6MTh8BP5FD8=; b=RWaUwP59XBK+63XwUWLfDvqxBKaSL3rDdDGMwLeKpEBwQ7lvLmoJfHED60WMr/srbu 4Yyky5uTrOJN7dw5j1lru0fViJqe9u1l18BuZknA6LutocwXiorqhFfZJhl/FswqfNek evWwp3qoU66xKmE08Dpc+CAINLNHzg2vkGt2navJJ9sZS6ONZGS2W34vB9xT3K7aBzSm yuwGewFTogft2qWC2Su6i9F6fxLYtpcQ1Xq1cYPiJyiCJ4fkkN+iWbE9TM2ZYrq70M2o hIDw+neGnn7reT6A4w63Q4lzOful4kXtkHsLqC/QMCi1q57CIURV1wsN0CUL/+vq/G+x eXfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682932556; x=1685524556; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PeUBY+RnRkv7Uj0pwjxAuaeSePuTuD/H6MTh8BP5FD8=; b=SOxQNTd+9aCVq9GEcjph+JRgPWVQ9KSWNx/nAVip+QSo6X1TQZJwQW9qrCbzxzvhtp Pvk7FX6+o9SdDk4X27szkMoBB9Zu7G/+CHrtaK/cra3nRk6Z26sF7wwG9tjgzd5uwZgL +ZE+4La5CfseYX8mJBuVxwXmzutiOfH5+QT+M7CM3gVvDeo4l/coZfZfn85UQDVXSwZq Qlv6eiCvtu/u+cemdDVWKEUbtddrXZGhayaLxJ7ip+B9c5HTRh0mNtguU+trFcuoAmbN irropF8LrORbynXs6GLPrYsCvSdvF9OTmcsMGi1vdwCd2XcpaxCpVhy8Q2DO5wg++2Su SM2Q== X-Gm-Message-State: AC+VfDw0XOHDs3bTNt9glayW9ryS7OCHb12D9SRQrEXSPNhh1flH7n3c wjHfEC5f+wcVm2hzEaNDKTOLuQ== X-Google-Smtp-Source: ACHHUZ55kwe8/6XT20zB2ulgxQiEN/YYVlqI6VPVVzj5ewpfI6sgsU+QwJug5O/jMSyUuIwD5hMXrw== X-Received: by 2002:a17:906:ee88:b0:961:800b:3f1e with SMTP id wt8-20020a170906ee8800b00961800b3f1emr3206640ejb.73.1682932556482; Mon, 01 May 2023 02:15:56 -0700 (PDT) Received: from fedora.. (ip-095-222-150-251.um34.pools.vodafone-ip.de. [95.222.150.251]) by smtp.gmail.com with ESMTPSA id xa3-20020a170907b9c300b0094e954fd015sm14714266ejc.175.2023.05.01.02.15.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 May 2023 02:15:56 -0700 (PDT) From: Patrick Rudolph To: Peter Rosin , Laurent Pinchart Cc: Patrick Rudolph , Krzysztof Kozlowski , Rob Herring , Krzysztof Kozlowski , linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v14 1/4] dt-bindings: i2c: pca954x: Correct interrupt support Date: Mon, 1 May 2023 11:15:48 +0200 Message-Id: <20230501091552.847240-2-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230501091552.847240-1-patrick.rudolph@9elements.com> References: <20230501091552.847240-1-patrick.rudolph@9elements.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Only some of the PCA954x compatible ICs have interrupt capability, but the binding advertises it on all ICs. Sync the dt-binding with the driver and only advertise it on: - nxp,pca9542 - nxp,pca9543 - nxp,pca9544 - nxp,pca9545 Signed-off-by: Patrick Rudolph Reviewed-by: Krzysztof Kozlowski --- .../bindings/i2c/i2c-mux-pca954x.yaml | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml b/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml index 9f1726d0356b..e5c1070903ef 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml +++ b/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml @@ -12,9 +12,6 @@ maintainers: description: The binding supports NXP PCA954x and PCA984x I2C mux/switch devices. -allOf: - - $ref: /schemas/i2c/i2c-mux.yaml# - properties: compatible: oneOf: @@ -63,6 +60,24 @@ required: - compatible - reg +allOf: + - $ref: /schemas/i2c/i2c-mux.yaml# + - if: + not: + properties: + compatible: + contains: + enum: + - nxp,pca9542 + - nxp,pca9543 + - nxp,pca9544 + - nxp,pca9545 + then: + properties: + interrupts: false + "#interrupt-cells": false + interrupt-controller: false + unevaluatedProperties: false examples: @@ -74,7 +89,7 @@ examples: #size-cells = <0>; i2c-mux@74 { - compatible = "nxp,pca9548"; + compatible = "nxp,pca9545"; #address-cells = <1>; #size-cells = <0>; reg = <0x74>; From patchwork Mon May 1 09:15:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Rudolph X-Patchwork-Id: 678262 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 B8161C77B73 for ; Mon, 1 May 2023 09:16:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232228AbjEAJQD (ORCPT ); Mon, 1 May 2023 05:16:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232208AbjEAJQB (ORCPT ); Mon, 1 May 2023 05:16:01 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D51A19A for ; Mon, 1 May 2023 02:15:59 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-94f109b1808so463929166b.1 for ; Mon, 01 May 2023 02:15:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1682932558; x=1685524558; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GuNFj/Sv0obKbqv7GFeCeV1CkO9oywslV9siQ5uNg7M=; b=G6Ljo2qfAMqmZZW+412uovfauTRrYJvv9XbHOxWasgjrYCdCbrKAxe2jxQEtxJkpDf oW7dLiA03YMw2DFnCyuHNrLwOBTRPFFwmkJoPc0tK2mFxsLVc3I9B+65Hco4JiEVd7yR wURptg0m9ofJIYbVpf1elrLNYCJG8oRT5CU+q7ZcbweYTJNAUP6iy4KOUaGgQWRn+73p EV5/MPs0knGVS2HpSLxLWBLTQOYuMGFP2B3t/k8kbhQ35Y8M5/WxSnrAHKmCa7TDtOa9 7EmESYC4I21ofK8d4Y07dSXYiAAhCyWZ4TNHTne7uqljTy9Dx+xgIu+EbH/e5iLzUJyl xP8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682932558; x=1685524558; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GuNFj/Sv0obKbqv7GFeCeV1CkO9oywslV9siQ5uNg7M=; b=F4UETYIjfmsmYs2fpSql0VslBCLSGtoD0y6afCNO7Mbo9ZEahEafCIxWR773W+rWew JiJ9mMYVvHrnB8U3c2IvkwohN2uJsA71stm+grJuPXhI04ibuC4j0srTnCxO3RP3xhJz ewJNgkSAk/Ueqmw4W4iZj8MZAnvq/d6rOhMtdy8zIzHPjWjsfV00v7zi2eFvoaVtEV75 BuWnFbzyCdMfiLpKd1ORoPKwbs2qzSFyWL/39g8yInZLe+Y9PM9ZbzPsBGow6wz1JDzY zQk4PWoQZ3tXxeBxKGdQpkd1ZcgoqxCmtuaFb1Fi1tznXBB7xnWbbx6V9+rsUGZ3LoXR wD2w== X-Gm-Message-State: AC+VfDx2uBmZOp9tsd97tHHl1pel4ENQI1NmC9HwdFG6aB1Zzr60v7XZ yemSyjLUCXXUcEthqGgtXQ00aQ== X-Google-Smtp-Source: ACHHUZ4IBapUB0VUpbuVU3+Bdvg9ufT5mMVCX0Qt3FnfosKNhfvchoLw6Amt7kC7GCxaY0oZYn33xA== X-Received: by 2002:a17:907:318e:b0:94f:9acc:65c9 with SMTP id xe14-20020a170907318e00b0094f9acc65c9mr11599423ejb.66.1682932557711; Mon, 01 May 2023 02:15:57 -0700 (PDT) Received: from fedora.. (ip-095-222-150-251.um34.pools.vodafone-ip.de. [95.222.150.251]) by smtp.gmail.com with ESMTPSA id xa3-20020a170907b9c300b0094e954fd015sm14714266ejc.175.2023.05.01.02.15.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 May 2023 02:15:57 -0700 (PDT) From: Patrick Rudolph To: Peter Rosin , Laurent Pinchart Cc: Patrick Rudolph , Krzysztof Kozlowski , Rob Herring , Krzysztof Kozlowski , linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v14 2/4] dt-bindings: i2c: Add Maxim MAX735x/MAX736x variants Date: Mon, 1 May 2023 11:15:49 +0200 Message-Id: <20230501091552.847240-3-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230501091552.847240-1-patrick.rudolph@9elements.com> References: <20230501091552.847240-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 existing pca954x driver. For chips that are powered off by default add a regulator called vdd-supply. Signed-off-by: Patrick Rudolph Reviewed-by: Krzysztof Kozlowski --- .../bindings/i2c/i2c-mux-pca954x.yaml | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml b/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml index e5c1070903ef..6fed6eae9c9b 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml +++ b/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml @@ -4,18 +4,29 @@ $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 NXP PCA954x and compatible devices are I2C bus + multiplexer/switches that share the same functionality + and register layout. + The devices usually have 4 or 8 child buses, which are + attached to the parent bus by using the SMBus "Send Byte" + command. properties: compatible: oneOf: - enum: + - maxim,max7356 + - maxim,max7357 + - maxim,max7358 + - maxim,max7367 + - maxim,max7368 + - maxim,max7369 - nxp,pca9540 - nxp,pca9542 - nxp,pca9543 @@ -56,6 +67,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 @@ -68,6 +82,8 @@ allOf: compatible: contains: enum: + - maxim,max7367 + - maxim,max7369 - nxp,pca9542 - nxp,pca9543 - nxp,pca9544 @@ -94,6 +110,8 @@ examples: #size-cells = <0>; reg = <0x74>; + vdd-supply = <&p3v3>; + interrupt-parent = <&ipic>; interrupts = <17 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; From patchwork Mon May 1 09:15:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Rudolph X-Patchwork-Id: 678511 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 53C30C77B61 for ; Mon, 1 May 2023 09:16:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229785AbjEAJQI (ORCPT ); Mon, 1 May 2023 05:16:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232225AbjEAJQD (ORCPT ); Mon, 1 May 2023 05:16:03 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B67221AE for ; Mon, 1 May 2023 02:16:00 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-94f6c285d92so462215766b.3 for ; Mon, 01 May 2023 02:16:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1682932559; x=1685524559; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cQeLaD3HUZbD2Ee3JfwMlwyfJrMSNuv/+sgPjlCpSVc=; b=TvhGRJGTK89DC0+U4lIRW+jv5IeBkYB5JNILcUIgu1mHGLN14ptqmmQHWK4CMX8JYU GokEDh2j1R9NWkT16/PSOYTLWtkd8tw3TRfImrsNREAAK3Gspkg94QAJQcbXXU4jvVkd 8pyKNjDa3hnTq10wo0V6muWENjUTBn2uo/bsp+Fu59Zi/0uF5ETm5AEZNXlo8mVnaoZ2 Fcvcttmm2Kt63DVk4+pwJq4c7eIFSKYE7jySDK8sl7L+L8TnTUIF1UKr2mXVFiuTxV/4 2pNTlLMaVJeUEjwXYHVLVC1iLvTRyVdRTSwh/UemlcchVAEpSpfZRfPt3g1szDP7sDUN qVKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682932559; x=1685524559; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cQeLaD3HUZbD2Ee3JfwMlwyfJrMSNuv/+sgPjlCpSVc=; b=LUkwg/ZsDsBJ0S/qYRwn9Dha0ctMPddbSG7l0tAoqtcmRmMA6idE4huAo6oH3mw7iu owkFim7Pif4GT798vfCeh7h5g1JQ7L/8j9y4OIoYJU8FucLdfV6Rjb53XSPjRr0s7tlN Y4zZfggHl+KVhHeOzs7Vih9VpzNCHWxuzpRIhKDgaIdIj6DQEL9XD8FDASs8islhaCOT PJDifWTgr7U0aj7wzNL9iZGepF2lRtxI4rF0IXUB5ZNca46iPH1QlSWggvufSfV0ZewG kHvkEHKLcisOGCREOU4+3fCP8w7EBauLVkQhS9mLlr8ljPyauw5puOrQ8gEZbsKvP+4E OTzA== X-Gm-Message-State: AC+VfDyDGxrWsOm01cZPJbeHN+2J4qMp0+K/3gJjd5aOwhWCwfZCyQkt 6YLN2zQ97ejYcAdI0Su2J/k3xA== X-Google-Smtp-Source: ACHHUZ7LMzO3p4PsUnv9BbyEsQ4mDxsTpVPrsv8tedfXsc2elSsmvw1CgHgA2MrnBJuWb0QFwYyIJg== X-Received: by 2002:a17:907:1b08:b0:961:be96:b0e6 with SMTP id mp8-20020a1709071b0800b00961be96b0e6mr317390ejc.68.1682932559076; Mon, 01 May 2023 02:15:59 -0700 (PDT) Received: from fedora.. (ip-095-222-150-251.um34.pools.vodafone-ip.de. [95.222.150.251]) by smtp.gmail.com with ESMTPSA id xa3-20020a170907b9c300b0094e954fd015sm14714266ejc.175.2023.05.01.02.15.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 May 2023 02:15:58 -0700 (PDT) From: Patrick Rudolph To: Peter Rosin Cc: Patrick Rudolph , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v14 3/4] i2c: muxes: pca954x: Add MAX735x/MAX736x support Date: Mon, 1 May 2023 11:15:50 +0200 Message-Id: <20230501091552.847240-4-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230501091552.847240-1-patrick.rudolph@9elements.com> References: <20230501091552.847240-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. 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. Signed-off-by: Patrick Rudolph --- drivers/i2c/muxes/Kconfig | 6 +-- drivers/i2c/muxes/i2c-mux-pca954x.c | 64 ++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig index ea838dbae32e..db1b9057612a 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. + If you say yes here you get support for NXP PCA954x/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 0ccee2ae5720..968111442625 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 9elements GmbH * * 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 @@ -51,6 +58,12 @@ #define PCA954X_IRQ_OFFSET 4 enum pca_type { + max_7356, + max_7357, + max_7358, + max_7367, + max_7368, + max_7369, pca_9540, pca_9542, pca_9543, @@ -90,8 +103,45 @@ struct pca954x { raw_spinlock_t lock; }; -/* Provide specs for the PCA954x types we know about */ +/* Provide specs for the MAX735x, PCA954x and PCA984x 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, + .id = { .manufacturer_id = I2C_DEVICE_ID_NONE }, + /* No interrupt controller support. + The interrupt provides information about stuck channels. */ + }, + [max_7358] = { + .nchans = 8, + .muxtype = pca954x_isswi, + .id = { .manufacturer_id = I2C_DEVICE_ID_NONE }, + /* No interrupt controller support. + The interrupt provides information about stuck channels. */ + }, + [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 +227,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 +250,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] }, From patchwork Mon May 1 09:15:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Rudolph X-Patchwork-Id: 678261 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 89BB6C7EE21 for ; Mon, 1 May 2023 09:16:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232258AbjEAJQM (ORCPT ); Mon, 1 May 2023 05:16:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232208AbjEAJQE (ORCPT ); Mon, 1 May 2023 05:16:04 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B035619D for ; Mon, 1 May 2023 02:16:01 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-94eff00bcdaso465865766b.1 for ; Mon, 01 May 2023 02:16:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1682932560; x=1685524560; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=deLhqHNlkRGaOVPkjyoMd684bHUV64uU06CP2w8Rkjc=; b=gj0WDZrvDo6kdPGp5lFtedx5wR7mFPU8FR0fdP8cVEhniVnsLG1KeCwwwnzFaUILX0 Caa1boWYSK1UkDkNcEXV0Pc9oOEvhyrWlWtdpazA65ypqCGKOEGgDVbYW9zt6w/uscZ9 yiolFislJzxwOdEH2pXWnabryAs8MJhTu1XTkMqe7OjGXxIhYJXgWVocGoPv1VfJHb1w V7RDc2/LQOjrHEpUAD4LShHCLdq2Jzr2BNUy8ldShYiUQ4I5rajthijHF0DJYtJXVTfX ZU7C/FCiyJo7d8YuIUjM2+i5eIq1Dg5oOO/VS5eBdofjNK+o4h4W+761L9A8EH5GxYEh zHhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682932560; x=1685524560; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=deLhqHNlkRGaOVPkjyoMd684bHUV64uU06CP2w8Rkjc=; b=H7FZ8AchySEMlhJ3+7YNMlgK43q8ouMtvYDhmx6k0NZ61KXQifmKxDf7DGhphpSDhP HtQh8T46B2s079cwfk4x3GZDFWtJR1xe4NjPlYfcDhJg8hLi9uSMWgLFg5OocgbIIYIp m+gylM2/bt4Zfc4SdQcOQbU24LOVdsI3GYq4HsTTkvsMjkl2RdZx7FACDqi3L1qAT2hq /P/JDpBco84WIpXavKwkqH/NoxKTXuef1AXUgW8lW46j3RNJWvUI2H72plA1YE4k+5Eu TcxaRVRhrLHFbzOVWXzgreHem+eto4FeVYXfKcfmu9/HwQMPyfkJZkZ+xcQ75fs9MM+0 Ay8w== X-Gm-Message-State: AC+VfDwLx4L+/04xVryz63drV6VRmoIb2JCGDtA+sB/dNszAXLSkuGgK 6o3sJZsaaj7/sgu37awWUuH5Qw== X-Google-Smtp-Source: ACHHUZ4Y4cbO7jqnHQ+V0Unb725qqsrtAckf2/0TSgsaBOt3rZZjTc6hfx4mrxGzT5lGMzWBvvT1uA== X-Received: by 2002:a17:907:728d:b0:95f:2046:d20d with SMTP id dt13-20020a170907728d00b0095f2046d20dmr12568044ejc.2.1682932560217; Mon, 01 May 2023 02:16:00 -0700 (PDT) Received: from fedora.. (ip-095-222-150-251.um34.pools.vodafone-ip.de. [95.222.150.251]) by smtp.gmail.com with ESMTPSA id xa3-20020a170907b9c300b0094e954fd015sm14714266ejc.175.2023.05.01.02.15.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 May 2023 02:15:59 -0700 (PDT) From: Patrick Rudolph To: Peter Rosin Cc: Patrick Rudolph , Andi Shyti , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v14 4/4] i2c: muxes: pca954x: Add regulator support Date: Mon, 1 May 2023 11:15:51 +0200 Message-Id: <20230501091552.847240-5-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230501091552.847240-1-patrick.rudolph@9elements.com> References: <20230501091552.847240-1-patrick.rudolph@9elements.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Add a vdd regulator and enable it for boards that have the mux powered off by default. Signed-off-by: Patrick Rudolph Reviewed-by: Andi Shyti --- drivers/i2c/muxes/i2c-mux-pca954x.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index 968111442625..b863f7b18190 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 @@ -101,6 +102,7 @@ struct pca954x { struct irq_domain *irq; unsigned int irq_mask; raw_spinlock_t lock; + struct regulator *supply; }; /* Provide specs for the MAX735x, PCA954x and PCA984x types we know about */ @@ -444,6 +446,8 @@ static void pca954x_cleanup(struct i2c_mux_core *muxc) struct pca954x *data = i2c_mux_priv(muxc); int c, irq; + regulator_disable(data->supply); + if (data->irq) { for (c = 0; c < data->chip->nchans; c++) { irq = irq_find_mapping(data->irq, c); @@ -496,10 +500,22 @@ static int pca954x_probe(struct i2c_client *client) i2c_set_clientdata(client, muxc); data->client = client; + data->supply = devm_regulator_get(dev, "vdd"); + if (IS_ERR(data->supply)) + return dev_err_probe(dev, PTR_ERR(data->supply), + "Failed to request regulator\n"); + + ret = regulator_enable(data->supply); + if (ret) + return dev_err_probe(dev, ret, + "Failed to enable vdd supply\n"); + /* 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); @@ -516,7 +532,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 || @@ -524,7 +540,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; } } @@ -543,7 +560,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);