From patchwork Tue Oct 13 18:22:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Figg X-Patchwork-Id: 35897 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 29DBEB7BBC for ; Wed, 14 Oct 2009 05:24:11 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1Mxm2Y-0000Hu-7q; Tue, 13 Oct 2009 19:24:06 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1Mxm1z-0000DZ-AL for kernel-team@lists.ubuntu.com; Tue, 13 Oct 2009 19:23:31 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1Mxm1z-0002UF-9I for ; Tue, 13 Oct 2009 19:23:31 +0100 Received: from pool-173-50-147-79.ptldor.fios.verizon.net ([173.50.147.79] helo=localhost) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1Mxm1y-00021L-TA for kernel-team@lists.ubuntu.com; Tue, 13 Oct 2009 19:23:31 +0100 From: Brad Figg To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] mxc spi: fix spi driver for 2.6.31 Date: Tue, 13 Oct 2009 11:22:53 -0700 Message-Id: <1255458173-7878-2-git-send-email-brad.figg@canonical.com> X-Mailer: git-send-email 1.6.4.4 In-Reply-To: <1255458173-7878-1-git-send-email-brad.figg@canonical.com> References: <1255458173-7878-1-git-send-email-brad.figg@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.8 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Rob Herring Signed-off-by: Brad Figg --- drivers/spi/mxc_spi.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c index 32e7640..0b622e9 100644 --- a/drivers/spi/mxc_spi.c +++ b/drivers/spi/mxc_spi.c @@ -777,6 +777,11 @@ int mxc_spi_setup(struct spi_device *spi) return 0; } +static int mxc_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t) +{ + return 0; +} + /*! * This function is called when the data has to transfer from/to the * current SPI device in poll mode @@ -963,6 +968,7 @@ static int mxc_spi_probe(struct platform_device *pdev) master->bus_num = pdev->id + 1; master->num_chipselect = mxc_platform_info->maxchipselect; + master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; #ifdef CONFIG_SPI_MXC_TEST_LOOPBACK master->num_chipselect += 1; #endif @@ -1000,6 +1006,7 @@ static int mxc_spi_probe(struct platform_device *pdev) master_drv_data->mxc_bitbang.txrx_bufs = mxc_spi_transfer; master_drv_data->mxc_bitbang.master->setup = mxc_spi_setup; master_drv_data->mxc_bitbang.master->cleanup = mxc_spi_cleanup; + master_drv_data->mxc_bitbang.setup_transfer = mxc_spi_setup_transfer; /* Initialize the completion object */