From nobody Thu Oct 9 10:24:31 2025 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E7662E54DC; Tue, 17 Jun 2025 20:44:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750193064; cv=none; b=rkKQCtAcZudtginvtPTJJt3PC1ds/cARFIgX3Yh1Vs2K6NcJ/f2lcu2uG3A/qMHhgzukSsGoQfj7DAB8CMY8WPH5pOSZI63JgS5I15UXMVUv3R1NFU2wQPmVjsmQACXGEcWaYhj/7kBFPJm4qaI9lPesrnOpJQI3dpFFjBtYvQU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750193064; c=relaxed/simple; bh=9lIFVe210wCu+O443MgNIvllaTLGJCign0qNJVr/45g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QjFHsMRdeqozfsiK+Wu2d6gaQk5uPw43Bo03Y8svk3+eBjZwUGCoYy5fsFoCP32Ug+FFB+YUeL+8Vsam8jfSgsL+twb/aPFnUbGlCNFsF1NAkc4QzLeplYtSROurFIU7nqLmSbvuya63UWB5q8NeCJWXCgV6I642dsgFJGqdO1w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VDalPvuM; arc=none smtp.client-ip=209.85.218.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VDalPvuM" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-adf34d5e698so11984366b.1; Tue, 17 Jun 2025 13:44:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750193060; x=1750797860; 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=8J0Aj11It6mAJ2X+eSr/snawf5NmFdByKSofgIW0Fwo=; b=VDalPvuMUm1g90bBatwomQg3OPTIs3NihlcfK7wNFCswheDT96XaV+mZDCWxfGBVCw jdpZp+OThCCTUyCXkyGH2ujpZay8683/OU2XpeYwcw+DkoBJEduFrzUPdYrbUxYcANxZ b+GJFKTI1XHIYQ7KNUaXGM47nMC3VSJmlCm79YPTP91QNvAVGUxKl824f0TU6Cg9rBD2 pXlujATibUyDMknEnfF4TWilPC4tMRL0qWrjht+G89RkWOfQ8SJYlEbqq4CAZFVylKqm RHZA5cXFcbcJE1iQr3ZVJVs40zA/Rn/W9hQaE5M4aTlP2tlr/WP/dXRJNkwUlC/PWW+G q93A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750193060; x=1750797860; 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=8J0Aj11It6mAJ2X+eSr/snawf5NmFdByKSofgIW0Fwo=; b=KyohumnAAnIWyuNi7EweMoqEfD4nGNflx5vjBbDANwyJ1TXvgJFw7SdfCFmoBSHDtc +GnVCq6RYunhJ0X+oO/JH7uEoeQUIuXxUbtRWqzRinOvW0a2R0i6zB0EkdtVhGSpKeEl L9LAoTxUyUVX1XkTG14IBESxjgg7U1TV/yqxUOJvZ+nyLXF0CNziYn7IHWi7AmafMxsN z68fD3zgH5FTe3Te1n90AyIetlUibEHVA9WotziP4eIis/OBvcY44RlqfuER8jWD4as+ 9/HVGNfyh2kh63+WF9UxxbparTW78e3got3R6dWWr65SMMP8Zo+5xtqBl9aB322+HxkI 9+SQ== X-Forwarded-Encrypted: i=1; AJvYcCWxeb9yQMbn4g+1oNWuQEACMtpTKihzFWg9CnIcxUrpGZlavONVTr/xNc0RgfM12rl2LqRVDTU+PXpVTjuA@vger.kernel.org, AJvYcCXaHTauZDmCYbg7TdAbPp4nbKar1Leh+Dixv+0di9cFOxo5qOgPdCilDK1c40/pcLIM7Y2jAzUpNxm/@vger.kernel.org X-Gm-Message-State: AOJu0YwF0H0dvIq8BPRpjBMiobQ8MRJggac1DxqNt/H/gQ++bZfk6MSj 1lx4WZH0qZJ+SEhugDqN4PSeiG8nvWefVKB3V28syw6/VTXq0ySgtc/8hdrnDvO9 X-Gm-Gg: ASbGncut+SjjGrnBI1ALR8tHN5fDKFL5gn9kaVhtl9zyB+gI4bPtNNciuoBpdTC6D8c DOMGyMlkma4ix1FPhV9GDGDAA7EKgfHWR6RS9mPR9DcHJ0HjKDBfEMEhiKxOfdQfMrqfjF/Wu46 aReDJVwXrzQXBW3WolxpKZ44SBLvW49/e/N9uNq4Xf8e0PqDkwY2QTLjIi2vTTLi9bQvy7u1tNm XydIbeeRvxTkoNQYxQ3R7ugu5kV5KMaUGn7ta/6ve4PnPa+ZFgk/vcF7GP3H2wJwLI9sXc/LYnm YTpLNGSoF7WRIAJ1UfZ5vu7rD9zTJRwFd1pawNtiX0U6oFbC+MwG1WLIHSzx+YCAi+xEOogvvgw WtqcLqkOIoca6g196bg== X-Google-Smtp-Source: AGHT+IHTmyRusS3kct6v+nxW8Z4vUHO5XQ4wFD69OSBC9FYHBzyA1QCfkY0a8VXtw3doBXcI8q2VxQ== X-Received: by 2002:a17:907:94c8:b0:ade:44da:d2cf with SMTP id a640c23a62f3a-adf9e2ce1c0mr1595431166b.18.1750193060420; Tue, 17 Jun 2025 13:44:20 -0700 (PDT) Received: from maria-HP-Pavilion-Laptop.home ([178.226.54.132]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-adec7b8fe73sm911857866b.0.2025.06.17.13.44.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jun 2025 13:44:20 -0700 (PDT) From: Maria Garcia To: linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij , Bartosz Golaszewski , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Maria Garcia , Maria Garcia Subject: [PATCH 1/2] dt-bindings: gpio: pca95xx: add TI TCA6418 Date: Tue, 17 Jun 2025 22:44:01 +0200 Message-ID: <20250617204402.33656-2-mariagarcia7293@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250617204402.33656-1-mariagarcia7293@gmail.com> References: <20250617204402.33656-1-mariagarcia7293@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The TCA6418E is a 18-channel I2C I/O expander with integrated ESD protection. Signed-off-by: Maria Garcia Acked-by: Conor Dooley --- Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml b/Doc= umentation/devicetree/bindings/gpio/gpio-pca95xx.yaml index 4d3f52f8d1b8..12134c737ad8 100644 --- a/Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml +++ b/Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml @@ -68,6 +68,7 @@ properties: - ti,pca9536 - ti,tca6408 - ti,tca6416 + - ti,tca6418 - ti,tca6424 - ti,tca9535 - ti,tca9538 --=20 2.43.0 From nobody Thu Oct 9 10:24:31 2025 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 89E362E719C; Tue, 17 Jun 2025 20:44:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750193068; cv=none; b=sT62tk1wSylZIlc3/wHHU9TLBJrrcp+paUoUrqWOAEISewVwVMmn7Sn7UDaEJgO/bpJQ1lPK2v9Ykca4HyM+Jo4i3WYArwmIus6QNqsIU+e2lxegWR/fVZXuKy71+ZvdSyZ48UNKwpvzy+935ptkd2QKVCrwuWo3zAG+ekk7prM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750193068; c=relaxed/simple; bh=sYAPtFdjuAKuqc4VaQUAZRkxVXkZRxpSMveykkOuu2o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pSsUeD5QnoIfbnXc4sOywhzlHusl5OM46DZ6nE07/0Qqlvtu2Pf0IsNXuR4m2o6/p/nZ/AWRrmzgKevm20FojPZKI65z0ihed+m2JnHI5gbwR28kkGsBDppidyADubL6L4FM+Kh/W242HzxLnt18J1DgBEvuMBa/5uKdEPvC+Dg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Rya9WdkJ; arc=none smtp.client-ip=209.85.218.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Rya9WdkJ" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-ad891bb0957so1119147966b.3; Tue, 17 Jun 2025 13:44:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750193064; x=1750797864; 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=h/s91vta0kTK6rWLy93aEq22bvH84T445RMN6cvAClg=; b=Rya9WdkJVusoyd1VZJN2HIcvrqPYrekQxqAUh6Us2Qh/U2Z3kANL+FgsPgBylhLVmv VQ74bEGZMC9AZif13wW442YOsYYPIzG9LKQYJXXfqjv9Am8zbje+S8WrdSvT+7c8wiBa Kk+vDtb8Vc/DxX0iheQXKfm9yDwDCuAVFO4udW1jPQbHhVO/6WcRWA5P0d6E3TpQRgWh AOFf7f0P5GCp7n3fRYVu7WOoBHnyX4VQpypUZM8GW0PmyaGJy+KWtGS/ZoRvrXxTt12B TovTl6kfLvNPozQ+9t35uV0At2EYmQPDfnRGMeNlhDRtaETlCAwV5WTNB26wWwvJDu5U piPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750193064; x=1750797864; 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=h/s91vta0kTK6rWLy93aEq22bvH84T445RMN6cvAClg=; b=F8MLxjS24xKr0dvHqgv4wVj3eDZgcJS2eOR8Yyt0PiNa8HTjsDYm9BvF4ynOgB6Vah GN4Yo7UWSblKlipkbMLrxxBrSOw4Kj9/zrmTtpxCF+TwG9DU3FbmelksPiAN3tFSZJyP C9JO8zFx9T9iGDnMri6xLHC50riGfM6M543wUfnVAai6oklnibOkxhdq2cCB1DT/RZkz cU+W7dqKrrwz2isMzC8mVb2KfXSScV7/VAHJEhIe4cDzTIfFK8i33uxMySZeg+NWJfuh XD2xDT9PBznw7KClNrDUdZpTdPJkchiRBEBjL62oIOE6KNZFtjz0jijLvYgbfYveh7dQ hcig== X-Forwarded-Encrypted: i=1; AJvYcCU1FnQGklTJYCBVz/EKWWYyihe9MGcDhP4fTr0OYv6Fth2paHASA/O0rl4TBt/w/DmJYlqqv19S2+FSdsfV@vger.kernel.org, AJvYcCXVJOCqKO5Hw3JY/ZeowiKavt70oCWGXQfgeak46DkZT/xCzZ6v416Rvof9EfUHXEj7e90QYKj8OwvH@vger.kernel.org X-Gm-Message-State: AOJu0Yy5A/n05qmBsEMMlN+Ko+oqjmI4BnrbqAOEpT7+BlSGbn6iugqI IA2sgcpa8j88DnTT8/uc0C3ozNFG6ec/Q4eDXRHUggnK6PZvudWd/vx2JSOjOOPz X-Gm-Gg: ASbGncv/C7sAlbaW6BAj+K/w3I60vglxV0fpvrXc0Pfz1dNH8Fvbx2urowAfDBJycoC g4rlIqzHS2taPrlO6nC93zRnl8030otNTyzRNjov86wrp4dLikdbgQRUlOzuyrPYvbzEPGvB0pO 4yZZ77b9z63UYIswGYpNXIfMykSBw9albg2LeY2IkRNHQhieZ5OyeNpHoJWDi+uJY3vhjW4LB7K /IFV0POHAkqLVRM4OBLclGbWC2LbxWYf69egAZUx6QH4vvexL7M8Q/e0Z9+GhvMfqjp6ckWbM3q IBrUmB9b1Rr7g7KiNlSjwqhaoBDFGR5WvVqT5zhROarCXPHx9b7MuOlvhizlC3YkxLD7UoyoGwA 7i8sTkPstfmy81hjSlg== X-Google-Smtp-Source: AGHT+IFryB0VdhlPgLLGynIH5UA3tZCvFiYsh4cl4Jv6FEPDS+gQH8Md0j7T+kKXOywqb55lcAdqjA== X-Received: by 2002:a17:907:72c9:b0:ad8:8529:4f83 with SMTP id a640c23a62f3a-adfad449c2bmr1278227666b.39.1750193064457; Tue, 17 Jun 2025 13:44:24 -0700 (PDT) Received: from maria-HP-Pavilion-Laptop.home ([178.226.54.132]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-adec7b8fe73sm911857866b.0.2025.06.17.13.44.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jun 2025 13:44:24 -0700 (PDT) From: Maria Garcia To: linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij , Bartosz Golaszewski , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Maria Garcia , Maria Garcia Subject: [PATCH 2/2] gpio: pca953x: Add support for TI TCA6418 Date: Tue, 17 Jun 2025 22:44:02 +0200 Message-ID: <20250617204402.33656-3-mariagarcia7293@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250617204402.33656-1-mariagarcia7293@gmail.com> References: <20250617204402.33656-1-mariagarcia7293@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The TI TCA6418 is a 18-channel I2C I/O expander. It is slightly different to other models from the same family, such as TCA6416, but has enough in common with them to make it work with just a few tweaks, which are explained in the code's documentation. Signed-off-by: Maria Garcia --- drivers/gpio/gpio-pca953x.c | 110 ++++++++++++++++++++++++++++++++---- 1 file changed, 98 insertions(+), 12 deletions(-) diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index b852e4997629..9fe28d7ba667 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -38,6 +38,10 @@ #define PCA953X_INVERT 0x02 #define PCA953X_DIRECTION 0x03 =20 +#define TCA6418_INPUT 0x14 +#define TCA6418_OUTPUT 0x17 +#define TCA6418_DIRECTION 0x23 + #define REG_ADDR_MASK GENMASK(5, 0) #define REG_ADDR_EXT BIT(6) #define REG_ADDR_AI BIT(7) @@ -76,7 +80,8 @@ #define PCA953X_TYPE BIT(12) #define PCA957X_TYPE BIT(13) #define PCAL653X_TYPE BIT(14) -#define PCA_TYPE_MASK GENMASK(15, 12) +#define TCA6418_TYPE BIT(16) +#define PCA_TYPE_MASK GENMASK(16, 12) =20 #define PCA_CHIP_TYPE(x) ((x) & PCA_TYPE_MASK) =20 @@ -115,6 +120,7 @@ static const struct i2c_device_id pca953x_id[] =3D { { "pca6107", 8 | PCA953X_TYPE | PCA_INT, }, { "tca6408", 8 | PCA953X_TYPE | PCA_INT, }, { "tca6416", 16 | PCA953X_TYPE | PCA_INT, }, + { "tca6418", 18 | TCA6418_TYPE | PCA_INT, }, { "tca6424", 24 | PCA953X_TYPE | PCA_INT, }, { "tca9538", 8 | PCA953X_TYPE | PCA_INT, }, { "tca9539", 16 | PCA953X_TYPE | PCA_INT, }, @@ -204,6 +210,13 @@ static const struct pca953x_reg_config pca957x_regs = =3D { .invert =3D PCA957X_INVRT, }; =20 +static const struct pca953x_reg_config tca6418_regs =3D { + .direction =3D TCA6418_DIRECTION, + .output =3D TCA6418_OUTPUT, + .input =3D TCA6418_INPUT, + .invert =3D 0xFF, /* Does not apply */ +}; + struct pca953x_chip { unsigned gpio_start; struct mutex i2c_lock; @@ -237,6 +250,21 @@ static int pca953x_bank_shift(struct pca953x_chip *chi= p) return fls((chip->gpio_chip.ngpio - 1) / BANK_SZ); } =20 +/* Helper function to get the correct bit mask for a given offset and chip= type. + * The TCA6418's input, output, and direction banks have a peculiar bit or= der: + * the first byte uses reversed bit order, while the second byte uses stan= dard order. + */ +static inline u8 pca953x_get_bit_mask(struct pca953x_chip *chip, unsigned = int offset) +{ + unsigned int bit_pos_in_bank =3D offset % BANK_SZ; + int msb =3D BANK_SZ - 1; + + if (PCA_CHIP_TYPE(chip->driver_data) =3D=3D TCA6418_TYPE && offset <=3D m= sb) + return BIT(msb - bit_pos_in_bank); + else + return BIT(bit_pos_in_bank); +} + #define PCA953x_BANK_INPUT BIT(0) #define PCA953x_BANK_OUTPUT BIT(1) #define PCA953x_BANK_POLARITY BIT(2) @@ -353,6 +381,23 @@ static bool pcal6534_check_register(struct pca953x_chi= p *chip, unsigned int reg, return true; } =20 +/* TCA6418 breaks the PCA953x register order rule */ +static bool tca6418_check_register(struct pca953x_chip *chip, unsigned int= reg, + u32 access_type_mask) +{ + /* Valid Input Registers - BIT(0) for readable access */ + if (reg >=3D TCA6418_INPUT && reg < (TCA6418_INPUT + NBANK(chip))) + return (access_type_mask & BIT(0)); + /* Valid Output Registers - BIT(1) for writeable access */ + if (reg >=3D TCA6418_OUTPUT && reg < (TCA6418_OUTPUT + NBANK(chip))) + return (access_type_mask & (BIT(0) | BIT(1))); + /* Valid Direction Registers - BIT(2) for volatile access */ + if (reg >=3D TCA6418_DIRECTION && reg < (TCA6418_DIRECTION + NBANK(chip))) + return (access_type_mask & (BIT(0) | BIT(1))); + + return false; +} + static bool pca953x_readable_register(struct device *dev, unsigned int reg) { struct pca953x_chip *chip =3D dev_get_drvdata(dev); @@ -362,6 +407,9 @@ static bool pca953x_readable_register(struct device *de= v, unsigned int reg) bank =3D PCA957x_BANK_INPUT | PCA957x_BANK_OUTPUT | PCA957x_BANK_POLARITY | PCA957x_BANK_CONFIG | PCA957x_BANK_BUSHOLD; + } else if (PCA_CHIP_TYPE(chip->driver_data) =3D=3D TCA6418_TYPE) { + /* BIT(0) to indicate read access */ + return tca6418_check_register(chip, reg, BIT(0)); } else { bank =3D PCA953x_BANK_INPUT | PCA953x_BANK_OUTPUT | PCA953x_BANK_POLARITY | PCA953x_BANK_CONFIG; @@ -384,6 +432,9 @@ static bool pca953x_writeable_register(struct device *d= ev, unsigned int reg) if (PCA_CHIP_TYPE(chip->driver_data) =3D=3D PCA957X_TYPE) { bank =3D PCA957x_BANK_OUTPUT | PCA957x_BANK_POLARITY | PCA957x_BANK_CONFIG | PCA957x_BANK_BUSHOLD; + } else if (PCA_CHIP_TYPE(chip->driver_data) =3D=3D TCA6418_TYPE) { + /* BIT(1) for write access */ + return tca6418_check_register(chip, reg, BIT(1)); } else { bank =3D PCA953x_BANK_OUTPUT | PCA953x_BANK_POLARITY | PCA953x_BANK_CONFIG; @@ -403,6 +454,9 @@ static bool pca953x_volatile_register(struct device *de= v, unsigned int reg) =20 if (PCA_CHIP_TYPE(chip->driver_data) =3D=3D PCA957X_TYPE) bank =3D PCA957x_BANK_INPUT; + else if (PCA_CHIP_TYPE(chip->driver_data) =3D=3D TCA6418_TYPE) + /* BIT(2) for volatile access */ + return tca6418_check_register(chip, reg, BIT(2)); else bank =3D PCA953x_BANK_INPUT; =20 @@ -489,6 +543,15 @@ static u8 pcal6534_recalc_addr(struct pca953x_chip *ch= ip, int reg, int off) return pinctrl + addr + (off / BANK_SZ); } =20 +static u8 tca6418_recalc_addr(struct pca953x_chip *chip, int reg_base, int= offset) +{ + /* reg_base will be TCA6418_INPUT, TCA6418_OUTPUT, or TCA6418_DIRECTION + * offset is the global GPIO line offset (0-17) + * BANK_SZ is 8 for TCA6418 (8 bits per register bank) + */ + return reg_base + (offset / BANK_SZ); +} + static int pca953x_write_regs(struct pca953x_chip *chip, int reg, unsigned= long *val) { u8 regaddr =3D chip->recalc_addr(chip, reg, 0); @@ -529,11 +592,14 @@ static int pca953x_gpio_direction_input(struct gpio_c= hip *gc, unsigned off) { struct pca953x_chip *chip =3D gpiochip_get_data(gc); u8 dirreg =3D chip->recalc_addr(chip, chip->regs->direction, off); - u8 bit =3D BIT(off % BANK_SZ); + u8 bit =3D pca953x_get_bit_mask(chip, off); =20 guard(mutex)(&chip->i2c_lock); =20 - return regmap_write_bits(chip->regmap, dirreg, bit, bit); + if (PCA_CHIP_TYPE(chip->driver_data) =3D=3D TCA6418_TYPE) + return regmap_write_bits(chip->regmap, dirreg, bit, 0); + else + return regmap_write_bits(chip->regmap, dirreg, bit, bit); } =20 static int pca953x_gpio_direction_output(struct gpio_chip *gc, @@ -542,7 +608,7 @@ static int pca953x_gpio_direction_output(struct gpio_ch= ip *gc, struct pca953x_chip *chip =3D gpiochip_get_data(gc); u8 dirreg =3D chip->recalc_addr(chip, chip->regs->direction, off); u8 outreg =3D chip->recalc_addr(chip, chip->regs->output, off); - u8 bit =3D BIT(off % BANK_SZ); + u8 bit =3D pca953x_get_bit_mask(chip, off); int ret; =20 guard(mutex)(&chip->i2c_lock); @@ -552,15 +618,20 @@ static int pca953x_gpio_direction_output(struct gpio_= chip *gc, if (ret) return ret; =20 - /* then direction */ - return regmap_write_bits(chip->regmap, dirreg, bit, 0); + /* then direction + * (in/out logic is inverted on TCA6418) + */ + if (PCA_CHIP_TYPE(chip->driver_data) =3D=3D TCA6418_TYPE) + return regmap_write_bits(chip->regmap, dirreg, bit, bit); + else + return regmap_write_bits(chip->regmap, dirreg, bit, 0); } =20 static int pca953x_gpio_get_value(struct gpio_chip *gc, unsigned off) { struct pca953x_chip *chip =3D gpiochip_get_data(gc); u8 inreg =3D chip->recalc_addr(chip, chip->regs->input, off); - u8 bit =3D BIT(off % BANK_SZ); + u8 bit =3D pca953x_get_bit_mask(chip, off); u32 reg_val; int ret; =20 @@ -577,7 +648,7 @@ static int pca953x_gpio_set_value(struct gpio_chip *gc,= unsigned int off, { struct pca953x_chip *chip =3D gpiochip_get_data(gc); u8 outreg =3D chip->recalc_addr(chip, chip->regs->output, off); - u8 bit =3D BIT(off % BANK_SZ); + u8 bit =3D pca953x_get_bit_mask(chip, off); =20 guard(mutex)(&chip->i2c_lock); =20 @@ -588,7 +659,7 @@ static int pca953x_gpio_get_direction(struct gpio_chip = *gc, unsigned off) { struct pca953x_chip *chip =3D gpiochip_get_data(gc); u8 dirreg =3D chip->recalc_addr(chip, chip->regs->direction, off); - u8 bit =3D BIT(off % BANK_SZ); + u8 bit =3D pca953x_get_bit_mask(chip, off); u32 reg_val; int ret; =20 @@ -597,10 +668,17 @@ static int pca953x_gpio_get_direction(struct gpio_chi= p *gc, unsigned off) if (ret < 0) return ret; =20 - if (reg_val & bit) + /* (in/out logic is inverted on TCA6418) */ + if (reg_val & bit) { + if (PCA_CHIP_TYPE(chip->driver_data) =3D=3D TCA6418_TYPE) + return GPIO_LINE_DIRECTION_OUT; + else + return GPIO_LINE_DIRECTION_IN; + } + if (PCA_CHIP_TYPE(chip->driver_data) =3D=3D TCA6418_TYPE) return GPIO_LINE_DIRECTION_IN; - - return GPIO_LINE_DIRECTION_OUT; + else + return GPIO_LINE_DIRECTION_OUT; } =20 static int pca953x_gpio_get_multiple(struct gpio_chip *gc, @@ -1120,6 +1198,11 @@ static int pca953x_probe(struct i2c_client *client) if (PCA_CHIP_TYPE(chip->driver_data) =3D=3D PCAL653X_TYPE) { chip->recalc_addr =3D pcal6534_recalc_addr; chip->check_reg =3D pcal6534_check_register; + } else if (PCA_CHIP_TYPE(chip->driver_data) =3D=3D TCA6418_TYPE) { + chip->recalc_addr =3D tca6418_recalc_addr; + /* We don't assign chip->check_reg =3D tca6418_check_register directly h= ere. + * Instead, the wrappers handle the dispatch based on PCA_CHIP_TYPE. + */ } else { chip->recalc_addr =3D pca953x_recalc_addr; chip->check_reg =3D pca953x_check_register; @@ -1157,6 +1240,8 @@ static int pca953x_probe(struct i2c_client *client) if (PCA_CHIP_TYPE(chip->driver_data) =3D=3D PCA957X_TYPE) { chip->regs =3D &pca957x_regs; ret =3D device_pca957x_init(chip); + } else if (PCA_CHIP_TYPE(chip->driver_data) =3D=3D TCA6418_TYPE) { + chip->regs =3D &tca6418_regs; } else { chip->regs =3D &pca953x_regs; ret =3D device_pca95xx_init(chip); @@ -1325,6 +1410,7 @@ static const struct of_device_id pca953x_dt_ids[] =3D= { { .compatible =3D "ti,pca9536", .data =3D OF_953X( 4, 0), }, { .compatible =3D "ti,tca6408", .data =3D OF_953X( 8, PCA_INT), }, { .compatible =3D "ti,tca6416", .data =3D OF_953X(16, PCA_INT), }, + { .compatible =3D "ti,tca6418", .data =3D (void *)(18 | TCA6418_TYPE | PC= A_INT), }, { .compatible =3D "ti,tca6424", .data =3D OF_953X(24, PCA_INT), }, { .compatible =3D "ti,tca9535", .data =3D OF_953X(16, PCA_INT), }, { .compatible =3D "ti,tca9538", .data =3D OF_953X( 8, PCA_INT), }, --=20 2.43.0