From: sshtylyov@mvista•com (Sergei Shtylyov)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 3/3] ide/at91: use new introduce smc accessor
Date: Fri, 09 Dec 2011 15:06:03 +0400 [thread overview]
Message-ID: <4EE1EB9B.4080500@mvista.com> (raw)
In-Reply-To: <1323357784-17555-3-git-send-email-plagnioj@jcrosoft.com>
Hello.
On 08-12-2011 19:23, Jean-Christophe PLAGNIOL-VILLARD wrote:
Same comment about the subject.
> this will allow to use the pata_at91 on a single zImage
s/pata_at91/at91_ide/
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD<plagnioj@jcrosoft•com>
> Cc: Nicolas Ferre<nicolas.ferre@atmel•com>
> Cc: linux-ide at vger.kernel.org
> ---
> Hi,
> it's depends on other patch for AT91 can we apply via at91
I'm afraid David won't accept this, as the IDE tree is frozen for anything
but the fixes.
> diff --git a/drivers/ide/at91_ide.c b/drivers/ide/at91_ide.c
> index 41d4155..407595b 100644
> --- a/drivers/ide/at91_ide.c
> +++ b/drivers/ide/at91_ide.c
> @@ -59,41 +59,50 @@
[...]
> static void set_smc_timings(const u8 chipselect, const u16 cycle,
> const u16 setup, const u16 pulse,
> const u16 data_float, int use_iordy)
> {
> - unsigned long mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
> + struct sam9_smc_config smc;
> +
> + smc.mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
> AT91_SMC_BAT_SELECT;
>
> /* disable or enable waiting for IORDY signal */
> if (use_iordy)
> - mode |= AT91_SMC_EXNWMODE_READY;
> + smc.mode |= AT91_SMC_EXNWMODE_READY;
>
> - /* add data float cycles if needed */
> - if (data_float)
> - mode |= AT91_SMC_TDF_(data_float);
> + /* add data ofloat cycles if needed */
> + smc.tdf_cycles = data_float;
>
> - at91_sys_write(AT91_SMC_MODE(chipselect), mode);
> + /* write SMC Setup Register */
> + smc.nrd_setup = setup;
> + smc.nwe_setup = smc.nrd_setup;
> + smc.ncs_read_setup = 0;
> + smc.ncs_write_setup = smc.ncs_read_setup;
smc.nrd_setup = smc.nwe_setup = setup;
smc.ncs_read_setup = smc.ncs_write_setup = 0;
> + /* write SMC Pulse Register */
> + smc.nrd_pulse = pulse;
> + smc.nwe_pulse = smc.nrd_pulse;
> + smc.ncs_read_pulse = cycle;
> + smc.ncs_write_pulse = smc.ncs_read_pulse;
smc.nrd_pulse = smc.nwe_pulse = pulse;
> + smc.ncs_read_pulse = smc.ncs_write_pulse = cycle;
> + /* write SMC Cycle Register */
> + smc.read_cycle = cycle;
> + smc.write_cycle = smc.read_cycle;
smc.read_cycle = smc.write_cycle = cycle;
WBR, Sergei
next prev parent reply other threads:[~2011-12-09 11:06 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-08 15:03 ARM: at91: smc update Jean-Christophe PLAGNIOL-VILLARD
2011-12-08 15:23 ` [PATCH 1/3] ARM: at91: add accessor to manage smc Jean-Christophe PLAGNIOL-VILLARD
2011-12-08 22:20 ` Ryan Mallon
2011-12-09 6:27 ` Jean-Christophe PLAGNIOL-VILLARD
2011-12-09 7:06 ` Ryan Mallon
2011-12-08 15:23 ` [PATCH 2/3] pata/at91: use new introduce smc accessor Jean-Christophe PLAGNIOL-VILLARD
2011-12-08 22:34 ` Ryan Mallon
2011-12-09 6:24 ` Jean-Christophe PLAGNIOL-VILLARD
2011-12-09 10:59 ` Sergei Shtylyov
2011-12-09 18:42 ` Jean-Christophe PLAGNIOL-VILLARD
2011-12-08 15:23 ` [PATCH 3/3] ide/at91: " Jean-Christophe PLAGNIOL-VILLARD
2011-12-08 22:38 ` Ryan Mallon
2011-12-09 6:19 ` Jean-Christophe PLAGNIOL-VILLARD
2011-12-09 11:06 ` Sergei Shtylyov [this message]
2011-12-09 18:40 ` Jean-Christophe PLAGNIOL-VILLARD
2011-12-09 13:59 ` Arnd Bergmann
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=4EE1EB9B.4080500@mvista.com \
--to=sshtylyov@mvista$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox