Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp101977pxt; Wed, 4 Aug 2021 06:55:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy87hYwnkBBdrMZjGZ1o8yTMaJiiobqliOxYRrYcGNg7lLmFBCVl1jw3SRvmyJScae+TlWS X-Received: by 2002:a17:907:1b1b:: with SMTP id mp27mr25556873ejc.538.1628085349538; Wed, 04 Aug 2021 06:55:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628085349; cv=none; d=google.com; s=arc-20160816; b=F2nA/js8fQqiL9ZlPn17vNZWD5hIGZQ88k3IBv2ftwr7E+3G2a+OZFJ2NN5V8xNwIk rH23Y3CnDPFNh9CZTTNOmiNlhrjH2T9p0JnCPZE1tTp15ByRXjg+Cx0GRjEeCwELIjko p+91VSqLLsxCVw6dVBNZP0alUlfn7tlW+ckqTKkTUmXYe7A7zUAL+tAO3e3o0oHlFPP5 3QhO9h2ofTols2wGjYcamjITuIpPfyUtgJGgJd84wC2nHrWxwTpRvECZPHopylFGJHAh dlTOP7tLAfV0GLCP3xv/8YBhFBzal+DZyqO/QsvMgOX0C70D5oIzAaLoY+Ys/eGLEtEm BqWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=X0vlgDJr2ZM+T0csaYannXjhUm3fFgFf1R0Wc8BrVGc=; b=jelYn88JC15XVd1UWS99iRO2INxX6dOFojdx5NfE6EJ20Qmv8kPnYjLilACJzY22Bc Z53K8zBuBjiQdxxuDgbKDocHhEBsWaH2Tw7hA4jDQvHwXH6Q/m+LMqL4QyGmQ9PZbK+A CKzGFFlC5vDzIgShmAX0pIp1zKhOXbhxFBDVXJEkjSk5uEVad4oDdbqhZbXuo3jCYkQf s5YzXtaNQ8zKbXDeyw6ZlJcYNEth+xE6Zh+q287NHqU1facr7fGRTRf1YwDBj165tO6i /O2/AQxfVrbVRDp/liuOdsmOSBB4v5nYUyMH0IR9Bjw+dP88A7RSmoS0kuTkUFu2kDlB eVjw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u92si2357783edc.287.2021.08.04.06.55.25; Wed, 04 Aug 2021 06:55:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238392AbhHDNyP (ORCPT + 99 others); Wed, 4 Aug 2021 09:54:15 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:46964 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S237798AbhHDNyP (ORCPT ); Wed, 4 Aug 2021 09:54:15 -0400 X-UUID: eda0a67da61a4128aad221ab316670af-20210804 X-UUID: eda0a67da61a4128aad221ab316670af-20210804 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1576804956; Wed, 04 Aug 2021 21:53:59 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs06n1.mediatek.inc (172.21.101.129) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 4 Aug 2021 21:53:58 +0800 Received: from localhost.localdomain (10.15.20.246) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 4 Aug 2021 21:53:57 +0800 From: Mason Zhang To: Mark Brown , Matthias Brugger CC: Laxman Dewangan , , , , , , Mason Zhang Subject: [PATCH v3 1/2] spi: move cs spi_delay to spi_device Date: Wed, 4 Aug 2021 21:37:17 +0800 Message-ID: <20210804133716.32040-1-Mason.Zhang@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As we know, spi core layer has removed spi_set_cs_timing() API. So this patch moved spi_delay for cs_timing from spi_controller to spi_device, because cs timing should be set by spi_device but not controller. Signed-off-by: Mason Zhang --- drivers/spi/spi.c | 6 +++--- include/linux/spi/spi.h | 20 +++++++++----------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index c99181165321..5d68e6cd2a18 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -842,9 +842,9 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force) if (spi->cs_gpiod || gpio_is_valid(spi->cs_gpio) || !spi->controller->set_cs_timing) { if (activate) - spi_delay_exec(&spi->controller->cs_setup, NULL); + spi_delay_exec(&spi->cs_setup, NULL); else - spi_delay_exec(&spi->controller->cs_hold, NULL); + spi_delay_exec(&spi->cs_hold, NULL); } if (spi->mode & SPI_CS_HIGH) @@ -887,7 +887,7 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force) if (spi->cs_gpiod || gpio_is_valid(spi->cs_gpio) || !spi->controller->set_cs_timing) { if (!activate) - spi_delay_exec(&spi->controller->cs_inactive, NULL); + spi_delay_exec(&spi->cs_inactive, NULL); } } diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 97b8d12b5f2b..651e19ba3415 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -147,7 +147,11 @@ extern int spi_delay_exec(struct spi_delay *_delay, struct spi_transfer *xfer); * not using a GPIO line) * @word_delay: delay to be inserted between consecutive * words of a transfer - * + * @cs_setup: delay to be introduced by the controller after CS is asserted + * @cs_hold: delay to be introduced by the controller before CS is deasserted + * @cs_inactive: delay to be introduced by the controller after CS is + * deasserted. If @cs_change_delay is used from @spi_transfer, then the + * two delays will be added up. * @statistics: statistics for the spi_device * * A @spi_device is used to interchange data between an SPI slave @@ -188,6 +192,10 @@ struct spi_device { int cs_gpio; /* LEGACY: chip select gpio */ struct gpio_desc *cs_gpiod; /* chip select gpio desc */ struct spi_delay word_delay; /* inter-word delay */ + /* CS delays */ + struct spi_delay cs_setup; + struct spi_delay cs_hold; + struct spi_delay cs_inactive; /* the statistics */ struct spi_statistics statistics; @@ -412,11 +420,6 @@ extern struct spi_device *spi_new_ancillary_device(struct spi_device *spi, u8 ch * controller has native support for memory like operations. * @unprepare_message: undo any work done by prepare_message(). * @slave_abort: abort the ongoing transfer request on an SPI slave controller - * @cs_setup: delay to be introduced by the controller after CS is asserted - * @cs_hold: delay to be introduced by the controller before CS is deasserted - * @cs_inactive: delay to be introduced by the controller after CS is - * deasserted. If @cs_change_delay is used from @spi_transfer, then the - * two delays will be added up. * @cs_gpios: LEGACY: array of GPIO descs to use as chip select lines; one per * CS number. Any individual value may be -ENOENT for CS lines that * are not GPIOs (driven by the SPI controller itself). Use the cs_gpiods @@ -638,11 +641,6 @@ struct spi_controller { /* Optimized handlers for SPI memory-like operations. */ const struct spi_controller_mem_ops *mem_ops; - /* CS delays */ - struct spi_delay cs_setup; - struct spi_delay cs_hold; - struct spi_delay cs_inactive; - /* gpio chip select */ int *cs_gpios; struct gpio_desc **cs_gpiods; -- 2.18.0