diff options
| author |   Adrian Hunter <adrian.hunter@nokia.com> | 2010-12-09 10:48:27 +0200 |
|---|---|---|
| committer |   Tony Lindgren <tony@atomide.com> | 2010-12-21 12:05:25 -0800 |
| commit | a3551f5b0c3ca7aaa053e554e3ee766983b5d713 (patch) | |
| tree | 76fec6e7169219e26c67ff206713b2d09771e33b /arch/arm/mach-omap2/usb-tusb6010.c | |
| parent | Merge branches 'devel-iommu-mailbox' and 'devel-l2x0' into omap-for-linus (diff) | |
| download | linux-dev-a3551f5b0c3ca7aaa053e554e3ee766983b5d713.tar.xz linux-dev-a3551f5b0c3ca7aaa053e554e3ee766983b5d713.zip | |
OMAP2/3: GPMC: put sync_clk value in picoseconds instead of nanoseconds
The calculations done with sync_clk are anyway in picoseconds
and switching to picoseconds allows sync_clk values that are
not a whole number of nanoseconds - which is sometimes the
case.
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/usb-tusb6010.c')
| -rw-r--r-- | arch/arm/mach-omap2/usb-tusb6010.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c index 64a0112b70a5..1e998ea40951 100644 --- a/arch/arm/mach-omap2/usb-tusb6010.c +++ b/arch/arm/mach-omap2/usb-tusb6010.c @@ -120,8 +120,8 @@ static int tusb_set_sync_mode(unsigned sysclk_ps, unsigned fclk_ps) t.adv_on = next_clk(t.cs_on, t_scsnh_advnh - 7000, fclk_ps); /* GPMC_CLK rate = fclk rate / div */ - t.sync_clk = 12 /* 11.1 nsec */; - tmp = (t.sync_clk * 1000 + fclk_ps - 1) / fclk_ps; + t.sync_clk = 11100 /* 11.1 nsec */; + tmp = (t.sync_clk + fclk_ps - 1) / fclk_ps; if (tmp > 4) return -ERANGE; if (tmp <= 0) |