From patchwork Fri Mar 12 19:35:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Niebuhr X-Patchwork-Id: 85352 Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2CJZweF001711 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 12 Mar 2010 19:36:34 GMT Received: from dlep35.itg.ti.com ([157.170.170.118]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o2CJZwY7031071 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 12 Mar 2010 13:35:58 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o2CJZvP5025215 for ; Fri, 12 Mar 2010 13:35:57 -0600 (CST) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id E17D180627 for ; Fri, 12 Mar 2010 13:35:53 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp51.itg.ti.com (dflp51.itg.ti.com [128.247.22.94]) by linux.omap.com (Postfix) with ESMTP id 235278062B for ; Fri, 12 Mar 2010 13:35:44 -0600 (CST) Received: from white.ext.ti.com (localhost [127.0.0.1]) by dflp51.itg.ti.com (8.13.7/8.13.7) with ESMTP id o2CJZhWe008964 for ; Fri, 12 Mar 2010 13:35:43 -0600 (CST) Received: from psmtp.com (na3sys009amx255.postini.com [74.125.149.139]) by white.ext.ti.com (8.13.7/8.13.7) with SMTP id o2CJZgQN027970 for ; Fri, 12 Mar 2010 13:35:43 -0600 Received: from source ([74.125.83.45]) by na3sys009amx255.postini.com ([74.125.148.10]) with SMTP; Fri, 12 Mar 2010 14:35:43 EST Received: by gwaa18 with SMTP id a18so561811gwa.4 for ; Fri, 12 Mar 2010 11:35:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=5uLi4njLJ0pMOlbmhiJctK9YQtidisaN56zcuEdsaz0=; b=K5fIk51ZszAa0Px8gH01sRpO8QwiXYFcS4OHTKwO5i1iVl5bnPi70P0l0WigksmaEO kR992UaMSy2yJnMdPmpoBqfOOVavq0PT6w5HT+xgjTo1LJr5JMPxeK+jVZdJgawVyjj9 lsFoTkK4+NGy4czwS5pRNChCsxQoL9T6VqD1Q= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=B8io6M6YSiaKDJ/iGlAYMAFujt6beARFa2P5sEXcBbh3ySHNzaBcnH3R2cDu8deXdT GtmRUTaaRCI4jTIRAPquj8p5txrcNuOr4wGWdYNRDq2jD7Wrnq+lhsjHeyWsP56OSgvP fHG12f2bMkIpozUF/4yq5k62P4LPsMwJ+gnP4= Received: by 10.100.55.23 with SMTP id d23mr1604711ana.161.1268422542188; Fri, 12 Mar 2010 11:35:42 -0800 (PST) Received: from localhost.localdomain (h197.252.190.173.static.ip.windstream.net [173.190.252.197]) by mx.google.com with ESMTPS id 6sm524346ywc.42.2010.03.12.11.35.40 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 12 Mar 2010 11:35:41 -0800 (PST) From: Brian Niebuhr To: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH 2/2 v2] spi: modify davinci platform data for updated driver Date: Fri, 12 Mar 2010 13:35:20 -0600 Message-Id: <1268422520-22642-3-git-send-email-bniebuhr@efjohnson.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1268422520-22642-2-git-send-email-bniebuhr@efjohnson.com> References: <1268422520-22642-1-git-send-email-bniebuhr@efjohnson.com> <1268422520-22642-2-git-send-email-bniebuhr@efjohnson.com> X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:50.68142/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-settings: 2 (0.5000:0.5000) s cv gt3 gt2 gt1 r p m c X-pstn-addresses: from [db-null] Cc: spi-devel-general@lists.sourceforge.net, Brian Niebuhr X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 12 Mar 2010 19:36:35 +0000 (UTC) diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index a0724fa..b1a21a4 100644 --- a/arch/arm/mach-davinci/board-dm355-evm.c +++ b/arch/arm/mach-davinci/board-dm355-evm.c @@ -40,6 +40,7 @@ #include #include #include +#include #define DAVINCI_ASYNC_EMIF_CONTROL_BASE 0x01e10000 #define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 @@ -445,10 +446,19 @@ static struct spi_eeprom at25640a = { .flags = EE_ADDR2, }; +static struct davinci_spi_config at25640a_spi_cfg = { + .parity_enable = 0, + .intr_level = 0, + .io_type = SPI_IO_TYPE_DMA, + .wdelay = 0, + .timer_disable = 1, +}; + static struct spi_board_info dm355_evm_spi_info[] __initconst = { { .modalias = "at25", .platform_data = &at25640a, + .controller_data = &at25640a_spi_cfg, .max_speed_hz = 30 * 1000 * 1000, /* at 3v3 */ .bus_num = 0, .chip_select = 0, diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c index 84ad5d1..d87ff0b 100644 --- a/arch/arm/mach-davinci/board-dm355-leopard.c +++ b/arch/arm/mach-davinci/board-dm355-leopard.c @@ -36,6 +36,7 @@ #include #include #include +#include #define DAVINCI_ASYNC_EMIF_CONTROL_BASE 0x01e10000 #define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 @@ -232,10 +233,19 @@ static struct spi_eeprom at25640a = { .flags = EE_ADDR2, }; +struct davinci_spi_config at25640a_spi_cfg = { + .parity_enable = 0, + .intr_level = 0, + .io_type = SPI_IO_TYPE_DMA, + .wdelay = 0, + .timer_disable = 1, +}; + static struct spi_board_info dm355_leopard_spi_info[] __initconst = { { .modalias = "at25", .platform_data = &at25640a, + .controller_data = &at25640a_spi_cfg, .max_speed_hz = 10 * 1000 * 1000, /* at 3v3 */ .bus_num = 0, .chip_select = 0, diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index ab3b0e2..8559c84 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -832,10 +833,19 @@ static struct spi_eeprom at25640 = { .flags = EE_ADDR2, }; +static struct davinci_spi_config at25640_spi_cfg = { + .parity_enable = 0, + .intr_level = 0, + .io_type = SPI_IO_TYPE_DMA, + .wdelay = 0, + .timer_disable = 1, +}; + static struct spi_board_info dm365_evm_spi_info[] __initconst = { { .modalias = "at25", .platform_data = &at25640, + .controller_data = &at25640_spi_cfg, .max_speed_hz = 20 * 1000 * 1000, /* at 3v3 */ .bus_num = 0, .chip_select = 0, diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index 94271a6..5430b00 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -58,6 +58,7 @@ #include #include #include +#include #include #include "clock.h" @@ -911,10 +912,21 @@ static struct spi_eeprom at25640a = { .flags = EE_ADDR2, }; +static struct davinci_spi_config at25640a_spi_cfg = { + .parity_enable = 0, + .intr_level = 0, + .io_type = SPI_IO_TYPE_DMA, + .wdelay = 0, + .timer_disable = 0, + .c2t_delay = 8, + .t2c_delay = 8, +}; + static struct spi_board_info dm646x_evm_spi_info[] __initconst = { { .modalias = "at25", .platform_data = &at25640a, + .controller_data = &at25640a_spi_cfg, .max_speed_hz = 10 * 1000 * 1000, /* at 3v3 */ .bus_num = 0, .chip_select = 0, diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index 6925242..90d1fda 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -418,13 +418,6 @@ static struct resource dm355_spi0_resources[] = { static struct davinci_spi_platform_data dm355_spi0_pdata = { .version = SPI_VERSION_1, .num_chipselect = 2, - .clk_internal = 1, - .cs_hold = 1, - .intr_level = 0, - .poll_mode = 1, /* 0 -> interrupt mode 1-> polling mode */ - .use_dma = 1, /* when 1, value in poll_mode is ignored */ - .c2tdelay = 0, - .t2cdelay = 0, }; static struct platform_device dm355_spi0_device = { diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index ed6c9c7..600dab5 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -621,13 +621,6 @@ static u64 dm365_spi0_dma_mask = DMA_BIT_MASK(32); static struct davinci_spi_platform_data dm365_spi0_pdata = { .version = SPI_VERSION_1, .num_chipselect = 2, - .clk_internal = 1, - .cs_hold = 1, - .intr_level = 0, - .poll_mode = 1, /* 0 -> interrupt mode 1-> polling mode */ - .use_dma = 1, /* when 1, value in poll_mode is ignored */ - .c2tdelay = 0, - .t2cdelay = 0, }; static struct resource dm365_spi0_resources[] = { diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index efb4863..f9b49cb 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -387,13 +387,6 @@ static u64 dm646x_spi0_dma_mask = DMA_BIT_MASK(32); static struct davinci_spi_platform_data dm646x_spi0_pdata = { .version = SPI_VERSION_1, .num_chipselect = 2, - .clk_internal = 1, - .cs_hold = 1, - .intr_level = 0, - .poll_mode = 1, /* 0 -> interrupt mode 1-> polling mode */ - .use_dma = 1, /* when 1, value in poll_mode is ignored */ - .c2tdelay = 8, - .t2cdelay = 8, }; static struct resource dm646x_spi0_resources[] = {