From patchwork Fri Oct 27 18:47:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 159132 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp814037vqb; Fri, 27 Oct 2023 11:48:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEXBmDiytkjpGjoIvf86Rqja19OerAyXbAAQav+QSPdtLCHni2C56T1m4pWCEhMmg/ONsEK X-Received: by 2002:a81:4310:0:b0:5a7:ab51:af5c with SMTP id q16-20020a814310000000b005a7ab51af5cmr4024557ywa.13.1698432520144; Fri, 27 Oct 2023 11:48:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698432520; cv=none; d=google.com; s=arc-20160816; b=TNNbB9x9Kpq54M3Ztewn3Cp6dXzUBx3nxQmo3Yx9At5UMmXPL/N13rHCge3w0Igrhy ITX+wWcroWGLxPZ52gqRv10GvTmRyr099UsfT966g3ZIjTyTgO/5jXc7JlmAbyVo6hwD lOLjKbsuL/M1YcBbCRDuCWPEpbbIKS/ZHdViltWmnhetXHs0oxLGRRzHx9fKbxoNVrIa SvwU2/gK2pHG18xZWIX+TaHJC+rufz+Vq8qIEdtxugLphCm0VJPqKNJxNbb82JdIvipg queQSpZNHMp9uWZZmy25cfjrFQdUAp9XU90D5QWDHHeDNE6ip52MlAkBw7xSmwvqTgzP 6vkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=eNQIp/KBXkssBnXnURnyXEtwPP/esZe3h0yYIlPjhVo=; fh=jfO3qXBvny8wUJxRts3onfcG7lZqzJi886/v29Km+DA=; b=hUPjo8lKlQQCQPfP6qBumHGgYvHCUmGIKE8JZF2AAgppQOEeTOJ8FpRwzMXYD4ANl+ RspgZ74JfzQqwFIScSalMiB2b91O/M/QAKnyV7f9mhoo44ad/Te7T9JvhYDfkdLuB2xI g8owsKzeIcdDdIXBwKNgPsDsrHOGnBwbpd5Zgh763QFmvSO4g91ZNSb7rC9ln93pWaiw JEEtbS7ZR8ydw0VePbCUSw7keU094i6Qv8VkK5Z67JsVbspUBcjVEAfYVhtK9ww41l0F z5PruymXUhRmOgYFC3S9qYFrDMWr40JlXwTfKwSHEgUSOHQQ9hHD02mUdJNO8oEUlXmb IxAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b="QeNtJAt/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id c192-20020a814ec9000000b0059c07cce3d0si3259510ywb.321.2023.10.27.11.48.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 11:48:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b="QeNtJAt/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 66B0780BD745; Fri, 27 Oct 2023 11:48:37 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235221AbjJ0SsC (ORCPT + 25 others); Fri, 27 Oct 2023 14:48:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235194AbjJ0Sro (ORCPT ); Fri, 27 Oct 2023 14:47:44 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFC9019B9 for ; Fri, 27 Oct 2023 11:47:21 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-32d9d8284abso1536218f8f.3 for ; Fri, 27 Oct 2023 11:47:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1698432439; x=1699037239; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=eNQIp/KBXkssBnXnURnyXEtwPP/esZe3h0yYIlPjhVo=; b=QeNtJAt/rdAhVrhvVRHNzf+dYPFLSSlLB1aEaI4Z6ZhcB6zUdTFKAuJ4iZmA9m7y30 4XBDnhfk1R9O4BYjV5TjvXzl+iDXoYQkjucAvEsutBB0i68PkAQfuyDIdiObltYosgEJ ZWNXquJ6HrJFbq2QW1q13kfPcOINXDT+lNtWYpgOJGvR+Ar4mdV0t4uzwPbNqpQxL2T6 ExrEJd6WxC9eSx97KwLythW1xTRlI6qoJQf/63TD5pDk4xpa9PIWA199TvR78a3snvMZ /ouScNJG8gRR6V746eV5FFE2Jx3W6RRzKaOxwwff4WsZMaPp3N6XkeKnH24dMLKi6lAj xM3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698432439; x=1699037239; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=eNQIp/KBXkssBnXnURnyXEtwPP/esZe3h0yYIlPjhVo=; b=YRMSzRU0vVvOpanL3xmpC14iVWu4v+MsbH/3k1lhUxKNcW7FM6gTPAnabK9KaNT6no oBu/IXZih9XO02deGWaTBh6+CutE853FfblCTiP2hpvKa1AD5ljrr2/4fbxPphOCGPRW 8rob+ylwt2fI4ZNwyXNy/EOlnPZLiKyNZZC1NVArxyQyaV9RUe3uSrOXghV0IYB6ws5o lshgw5TBaT9e/LF5V4BszRobejn/DQZri42tPqgC+1XyEd66YdO6PG/4WngmJcDmJYuI /GsSVg0/AAyL16wmat6Kx48Yw2UCxfTicDOU9LrTGr6zGlemS8Vv1eo/HteWuUOQF/pV JYgA== X-Gm-Message-State: AOJu0YwBF7cur21vv1nJ8pElb6ofWSz/QRUWVtJakW1Yyy7Ql2nEOdgC +gSTv1VQK25AG6ocdaL/eQsMdw== X-Received: by 2002:a05:6000:10c5:b0:32d:9a17:2a70 with SMTP id b5-20020a05600010c500b0032d9a172a70mr2605651wrx.68.1698432439392; Fri, 27 Oct 2023 11:47:19 -0700 (PDT) Received: from stroh80.sec.9e.network (ip-078-094-000-051.um19.pools.vodafone-ip.de. [78.94.0.51]) by smtp.gmail.com with ESMTPSA id j12-20020adfe50c000000b0032d893d8dc8sm2298527wrm.2.2023.10.27.11.47.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 11:47:18 -0700 (PDT) From: Naresh Solanki To: Peter Rosin , Andi Shyti , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Laurent Pinchart Cc: robh@kernel.org, Patrick Rudolph , Naresh Solanki , linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 1/2] dt-bindings: i2c: pca954x: Add custom properties for MAX7357 Date: Fri, 27 Oct 2023 18:47:07 +0000 Message-ID: <20231027184709.1541375-1-naresh.solanki@9elements.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Fri, 27 Oct 2023 11:48:37 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780935577829179035 X-GMAIL-MSGID: 1780935577829179035 From: Patrick Rudolph Maxim Max7357 has a configuration register to enable additional features. These features aren't enabled by default & its up to board designer to enable the same as it may have unexpected side effects. These should be validated for proper functioning & detection of devices in secondary bus as sometimes it can cause secondary bus being disabled. Add booleans for: - maxim,isolate-stuck-channel - maxim,send-flush-out-sequence - maxim,preconnection-wiggle-test-enable Signed-off-by: Patrick Rudolph Signed-off-by: Naresh Solanki Reviewed-by: Rob Herring --- Changes in V4: - Drop max7358. Changes in V3: - Update commit message Changes in V2: - Update properties. --- .../bindings/i2c/i2c-mux-pca954x.yaml | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) base-commit: 9b156db7e479ac996ae9dc93a0cce3b3df3d0307 diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml b/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml index 2d7bb998b0e9..9aa0585200c9 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml +++ b/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml @@ -71,6 +71,23 @@ properties: description: A voltage regulator supplying power to the chip. On PCA9846 the regulator supplies power to VDD2 (core logic) and optionally to VDD1. + maxim,isolate-stuck-channel: + type: boolean + description: Allows to use non faulty channels while a stuck channel is + isolated from the upstream bus. If not set all channels are isolated from + the upstream bus until the fault is cleared. + + maxim,send-flush-out-sequence: + type: boolean + description: Send a flush-out sequence to stuck auxiliary buses + automatically after a stuck channel is being detected. + + maxim,preconnection-wiggle-test-enable: + type: boolean + description: Send a STOP condition to the auxiliary buses when the switch + register activates a channel to detect a stuck high fault. On fault the + channel is isolated from the upstream bus. + required: - compatible - reg @@ -95,6 +112,19 @@ allOf: "#interrupt-cells": false interrupt-controller: false + - if: + not: + properties: + compatible: + contains: + enum: + - maxim,max7357 + then: + properties: + maxim,isolate-stuck-channel: false + maxim,send-flush-out-sequence: false + maxim,preconnection-wiggle-test-enable: false + unevaluatedProperties: false examples: From patchwork Fri Oct 27 18:47:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 159131 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp813925vqb; Fri, 27 Oct 2023 11:48:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5HxjTj3fCRa+Mxd2vhwofXz5AABQddu0v21rahTwlE20JHahC0n5CU0pMgbOW/Y7cP2NI X-Received: by 2002:a81:79c6:0:b0:5a7:baac:7b34 with SMTP id u189-20020a8179c6000000b005a7baac7b34mr3492882ywc.28.1698432505502; Fri, 27 Oct 2023 11:48:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698432505; cv=none; d=google.com; s=arc-20160816; b=oZgY4isUSQlM5NF7m5AAFoTSqkwRHN5ESah7/Cievf6lNTVevPm6G3/KXq82UFYNSQ lntXx4P7nYY+a/SRyT3ehuUOkG7vNvTomUCzMGpYubzsx0nWGbBEznh74FcKmq6ZHeJg YbthGdipO/vFweLCg/z2liqFW0dOr/HbtnMYbDIBMquXvzrP/YQz0srvrxvQiUkm3LSg 87x1ErIe3rEwJ4E6mibk0K8+o5Yof5fshzvN8ZlUGdRtbHmzLKvvNozlqhHIJcXmPOLj zXnOa/iqJY1yEltFR/e7pzaBs7EfEZP02KKyGUavEEGhOVht95yU1rN/pnWfYPqaXta1 cLxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KM+51/Ab8q9Ob1ygxdet2j1y8TyHO4eFE3VACdVz/qw=; fh=2nC6Eum3KPrNBmIby8V3XGk+pStcLbxmYHi8gkGLd5Q=; b=hc9Ybut9ZuQGL8WsKYCuBZ92THg3Tqvlgy3aIL6boK4FsUNLwSYRvE7JebYKmJQeFd wAMV6QFj36vPXk/6oecsIxXMrsd3FrQgiNnImjsuQ+nFoQQUdt1eO/afNx2+kZPXqmYD tCPeJ9gKvWbG1WQmpVu/7a6yjGTPXqNIr61WqkU+iJ6fxVP5btRUz/GswmE7KDwk7Q37 sQXGaI9HQdWX/VjNwlRr0yF+ZFyYSKoL61IWDG1Ht9r7Mqj4jNVxb3PcRJfzV+puxyeD UwD1VWwbR4/cJBy7mxjqUXw9tFUSEunGPspFJIiHHtNwYBmjpFOF6/Fhj03yiXPHsw/l P/DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b="hCuE/Xxw"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id l185-20020a0dfbc2000000b005657dbf47c7si3055583ywf.459.2023.10.27.11.48.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 11:48:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b="hCuE/Xxw"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 97B3583383C6; Fri, 27 Oct 2023 11:48:22 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346569AbjJ0SsF (ORCPT + 25 others); Fri, 27 Oct 2023 14:48:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235230AbjJ0Srq (ORCPT ); Fri, 27 Oct 2023 14:47:46 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4567C1BC9 for ; Fri, 27 Oct 2023 11:47:22 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-32d849cc152so1626751f8f.1 for ; Fri, 27 Oct 2023 11:47:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1698432441; x=1699037241; darn=vger.kernel.org; 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=KM+51/Ab8q9Ob1ygxdet2j1y8TyHO4eFE3VACdVz/qw=; b=hCuE/XxwPWtTF5iPZCADkjYwkp3/0mZ6nKDv0DQRwhpG7VqVl6uaOMi8jODvzcPCKU 3/rLFVByVldZignqZ8Pu2hoQy4huW4sidrnJtIq5OTI2qgCCK0gVBKjFTehBnURx5ahP WvrgmMdLu4wXIcCC0V8qAthInYguwJmi8PpYCzjN4o0MwLIknYh1PJE4XFwPQzn2XLwA aLBvZ9o+lFjAoxBo4YvRM0nCXn4NNX3ESvwvNZr104NUKwV/bbrXwIm0TtoC4kehqXOw GHddrQwKZCwpvXbPG6uBw3vD6PWijNYwMec8oAGWfi/4kEfrot7lkuvV4AbGpXqcS85U aAtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698432441; x=1699037241; 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=KM+51/Ab8q9Ob1ygxdet2j1y8TyHO4eFE3VACdVz/qw=; b=Mb7gbSBnniLgse20wiVnJRQ+I8iUPHHYqFqPtOt0Qo4XBEtb6zzlleDpOmXAu8ll+x PKY9gGGfFFUYsDRGEEKgGY2B7geLnH6CQcgzdwjUbaVOs5fYpnqd3vj0xOM0OE3QJDYB mM+zvGknK0u/Sr7DD4SLqL/tTWxcuZFy2H4r0bixJSzCIL4P4XQylo9n8q4DYeenwhPa 7+l2dSdAHJxXy58UeuTplPhAJRL3dkjQOqpvnySK5HD3fvaGg5eR+OhDr2wtHnfZkdNf MvD/uhNN9MmQ8a8rgRAWSiaIC7q2eEZX57X6X2v4YdAqF8EgLaO+8R24j+dMcD7Ed4SN 03Qw== X-Gm-Message-State: AOJu0YzmYoY7rMPWFifmM9rNUD+ncyOBUp35jTKfZdIhBp0jxp0nKapH fRkqADzJkF8BJgLVo+JWzKFgzA== X-Received: by 2002:a5d:5b0e:0:b0:32d:ad4a:bcef with SMTP id bx14-20020a5d5b0e000000b0032dad4abcefmr3447970wrb.2.1698432440652; Fri, 27 Oct 2023 11:47:20 -0700 (PDT) Received: from stroh80.sec.9e.network (ip-078-094-000-051.um19.pools.vodafone-ip.de. [78.94.0.51]) by smtp.gmail.com with ESMTPSA id j12-20020adfe50c000000b0032d893d8dc8sm2298527wrm.2.2023.10.27.11.47.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 11:47:20 -0700 (PDT) From: Naresh Solanki To: Peter Rosin Cc: andi.shyti@kernel.org, robh@kernel.org, Patrick Rudolph , Naresh Solanki , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 2/2] i2c: muxes: pca954x: Enable features on MAX7357 Date: Fri, 27 Oct 2023 18:47:08 +0000 Message-ID: <20231027184709.1541375-2-naresh.solanki@9elements.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231027184709.1541375-1-naresh.solanki@9elements.com> References: <20231027184709.1541375-1-naresh.solanki@9elements.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Fri, 27 Oct 2023 11:48:22 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780935563258695683 X-GMAIL-MSGID: 1780935563258695683 From: Patrick Rudolph Enable additional features based on DT settings and unconditionally release the shared interrupt pin after 1.6 seconds and allow to use it as reset. These features aren't enabled by default and it's up to board designer to validate for proper functioning and detection of devices in secondary bus as sometimes it can cause secondary bus being disabled. Signed-off-by: Patrick Rudolph Signed-off-by: Naresh Solanki --- Changes in V5: - Fix typos - Update comment - Add newline in dev_warn Changes in V4: - Drop max7358 - Update #define - Move conf variable - Print warning when I2C_FUNC_SMBUS_WRITE_BYTE_DATA isn't supported Changes in V3: - Delete unused #define - Update pca954x_init - Update commit message Changes in V2: - Update comments - Update check for DT properties --- drivers/i2c/muxes/i2c-mux-pca954x.c | 43 ++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index 2219062104fb..f5dfc33b97c0 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -57,6 +57,20 @@ #define PCA954X_IRQ_OFFSET 4 +/* + * MAX7357's configuration register is writeable after POR, but + * can be locked by setting the basic mode bit. MAX7358 configuration + * register is locked by default and needs to be unlocked first. + * The configuration register holds the following settings: + */ +#define MAX7357_CONF_INT_ENABLE BIT(0) +#define MAX7357_CONF_FLUSH_OUT BIT(1) +#define MAX7357_CONF_RELEASE_INT BIT(2) +#define MAX7357_CONF_DISCON_SINGLE_CHAN BIT(4) +#define MAX7357_CONF_PRECONNECT_TEST BIT(7) + +#define MAX7357_POR_DEFAULT_CONF MAX7357_CONF_INT_ENABLE + enum pca_type { max_7356, max_7357, @@ -470,7 +484,34 @@ 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 (device_is_compatible(&client->dev, "maxim,max7357")) { + if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WRITE_BYTE_DATA)) { + u8 conf = MAX7357_POR_DEFAULT_CONF; + /* + * The interrupt signal is shared with the reset pin. Release the + * interrupt after 1.6 seconds to allow using the pin as reset. + */ + conf |= MAX7357_CONF_RELEASE_INT; + + if (device_property_read_bool(&client->dev, "maxim,isolate-stuck-channel")) + conf |= MAX7357_CONF_DISCON_SINGLE_CHAN; + if (device_property_read_bool(&client->dev, + "maxim,send-flush-out-sequence")) + conf |= MAX7357_CONF_FLUSH_OUT; + if (device_property_read_bool(&client->dev, + "maxim,preconnection-wiggle-test-enable")) + conf |= MAX7357_CONF_PRECONNECT_TEST; + + ret = i2c_smbus_write_byte_data(client, data->last_chan, conf); + } else { + dev_warn(&client->dev, "Write byte data not supported." + "Cannot enable enhanced mode features\n"); + ret = i2c_smbus_write_byte(client, data->last_chan); + } + } else { + ret = i2c_smbus_write_byte(client, data->last_chan); + } + if (ret < 0) data->last_chan = 0;