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>, Ezequiel Garcia <elezegarcia@gmail.com>, Mark Jackson <mpfj-list@mimc.co.uk>, Jon Hunter <jon-hunter@ti.com> Subject: [PATCH V2 08/17] ARM: OMAP2+: Convert TUSB to use gpmc_cs_program_settings() Date: Fri, 8 Mar 2013 10:58:29 -0600 [thread overview] Message-ID: <1362761918-8696-9-git-send-email-jon-hunter@ti.com> (raw) In-Reply-To: <1362761918-8696-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 faaf96d..1902b0b 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> @@ -27,12 +28,21 @@ static u8 async_cs, sync_cs; static unsigned refclk_psec; static struct gpmc_settings tusb_async = { + .wait_on_read = true, + .wait_on_write = true, + .device_width = GPMC_DEVWIDTH_16BIT, .mux_add_data = GPMC_MUX_AD, }; static struct gpmc_settings tusb_sync = { + .burst_read = true, + .burst_write = 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, .mux_add_data = GPMC_MUX_AD, }; @@ -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 V2 08/17] ARM: OMAP2+: Convert TUSB to use gpmc_cs_program_settings() Date: Fri, 8 Mar 2013 10:58:29 -0600 [thread overview] Message-ID: <1362761918-8696-9-git-send-email-jon-hunter@ti.com> (raw) In-Reply-To: <1362761918-8696-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 faaf96d..1902b0b 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> @@ -27,12 +28,21 @@ static u8 async_cs, sync_cs; static unsigned refclk_psec; static struct gpmc_settings tusb_async = { + .wait_on_read = true, + .wait_on_write = true, + .device_width = GPMC_DEVWIDTH_16BIT, .mux_add_data = GPMC_MUX_AD, }; static struct gpmc_settings tusb_sync = { + .burst_read = true, + .burst_write = 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, .mux_add_data = GPMC_MUX_AD, }; @@ -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-03-08 16:58 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-03-08 16:58 [PATCH V2 00/17] ARM: OMAP2+: GPMC clean-up and DT update Jon Hunter 2013-03-08 16:58 ` Jon Hunter 2013-03-08 16:58 ` [PATCH V2 01/17] ARM: OMAP2+: Simplify code configuring ONENAND devices Jon Hunter 2013-03-08 16:58 ` Jon Hunter 2013-03-08 16:58 ` [PATCH V2 02/17] ARM: OMAP2+: Add variable to store number of GPMC waitpins Jon Hunter 2013-03-08 16:58 ` Jon Hunter 2013-03-08 16:58 ` [PATCH V2 03/17] ARM: OMAP2+: Add structure for storing GPMC settings Jon Hunter 2013-03-08 16:58 ` Jon Hunter 2013-03-08 16:58 ` [PATCH V2 04/17] ARM: OMAP2+: Add function for configuring " Jon Hunter 2013-03-08 16:58 ` Jon Hunter 2013-03-08 16:58 ` [PATCH V2 05/17] ARM: OMAP2+: Convert ONENAND to use gpmc_cs_program_settings() Jon Hunter 2013-03-08 16:58 ` Jon Hunter 2013-03-08 16:58 ` [PATCH V2 06/17] ARM: OMAP2+: Convert NAND " Jon Hunter 2013-03-08 16:58 ` Jon Hunter 2013-03-08 16:58 ` [PATCH V2 07/17] ARM: OMAP2+: Convert SMC91x " Jon Hunter 2013-03-08 16:58 ` Jon Hunter 2013-03-08 16:58 ` Jon Hunter [this message] 2013-03-08 16:58 ` [PATCH V2 08/17] ARM: OMAP2+: Convert TUSB " Jon Hunter 2013-03-08 16:58 ` [PATCH V2 09/17] ARM: OMAP2+: Don't configure of chip-select options in gpmc_cs_configure() Jon Hunter 2013-03-08 16:58 ` Jon Hunter 2013-03-08 16:58 ` [PATCH V2 10/17] ARM: OMAP2+: Add function to read GPMC settings from device-tree Jon Hunter 2013-03-08 16:58 ` Jon Hunter 2013-03-08 16:58 ` [PATCH V2 11/17] ARM: OMAP2+: Add device-tree support for NOR flash Jon Hunter 2013-03-08 16:58 ` Jon Hunter 2013-03-09 3:11 ` Javier Martinez Canillas 2013-03-09 3:11 ` Javier Martinez Canillas 2013-03-08 16:58 ` [PATCH V2 12/17] ARM: OMAP2+: Add additional GPMC timing parameters Jon Hunter 2013-03-08 16:58 ` Jon Hunter 2013-03-08 16:58 ` [PATCH V2 13/17] ARM: OMAP2+: Convert NAND to retrieve GPMC settings from DT Jon Hunter 2013-03-08 16:58 ` Jon Hunter 2013-03-08 16:58 ` [PATCH V2 14/17] ARM: OMAP2+: Convert ONENAND " Jon Hunter 2013-03-08 16:58 ` Jon Hunter 2013-03-08 16:58 ` [PATCH V2 15/17] ARM: OMAP2+: Detect incorrectly aligned GPMC base address Jon Hunter 2013-03-08 16:58 ` Jon Hunter 2013-03-08 16:58 ` [PATCH V2 16/17] ARM: OMAP2+: Remove unnecesssary GPMC definitions and variable Jon Hunter 2013-03-08 16:58 ` Jon Hunter 2013-03-08 16:58 ` [PATCH V2 17/17] ARM: OMAP2+: Allow GPMC probe to complete even if CS mapping fails Jon Hunter 2013-03-08 16:58 ` 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=1362761918-8696-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=elezegarcia@gmail.com \ --cc=grant.likely@secretlab.ca \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=mpfj-list@mimc.co.uk \ --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.