Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 458E1C47094 for ; Mon, 7 Jun 2021 12:27:15 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2D19C61001 for ; Mon, 7 Jun 2021 12:27:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2D19C61001 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 08EE182CE6; Mon, 7 Jun 2021 14:27:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1623068822; bh=mQXYTBv7jUW1B/xSjLw4VTjMP0Eu0siJWJeo0tNXAyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Is8WWK5+CCPPY4R5jjvXyNrglP3IOaTpp6Zmtcchjs65RO39CD2nYmAJZz4uj9Xf2 fak2mfnORg7rpK7JQgAxJOUjs+LtyxnSU124vZcC27SJDgtOv9e+OYKpq5DfDT8Wy0 DDuij5mRzbkWEqtaxBmBSUE0k6F04Fc53ZLjd3HecDyJk7mM/2jsQc+E4TIYoeBHZm h6Q/xhWCS7Pw9hppyDtqCEHYnFWtl+6+iLDa+FUerKNqJ5SVYET+ivUGxEnpshHXpk 26p5RWMv/9LvSPnb2g772e6cicxaSLCxyDpe6+9AFrauIQsF4K8YZF2hNAhvlUkfXa WRomqEbXYDOEQ== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 944D582AAC; Mon, 7 Jun 2021 14:26:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1623068817; bh=mQXYTBv7jUW1B/xSjLw4VTjMP0Eu0siJWJeo0tNXAyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jgLlYjU2iByPqNL3pyh1DZsxApx4ih221ncAwhrL2zERZTWELGYsqRbmAYVs7scdh LJdqaa5j+qSeaokbv/yVIea/jpK2keag4ddib2VtaAust3bHaO8XIJU75eDtfBuH/9 P8g6ULcZma1RpSU8Iy7j2LCvLwQGMqutpNiWdi9wKYMkXFcUcIUZet/u/KngKHz0Nx /oXio7dhqUPFMv4VRUddMamgct6qB6IyXGTChDqJkP4a9w+UcAKVaHLMYhdLF2cpNt pW/tsunILM52rX464viWgD/NStLBzd/84i2ue/6ojAhOTRqmOg1aOgAVbYqpXm0cov FV7suR5B/AdDA== From: Lukasz Majewski To: u-boot@lists.denx.de Cc: Lukasz Majewski , Heiko Schocher , Simon Glass Subject: [PATCH 2/2] i2c: pcf8575: Add support for 8 bit I2C IO expanders (like pca8574) Date: Mon, 7 Jun 2021 14:26:34 +0200 Message-Id: <20210607122634.19556-2-lukma@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210607122634.19556-1-lukma@denx.de> References: <20210607122634.19556-1-lukma@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean This patch add support for using NXP's pca8574 I2C IO expander, which has only 8 IO lines. After this change the .data member's information from struct udevice_id are used to either sent one or two bytes. Moreover, the '_le16' suffix from pcf8575_i2c_{write|read}_le16() functions have been removed as now we also sent 8 bit data. Signed-off-by: Lukasz Majewski --- drivers/gpio/pcf8575_gpio.c | 40 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/drivers/gpio/pcf8575_gpio.c b/drivers/gpio/pcf8575_gpio.c index bae9695f28b1..d5930d941fc0 100644 --- a/drivers/gpio/pcf8575_gpio.c +++ b/drivers/gpio/pcf8575_gpio.c @@ -12,15 +12,9 @@ * * Copyright (C) 2007 David Brownell * - */ - -/* - * NOTE: The driver and devicetree bindings are borrowed from Linux - * Kernel, but driver does not support all PCF857x devices. It currently - * supports PCF8575 16-bit expander by TI and NXP. + * Add support for 8 bit expanders - like pca8574 + * Copyright (C) 2021 Lukasz Majewski - DENX Software Engineering * - * TODO(vigneshr@ti.com): - * Support 8 bit PCF857x compatible expanders. */ #include @@ -49,15 +43,15 @@ struct pcf8575_chip { unsigned int out; /* software latch */ }; -/* Read/Write to 16-bit I/O expander */ +/* Read/Write to I/O expander */ -static int pcf8575_i2c_write_le16(struct udevice *dev, unsigned int word) +static int pcf8575_i2c_write(struct udevice *dev, unsigned int word) { struct dm_i2c_chip *chip = dev_get_parent_plat(dev); u8 buf[2] = { word & 0xff, word >> 8, }; int ret; - ret = dm_i2c_write(dev, 0, buf, 2); + ret = dm_i2c_write(dev, 0, buf, dev_get_driver_data(dev)); if (ret) printf("%s i2c write failed to addr %x\n", __func__, chip->chip_addr); @@ -65,13 +59,13 @@ static int pcf8575_i2c_write_le16(struct udevice *dev, unsigned int word) return ret; } -static int pcf8575_i2c_read_le16(struct udevice *dev) +static int pcf8575_i2c_read(struct udevice *dev) { struct dm_i2c_chip *chip = dev_get_parent_plat(dev); - u8 buf[2]; + u8 buf[2] = {0x00, 0x00}; int ret; - ret = dm_i2c_read(dev, 0, buf, 2); + ret = dm_i2c_read(dev, 0, buf, dev_get_driver_data(dev)); if (ret) { printf("%s i2c read failed from addr %x\n", __func__, chip->chip_addr); @@ -87,7 +81,7 @@ static int pcf8575_direction_input(struct udevice *dev, unsigned offset) int status; plat->out |= BIT(offset); - status = pcf8575_i2c_write_le16(dev, plat->out); + status = pcf8575_i2c_write(dev, plat->out); return status; } @@ -103,7 +97,7 @@ static int pcf8575_direction_output(struct udevice *dev, else plat->out &= ~BIT(offset); - ret = pcf8575_i2c_write_le16(dev, plat->out); + ret = pcf8575_i2c_write(dev, plat->out); return ret; } @@ -112,7 +106,7 @@ static int pcf8575_get_value(struct udevice *dev, unsigned int offset) { int value; - value = pcf8575_i2c_read_le16(dev); + value = pcf8575_i2c_read(dev); return (value < 0) ? value : ((value & BIT(offset)) >> offset); } @@ -130,8 +124,11 @@ static int pcf8575_ofdata_plat(struct udevice *dev) int n_latch; - uc_priv->gpio_count = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), - "gpio-count", 16); + /* + * Number of pins depends on the expander device and is specified + * in the struct udevice_id (as in the Linue kernel). + */ + uc_priv->gpio_count = dev_get_driver_data(dev) * 8; uc_priv->bank_name = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "gpio-bank-name", NULL); if (!uc_priv->bank_name) @@ -163,8 +160,9 @@ static const struct dm_gpio_ops pcf8575_gpio_ops = { }; static const struct udevice_id pcf8575_gpio_ids[] = { - { .compatible = "nxp,pcf8575" }, - { .compatible = "ti,pcf8575" }, + { .compatible = "nxp,pcf8575", .data = 2 }, + { .compatible = "ti,pcf8575", .data = 2 }, + { .compatible = "nxp,pca8574", .data = 1 }, { } }; -- 2.20.1