From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 26 Sep 2024 13:24:14 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1stmbV-002yva-2G for lore@lore.pengutronix.de; Thu, 26 Sep 2024 13:24:14 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1stmbU-0003Iz-1G for lore@pengutronix.de; Thu, 26 Sep 2024 13:24:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=UpjrJct4pPXVW0sM6qWarwFHveOThP+hb4PFkS/fRq8=; b=Gf4IiXX9E6F37SIT1HaTDrGYGd XdAv8QuUqcH/BVsP6MQnNbHDolYBWiRva7g+VjYF5gx9fzhm39XbEXH8wp3fJhrcKLvGIcGYCO6mY fB6eVz5PpwCdYjV7reaesFHgPIW2c5IsX+sMDJmdeFt02gFgSkZPTupEA37iqW5xN/iqfGtPvE1LA u4e4m1v4bdU8QtNBV5aNt+oBY9ZpuaHdQd5StHOlciPqIx2Nz7tnuv2FqaR1YVz+AT77ABGdAiShC K1/M78nl5T7BY41NnVURBiFn2sAPR1q0PxPOs6M1DdxguhAgyFje5ov7qXxp0hthjZ39xUkx08VVl H5X31u4Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1stmas-00000008DwA-2PUo; Thu, 26 Sep 2024 11:23:34 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1stmZ9-00000008DM2-19WO for barebox@lists.infradead.org; Thu, 26 Sep 2024 11:21:48 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1stmZ0-00019I-11; Thu, 26 Sep 2024 13:21:38 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1stmYz-001fkp-Ho; Thu, 26 Sep 2024 13:21:37 +0200 Received: from localhost ([::1] helo=dude02.red.stw.pengutronix.de) by dude02.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1stmYz-00Fi9J-31; Thu, 26 Sep 2024 13:21:37 +0200 From: Sascha Hauer Date: Thu, 26 Sep 2024 13:21:38 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240926-spi-gpio-v2-2-3bf7b511c8c0@pengutronix.de> References: <20240926-spi-gpio-v2-0-3bf7b511c8c0@pengutronix.de> In-Reply-To: <20240926-spi-gpio-v2-0-3bf7b511c8c0@pengutronix.de> To: "open list:BAREBOX" X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1727349697; l=2949; i=s.hauer@pengutronix.de; s=20230412; h=from:subject:message-id; bh=booFy6003Y1jcv2hwXmUoX2reTszAczbYIF/arnc2VM=; b=69nAv8SwpVhjl+NlAz43xjtvUq62gG2ZvVfuk9NQUopoBuesPofEJGKJQ2XtLDDToMKu0otm5 TXkFC6Q4mySDMOn6TJ/N3MXQkq9c2/Vungg2261xY1f2XIgVN+UZ4hZ X-Developer-Key: i=s.hauer@pengutronix.de; a=ed25519; pk=4kuc9ocmECiBJKWxYgqyhtZOHj5AWi7+d0n/UjhkwTg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240926_042147_361958_1C598FFA X-CRM114-Status: GOOD ( 13.38 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ahmad Fatoum Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.0 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 2/5] spi: spi-gpio: support different word widths X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) The spi-gpio driver only supports 8bit word width. Add support for arbitrary word widths up to 32bit. Reviewed-by: Ahmad Fatoum Signed-off-by: Sascha Hauer --- drivers/spi/gpio_spi.c | 57 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 9 deletions(-) diff --git a/drivers/spi/gpio_spi.c b/drivers/spi/gpio_spi.c index dc9f46ca45..d23abf3dfb 100644 --- a/drivers/spi/gpio_spi.c +++ b/drivers/spi/gpio_spi.c @@ -78,7 +78,7 @@ static inline u32 gpio_spi_txrx_word(struct spi_device *spi, unsigned nsecs, return bitbang_txrx_be_cpha0(spi, nsecs, cpol, word, bits); } -static int gpio_spi_transfer_one(struct spi_device *spi, struct spi_transfer *t) +static int gpio_spi_transfer_one_u8(struct spi_device *spi, struct spi_transfer *t) { bool read = (t->rx_buf) ? true : false; u32 word = 0; @@ -87,14 +87,59 @@ static int gpio_spi_transfer_one(struct spi_device *spi, struct spi_transfer *t) for (n = 0; n < t->len; n++) { if (!read) word = ((const u8 *)t->tx_buf)[n]; - word = gpio_spi_txrx_word(spi, 0, word, 8); + word = gpio_spi_txrx_word(spi, 0, word, spi->bits_per_word); + if (read) + ((u8 *)t->rx_buf)[n] = word; + } + + return 0; +} + +static int gpio_spi_transfer_one_u16(struct spi_device *spi, struct spi_transfer *t) +{ + bool read = (t->rx_buf) ? true : false; + u32 word = 0; + int n; + + for (n = 0; n < t->len / 2; n++) { + if (!read) + word = ((const u16 *)t->tx_buf)[n]; + word = gpio_spi_txrx_word(spi, 0, word, spi->bits_per_word); if (read) - ((u8 *)t->rx_buf)[n] = word & 0xff; + ((u16 *)t->rx_buf)[n] = word; } return 0; } +static int gpio_spi_transfer_one_u32(struct spi_device *spi, struct spi_transfer *t) +{ + bool read = (t->rx_buf) ? true : false; + u32 word = 0; + int n; + + for (n = 0; n < t->len / 4; n++) { + if (!read) + word = ((const u32 *)t->tx_buf)[n]; + word = gpio_spi_txrx_word(spi, 0, word, spi->bits_per_word); + if (read) + ((u32 *)t->rx_buf)[n] = word; + } + + return 0; +} + +static int gpio_spi_transfer_one(struct spi_device *spi, struct spi_transfer *t) +{ + if (spi->bits_per_word <= 8) + return gpio_spi_transfer_one_u8(spi, t); + if (spi->bits_per_word <= 16) + return gpio_spi_transfer_one_u16(spi, t); + if (spi->bits_per_word <= 32) + return gpio_spi_transfer_one_u32(spi, t); + return -EINVAL; +} + static int gpio_spi_transfer(struct spi_device *spi, struct spi_message *msg) { struct spi_transfer *t; @@ -120,12 +165,6 @@ static int gpio_spi_transfer(struct spi_device *spi, struct spi_message *msg) static int gpio_spi_setup(struct spi_device *spi) { - if (spi->bits_per_word != 8) { - dev_err(spi->master->dev, "master does not support %d bits per word\n", - spi->bits_per_word); - return -EINVAL; - } - return 0; } -- 2.39.5