From patchwork Mon Feb 17 13:59:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 3663251 X-Patchwork-Delegate: broonie@sirena.org.uk Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EFF419F2EC for ; Mon, 17 Feb 2014 14:00:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 053B1201DE for ; Mon, 17 Feb 2014 14:00:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E247201E7 for ; Mon, 17 Feb 2014 13:59:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753194AbaBQN76 (ORCPT ); Mon, 17 Feb 2014 08:59:58 -0500 Received: from mail-pd0-f170.google.com ([209.85.192.170]:48260 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753183AbaBQN75 (ORCPT ); Mon, 17 Feb 2014 08:59:57 -0500 Received: by mail-pd0-f170.google.com with SMTP id p10so14934274pdj.15 for ; Mon, 17 Feb 2014 05:59:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:subject:from:to:cc:date:content-type :mime-version:content-transfer-encoding; bh=ZgtaWY+eSViXSQRhH9lTaIEecKZghVGARTZvcmihy1s=; b=HsHRawKxRTtLBxUAwa5O8sHknYK9a0uqQJW3+G+7OL4mwAt2CMAJWV+ZcLiCUzTCcS G2MvZ2RJCsDaMfLOdICMdwWSk6+QPWJnc+5DJODWyR9G1QoaQ2WTA3PXv2jVXNqW5xbq 1s/sP6pdruCei+gLiNiqCLwvKM6Q0TPWrCYn6wHHlN2UNUq5W5YnT2CI2vpiV5Zsm5Cb o7r/0XuTR23ZeoU7yjiIJIc/swTWHBmKWGPHIGwqlIFpF+24hWuhDRk7zxchDMXbmXs4 ORoWkCPgMFLsZtgLsJjjaYLdHPD2GawHiqYZJ12P3zmviO40q8jtyvGUOTJOU81NEqd3 mxAg== X-Gm-Message-State: ALoCoQmfc7EIJ/AT2bXF6MgtpOf4lqVmp+2a2kh1EHf8lE9xYuIUFb0qG+jJI410lhIPAJiYa78Z X-Received: by 10.68.36.41 with SMTP id n9mr15691970pbj.99.1392645597210; Mon, 17 Feb 2014 05:59:57 -0800 (PST) Received: from [192.168.0.102] (218-164-150-161.dynamic.hinet.net. [218.164.150.161]) by mx.google.com with ESMTPSA id zc6sm118371942pab.18.2014.02.17.05.59.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Feb 2014 05:59:56 -0800 (PST) Message-ID: <1392645592.15727.1.camel@phoenix> Subject: [RFT][PATCH] spi: clps711x: Refactor to use core message parsing From: Axel Lin To: Mark Brown Cc: Alexander Shiyan , linux-spi@vger.kernel.org Date: Mon, 17 Feb 2014 21:59:52 +0800 X-Mailer: Evolution 3.6.4-0ubuntu1 Mime-Version: 1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Convert to use default implementation of transfer_one_message() which provides standard handling of delays and chip select management. Signed-off-by: Axel Lin --- Hi Alexander, I don't have this hardware, can you help testing this patch. Thanks, Axel drivers/spi/spi-clps711x.c | 89 ++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 51 deletions(-) diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c index f973e97..6ae0cbf 100644 --- a/drivers/spi/spi-clps711x.c +++ b/drivers/spi/spi-clps711x.c @@ -24,8 +24,6 @@ #define DRIVER_NAME "spi-clps711x" struct spi_clps711x_data { - struct completion done; - struct clk *spi_clk; u32 max_speed_hz; @@ -43,15 +41,6 @@ static int spi_clps711x_setup(struct spi_device *spi) return 0; } -static void spi_clps711x_setup_mode(struct spi_device *spi) -{ - /* Setup edge for transfer */ - if (spi->mode & SPI_CPHA) - clps_writew(clps_readw(SYSCON3) | SYSCON3_ADCCKNSEN, SYSCON3); - else - clps_writew(clps_readw(SYSCON3) & ~SYSCON3_ADCCKNSEN, SYSCON3); -} - static void spi_clps711x_setup_xfer(struct spi_device *spi, struct spi_transfer *xfer) { @@ -73,55 +62,52 @@ static void spi_clps711x_setup_xfer(struct spi_device *spi, SYSCON1_ADCKSEL(0), SYSCON1); } -static int spi_clps711x_transfer_one_message(struct spi_master *master, - struct spi_message *msg) +static void spi_clps711x_set_cs(struct spi_device *spi, bool enable) { - struct spi_clps711x_data *hw = spi_master_get_devdata(master); - struct spi_device *spi = msg->spi; - struct spi_transfer *xfer; - - spi_clps711x_setup_mode(spi); - - list_for_each_entry(xfer, &msg->transfers, transfer_list) { - u8 data; - - spi_clps711x_setup_xfer(spi, xfer); - + if (enable) gpio_set_value(spi->cs_gpio, !!(spi->mode & SPI_CS_HIGH)); + else + gpio_set_value(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH)); +} - reinit_completion(&hw->done); - - hw->len = xfer->len; - hw->bpw = xfer->bits_per_word ? : spi->bits_per_word; - hw->tx_buf = (u8 *)xfer->tx_buf; - hw->rx_buf = (u8 *)xfer->rx_buf; - - /* Initiate transfer */ - data = hw->tx_buf ? *hw->tx_buf++ : 0; - clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN, - SYNCIO); +static int spi_clps711x_prepare_message(struct spi_master *master, + struct spi_message *msg) +{ + struct spi_device *spi = msg->spi; - wait_for_completion(&hw->done); + /* Setup edge for transfer */ + if (spi->mode & SPI_CPHA) + clps_writew(clps_readw(SYSCON3) | SYSCON3_ADCCKNSEN, SYSCON3); + else + clps_writew(clps_readw(SYSCON3) & ~SYSCON3_ADCCKNSEN, SYSCON3); - if (xfer->delay_usecs) - udelay(xfer->delay_usecs); + return 0; +} - if (xfer->cs_change || - list_is_last(&xfer->transfer_list, &msg->transfers)) - gpio_set_value(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH)); +static int spi_clps711x_transfer_one(struct spi_master *master, + struct spi_device *spi, + struct spi_transfer *xfer) +{ + struct spi_clps711x_data *hw = spi_master_get_devdata(master); + u8 data; - msg->actual_length += xfer->len; - } + spi_clps711x_setup_xfer(spi, xfer); - msg->status = 0; - spi_finalize_current_message(master); + hw->len = xfer->len; + hw->bpw = xfer->bits_per_word ? : spi->bits_per_word; + hw->tx_buf = (u8 *)xfer->tx_buf; + hw->rx_buf = (u8 *)xfer->rx_buf; - return 0; + /* Initiate transfer */ + data = hw->tx_buf ? *hw->tx_buf++ : 0; + clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN, SYNCIO); + return 1; } static irqreturn_t spi_clps711x_isr(int irq, void *dev_id) { - struct spi_clps711x_data *hw = (struct spi_clps711x_data *)dev_id; + struct spi_master *master = dev_id; + struct spi_clps711x_data *hw = spi_master_get_devdata(master); u8 data; /* Handle RX */ @@ -135,7 +121,7 @@ static irqreturn_t spi_clps711x_isr(int irq, void *dev_id) clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN, SYNCIO); } else - complete(&hw->done); + complete(&master->xfer_completion); return IRQ_HANDLED; } @@ -173,7 +159,9 @@ static int spi_clps711x_probe(struct platform_device *pdev) master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 8); master->num_chipselect = pdata->num_chipselect; master->setup = spi_clps711x_setup; - master->transfer_one_message = spi_clps711x_transfer_one_message; + master->set_cs = spi_clps711x_set_cs; + master->prepare_message = spi_clps711x_prepare_message; + master->transfer_one = spi_clps711x_transfer_one; hw = spi_master_get_devdata(master); @@ -199,7 +187,6 @@ static int spi_clps711x_probe(struct platform_device *pdev) } hw->max_speed_hz = clk_get_rate(hw->spi_clk); - init_completion(&hw->done); platform_set_drvdata(pdev, master); /* Disable extended mode due hardware problems */ @@ -209,7 +196,7 @@ static int spi_clps711x_probe(struct platform_device *pdev) clps_readl(SYNCIO); ret = devm_request_irq(&pdev->dev, IRQ_SSEOTI, spi_clps711x_isr, 0, - dev_name(&pdev->dev), hw); + dev_name(&pdev->dev), master); if (ret) { dev_err(&pdev->dev, "Can't request IRQ\n"); goto err_out;