From: Jon Hunter <jon-hunter@ti.com> To: Rob Herring <rob.herring@calxeda.com>, Grant Likely <grant.likely@secretlab.ca>, Tony Lindgren <tony@atomide.com>, Benoit Cousson <b-cousson@ti.com> Cc: device-tree <devicetree-discuss@lists.ozlabs.org>, linux-omap <linux-omap@vger.kernel.org>, linux-arm <linux-arm-kernel@lists.infradead.org>, Daniel Mack <zonque@gmail.com>, Jon Hunter <jon-hunter@ti.com> Subject: [PATCH 08/14] ARM: OMAP2+: Convert TUSB to use gpmc_cs_program_settings() Date: Tue, 26 Feb 2013 11:30:35 -0600 [thread overview] Message-ID: <1361899842-30303-9-git-send-email-jon-hunter@ti.com> (raw) In-Reply-To: <1361899842-30303-1-git-send-email-jon-hunter@ti.com> Convert the OMAP2+ TUSB code to use the gpmc_cs_program_settings() function for configuring the various GPMC options instead of directly programming the CONFIG1 register. Signed-off-by: Jon Hunter <jon-hunter@ti.com> --- arch/arm/mach-omap2/usb-tusb6010.c | 43 ++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c index 940410a..f38efd0 100644 --- a/arch/arm/mach-omap2/usb-tusb6010.c +++ b/arch/arm/mach-omap2/usb-tusb6010.c @@ -8,6 +8,7 @@ * published by the Free Software Foundation. */ +#include <linux/err.h> #include <linux/string.h> #include <linux/types.h> #include <linux/errno.h> @@ -28,12 +29,21 @@ static unsigned refclk_psec; static struct gpmc_settings tusb_async = { .mux_add_data = true, + .wait_on_read = true, + .wait_on_write = true, + .device_width = GPMC_DEVWIDTH_16BIT, }; static struct gpmc_settings tusb_sync = { + .burst_read = true, + .burst_write = true, .mux_add_data = true, .sync_read = true, .sync_write = true, + .wait_on_read = true, + .wait_on_write = true, + .burst_len = GPMC_BURST_16, + .device_width = GPMC_DEVWIDTH_16BIT, }; /* NOTE: timings are from tusb 6010 datasheet Rev 1.8, 12-Sept 2006 */ @@ -168,18 +178,12 @@ tusb6010_setup_interface(struct musb_hdrc_platform_data *data, return status; } tusb_resources[0].end = tusb_resources[0].start + 0x9ff; + tusb_async.wait_pin = waitpin; async_cs = async; - gpmc_cs_write_reg(async, GPMC_CS_CONFIG1, - GPMC_CONFIG1_PAGE_LEN(2) - | GPMC_CONFIG1_WAIT_READ_MON - | GPMC_CONFIG1_WAIT_WRITE_MON - | GPMC_CONFIG1_WAIT_PIN_SEL(waitpin) - | GPMC_CONFIG1_READTYPE_ASYNC - | GPMC_CONFIG1_WRITETYPE_ASYNC - | GPMC_CONFIG1_DEVICESIZE_16 - | GPMC_CONFIG1_DEVICETYPE_NOR - | GPMC_CONFIG1_MUXADDDATA); + status = gpmc_cs_program_settings(async_cs, &tusb_async); + if (IS_ERR_VALUE(status)) + return status; /* SYNC region, primarily for DMA */ status = gpmc_cs_request(sync, SZ_16M, (unsigned long *) @@ -189,21 +193,12 @@ tusb6010_setup_interface(struct musb_hdrc_platform_data *data, return status; } tusb_resources[1].end = tusb_resources[1].start + 0x9ff; + tusb_sync.wait_pin = waitpin; sync_cs = sync; - gpmc_cs_write_reg(sync, GPMC_CS_CONFIG1, - GPMC_CONFIG1_READMULTIPLE_SUPP - | GPMC_CONFIG1_READTYPE_SYNC - | GPMC_CONFIG1_WRITEMULTIPLE_SUPP - | GPMC_CONFIG1_WRITETYPE_SYNC - | GPMC_CONFIG1_PAGE_LEN(2) - | GPMC_CONFIG1_WAIT_READ_MON - | GPMC_CONFIG1_WAIT_WRITE_MON - | GPMC_CONFIG1_WAIT_PIN_SEL(waitpin) - | GPMC_CONFIG1_DEVICESIZE_16 - | GPMC_CONFIG1_DEVICETYPE_NOR - | GPMC_CONFIG1_MUXADDDATA - /* fclk divider gets set later */ - ); + + status = gpmc_cs_program_settings(sync_cs, &tusb_sync); + if (IS_ERR_VALUE(status)) + return status; /* IRQ */ status = gpio_request_one(irq, GPIOF_IN, "TUSB6010 irq"); -- 1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: jon-hunter@ti.com (Jon Hunter) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/14] ARM: OMAP2+: Convert TUSB to use gpmc_cs_program_settings() Date: Tue, 26 Feb 2013 11:30:35 -0600 [thread overview] Message-ID: <1361899842-30303-9-git-send-email-jon-hunter@ti.com> (raw) In-Reply-To: <1361899842-30303-1-git-send-email-jon-hunter@ti.com> Convert the OMAP2+ TUSB code to use the gpmc_cs_program_settings() function for configuring the various GPMC options instead of directly programming the CONFIG1 register. Signed-off-by: Jon Hunter <jon-hunter@ti.com> --- arch/arm/mach-omap2/usb-tusb6010.c | 43 ++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c index 940410a..f38efd0 100644 --- a/arch/arm/mach-omap2/usb-tusb6010.c +++ b/arch/arm/mach-omap2/usb-tusb6010.c @@ -8,6 +8,7 @@ * published by the Free Software Foundation. */ +#include <linux/err.h> #include <linux/string.h> #include <linux/types.h> #include <linux/errno.h> @@ -28,12 +29,21 @@ static unsigned refclk_psec; static struct gpmc_settings tusb_async = { .mux_add_data = true, + .wait_on_read = true, + .wait_on_write = true, + .device_width = GPMC_DEVWIDTH_16BIT, }; static struct gpmc_settings tusb_sync = { + .burst_read = true, + .burst_write = true, .mux_add_data = true, .sync_read = true, .sync_write = true, + .wait_on_read = true, + .wait_on_write = true, + .burst_len = GPMC_BURST_16, + .device_width = GPMC_DEVWIDTH_16BIT, }; /* NOTE: timings are from tusb 6010 datasheet Rev 1.8, 12-Sept 2006 */ @@ -168,18 +178,12 @@ tusb6010_setup_interface(struct musb_hdrc_platform_data *data, return status; } tusb_resources[0].end = tusb_resources[0].start + 0x9ff; + tusb_async.wait_pin = waitpin; async_cs = async; - gpmc_cs_write_reg(async, GPMC_CS_CONFIG1, - GPMC_CONFIG1_PAGE_LEN(2) - | GPMC_CONFIG1_WAIT_READ_MON - | GPMC_CONFIG1_WAIT_WRITE_MON - | GPMC_CONFIG1_WAIT_PIN_SEL(waitpin) - | GPMC_CONFIG1_READTYPE_ASYNC - | GPMC_CONFIG1_WRITETYPE_ASYNC - | GPMC_CONFIG1_DEVICESIZE_16 - | GPMC_CONFIG1_DEVICETYPE_NOR - | GPMC_CONFIG1_MUXADDDATA); + status = gpmc_cs_program_settings(async_cs, &tusb_async); + if (IS_ERR_VALUE(status)) + return status; /* SYNC region, primarily for DMA */ status = gpmc_cs_request(sync, SZ_16M, (unsigned long *) @@ -189,21 +193,12 @@ tusb6010_setup_interface(struct musb_hdrc_platform_data *data, return status; } tusb_resources[1].end = tusb_resources[1].start + 0x9ff; + tusb_sync.wait_pin = waitpin; sync_cs = sync; - gpmc_cs_write_reg(sync, GPMC_CS_CONFIG1, - GPMC_CONFIG1_READMULTIPLE_SUPP - | GPMC_CONFIG1_READTYPE_SYNC - | GPMC_CONFIG1_WRITEMULTIPLE_SUPP - | GPMC_CONFIG1_WRITETYPE_SYNC - | GPMC_CONFIG1_PAGE_LEN(2) - | GPMC_CONFIG1_WAIT_READ_MON - | GPMC_CONFIG1_WAIT_WRITE_MON - | GPMC_CONFIG1_WAIT_PIN_SEL(waitpin) - | GPMC_CONFIG1_DEVICESIZE_16 - | GPMC_CONFIG1_DEVICETYPE_NOR - | GPMC_CONFIG1_MUXADDDATA - /* fclk divider gets set later */ - ); + + status = gpmc_cs_program_settings(sync_cs, &tusb_sync); + if (IS_ERR_VALUE(status)) + return status; /* IRQ */ status = gpio_request_one(irq, GPIOF_IN, "TUSB6010 irq"); -- 1.7.10.4
next prev parent reply other threads:[~2013-02-26 17:30 UTC|newest] Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-02-26 17:30 [PATCH 00/14] ARM: OMAP2+: GPMC clean-up and DT update Jon Hunter 2013-02-26 17:30 ` Jon Hunter 2013-02-26 17:30 ` [PATCH 01/14] ARM: OMAP2+: Simplify code configuring ONENAND devices Jon Hunter 2013-02-26 17:30 ` Jon Hunter 2013-02-26 17:30 ` [PATCH 02/14] ARM: OMAP2+: Add variable to store number of GPMC waitpins Jon Hunter 2013-02-26 17:30 ` Jon Hunter 2013-02-26 17:30 ` [PATCH 03/14] ARM: OMAP2+: Add structure for storing GPMC settings Jon Hunter 2013-02-26 17:30 ` Jon Hunter 2013-02-26 17:30 ` [PATCH 04/14] ARM: OMAP2+: Add function for configuring " Jon Hunter 2013-02-26 17:30 ` Jon Hunter 2013-02-28 6:05 ` Philip, Avinash 2013-02-28 6:05 ` Philip, Avinash [not found] ` <518397C60809E147AF5323E0420B992E3EA8F007-Er742YJ7I/eIQmiDNMet8wC/G2K4zDHf@public.gmane.org> 2013-02-28 15:52 ` Jon Hunter 2013-02-28 15:52 ` Jon Hunter 2013-02-28 17:12 ` Jon Hunter 2013-02-28 17:12 ` Jon Hunter 2013-03-01 5:33 ` Philip, Avinash 2013-03-01 5:33 ` Philip, Avinash 2013-03-01 15:43 ` Jon Hunter 2013-03-01 15:43 ` Jon Hunter [not found] ` <5130CCA9.10905-l0cyMroinI0@public.gmane.org> 2013-03-04 10:05 ` Philip, Avinash 2013-03-04 10:05 ` Philip, Avinash 2013-02-26 17:30 ` [PATCH 05/14] ARM: OMAP2+: Convert ONENAND to use gpmc_cs_program_settings() Jon Hunter 2013-02-26 17:30 ` Jon Hunter 2013-02-26 17:30 ` [PATCH 06/14] ARM: OMAP2+: Convert NAND " Jon Hunter 2013-02-26 17:30 ` Jon Hunter [not found] ` <1361899842-30303-7-git-send-email-jon-hunter-l0cyMroinI0@public.gmane.org> 2013-02-28 10:38 ` Philip, Avinash 2013-02-28 10:38 ` Philip, Avinash 2013-02-28 16:02 ` Jon Hunter 2013-02-28 16:02 ` Jon Hunter 2013-03-01 5:40 ` Philip, Avinash 2013-03-01 5:40 ` Philip, Avinash [not found] ` <518397C60809E147AF5323E0420B992E3EA90C46-Er742YJ7I/eIQmiDNMet8wC/G2K4zDHf@public.gmane.org> 2013-03-01 15:50 ` Jon Hunter 2013-03-01 15:50 ` Jon Hunter 2013-02-26 17:30 ` [PATCH 07/14] ARM: OMAP2+: Convert SMC91x " Jon Hunter 2013-02-26 17:30 ` Jon Hunter 2013-02-26 17:30 ` Jon Hunter [this message] 2013-02-26 17:30 ` [PATCH 08/14] ARM: OMAP2+: Convert TUSB " Jon Hunter 2013-02-26 17:30 ` [PATCH 09/14] ARM: OMAP2+: Don't configure of chip-select options in gpmc_cs_configure() Jon Hunter 2013-02-26 17:30 ` Jon Hunter 2013-02-26 17:30 ` [PATCH 10/14] ARM: OMAP2+: Add function to read GPMC settings from device-tree Jon Hunter 2013-02-26 17:30 ` Jon Hunter 2013-02-26 17:30 ` [PATCH 11/14] ARM: OMAP2+: Add device-tree support for NOR flash Jon Hunter 2013-02-26 17:30 ` Jon Hunter 2013-03-01 21:25 ` Ezequiel Garcia 2013-03-01 21:25 ` Ezequiel Garcia 2013-03-01 22:24 ` Jon Hunter 2013-03-01 22:24 ` Jon Hunter 2013-03-04 11:57 ` Ezequiel Garcia 2013-03-04 11:57 ` Ezequiel Garcia 2013-03-04 17:51 ` Jon Hunter 2013-03-04 17:51 ` Jon Hunter [not found] ` <5134DF2A.4050209-l0cyMroinI0@public.gmane.org> 2013-03-04 18:19 ` Jon Hunter 2013-03-04 18:19 ` Jon Hunter 2013-03-05 14:34 ` Mark Jackson 2013-03-05 14:34 ` Mark Jackson 2013-03-05 14:46 ` Jon Hunter 2013-03-05 14:46 ` Jon Hunter 2013-03-05 16:20 ` Mark Jackson 2013-03-05 16:20 ` Mark Jackson 2013-03-05 17:30 ` Jon Hunter 2013-03-05 17:30 ` Jon Hunter 2013-03-05 17:43 ` Ezequiel Garcia 2013-03-05 17:43 ` Ezequiel Garcia 2013-03-05 18:41 ` Jon Hunter 2013-03-05 18:41 ` Jon Hunter 2013-03-05 21:34 ` Jon Hunter 2013-03-05 21:34 ` Jon Hunter 2013-03-06 10:23 ` Mark Jackson 2013-03-06 10:23 ` Mark Jackson 2013-03-06 13:30 ` Mark Jackson 2013-03-06 13:30 ` Mark Jackson 2013-03-06 16:44 ` Jon Hunter 2013-03-06 16:44 ` Jon Hunter 2013-03-06 16:48 ` Mark Jackson 2013-03-06 16:48 ` Mark Jackson 2013-03-06 17:00 ` Jon Hunter 2013-03-06 17:00 ` Jon Hunter 2013-03-06 18:01 ` Jon Hunter 2013-03-06 18:01 ` Jon Hunter 2013-03-06 11:58 ` Ezequiel Garcia 2013-03-06 11:58 ` Ezequiel Garcia 2013-03-06 16:46 ` Jon Hunter 2013-03-06 16:46 ` Jon Hunter 2013-03-06 16:54 ` Ezequiel Garcia 2013-03-06 16:54 ` Ezequiel Garcia 2013-03-07 13:02 ` Ezequiel Garcia 2013-03-07 13:02 ` Ezequiel Garcia 2013-02-26 17:30 ` [PATCH 12/14] ARM: OMAP2+: Add additional GPMC timing parameters Jon Hunter 2013-02-26 17:30 ` Jon Hunter [not found] ` <1361899842-30303-13-git-send-email-jon-hunter-l0cyMroinI0@public.gmane.org> 2013-03-01 20:11 ` Ezequiel Garcia 2013-03-01 20:11 ` Ezequiel Garcia 2013-03-01 20:12 ` Ezequiel Garcia 2013-03-01 20:12 ` Ezequiel Garcia 2013-03-01 22:27 ` Jon Hunter 2013-03-01 22:27 ` Jon Hunter 2013-03-01 22:27 ` Jon Hunter 2013-03-01 22:27 ` Jon Hunter 2013-02-26 17:30 ` [PATCH 13/14] ARM: OMAP2+: Convert NAND to retrieve GPMC settings from DT Jon Hunter 2013-02-26 17:30 ` Jon Hunter 2013-02-26 17:30 ` [PATCH 14/14] ARM: OMAP2+: Convert ONENAND " Jon Hunter 2013-02-26 17:30 ` Jon Hunter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1361899842-30303-9-git-send-email-jon-hunter@ti.com \ --to=jon-hunter@ti.com \ --cc=b-cousson@ti.com \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=grant.likely@secretlab.ca \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=rob.herring@calxeda.com \ --cc=tony@atomide.com \ --cc=zonque@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.