From patchwork Fri Mar 12 15:22:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Ellis X-Patchwork-Id: 85303 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2CFLx9p024668 for ; Fri, 12 Mar 2010 15:22:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934240Ab0CLPWL (ORCPT ); Fri, 12 Mar 2010 10:22:11 -0500 Received: from pan.gwi.net ([207.5.128.165]:3753 "EHLO pan.gwi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934020Ab0CLPWK (ORCPT ); Fri, 12 Mar 2010 10:22:10 -0500 Received: from [192.168.10.4] (66-63-88-74.static.suscom-maine.net [66.63.88.74]) by pan.gwi.net (8.13.1/8.13.1) with ESMTP id o2CFM9Bx033596; Fri, 12 Mar 2010 10:22:09 -0500 (EST) (envelope-from scott@jumpnowtek.com) Subject: [PATCH 5/6] SPI omap2_mcspi.c: Use num chipselects from platform data From: Scott Ellis To: spi-devel-general@lists.sourceforge.net Cc: David Brownell , Grant Likely , Tony Lindgren , Andrew Morton , Roman Tereshonkov , linux-omap@vger.kernel.org, Aaro Koskinen , Kevin Hilman Date: Fri, 12 Mar 2010 10:22:09 -0500 Message-ID: <1268407329.14445.54.camel@quad> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 12 Mar 2010 15:22:19 +0000 (UTC) diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c index cce23c5..cd9fdc2 100644 --- a/drivers/spi/omap2_mcspi.c +++ b/drivers/spi/omap2_mcspi.c @@ -1058,33 +1058,28 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev) struct resource *r; int status = 0, i; const u8 *rxdma_id, *txdma_id; - unsigned num_chipselect; struct omap2_mcspi_platform_config *pdata; switch (pdev->id) { case 1: rxdma_id = spi1_rxdma_id; txdma_id = spi1_txdma_id; - num_chipselect = 4; break; case 2: rxdma_id = spi2_rxdma_id; txdma_id = spi2_txdma_id; - num_chipselect = 2; break; #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \ || defined(CONFIG_ARCH_OMAP4) case 3: rxdma_id = spi3_rxdma_id; txdma_id = spi3_txdma_id; - num_chipselect = 2; break; #endif #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) case 4: rxdma_id = spi4_rxdma_id; txdma_id = spi4_txdma_id; - num_chipselect = 1; break; #endif default: @@ -1106,7 +1101,6 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev) master->setup = omap2_mcspi_setup; master->transfer = omap2_mcspi_transfer; master->cleanup = omap2_mcspi_cleanup; - master->num_chipselect = num_chipselect; dev_set_drvdata(&pdev->dev, master); @@ -1114,6 +1108,7 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev) mcspi->master = master; pdata = (struct omap2_mcspi_platform_config *)pdev->dev.platform_data; mcspi->max_clk_div = pdata->max_clk_div; + master->num_chipselect = pdata->num_cs; r = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (r == NULL) { @@ -1160,7 +1155,7 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev) if (mcspi->dma_channels == NULL) goto err3; - for (i = 0; i < num_chipselect; i++) { + for (i = 0; i < master->num_chipselect; i++) { mcspi->dma_channels[i].dma_rx_channel = -1; mcspi->dma_channels[i].dma_rx_sync_dev = rxdma_id[i]; mcspi->dma_channels[i].dma_tx_channel = -1;