diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-02 22:31:04 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-02 22:31:04 +0100 |
| commit | 534d0c92cfc45174fbfeca2f3dd54c3ce332725e (patch) | |
| tree | 6f944e0878ca6fc71a844a93aabe81c60fe5f693 /arch/arm/plat-iop | |
| parent | 610ea6c671685a09afff7ba521bdccda21c84c76 (diff) | |
| parent | f00f510ab33f3e689e35ccdbb8dc264168aa5250 (diff) | |
| download | linux-3.10-534d0c92cfc45174fbfeca2f3dd54c3ce332725e.tar.gz linux-3.10-534d0c92cfc45174fbfeca2f3dd54c3ce332725e.tar.bz2 linux-3.10-534d0c92cfc45174fbfeca2f3dd54c3ce332725e.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop
Conflicts:
MAINTAINERS
Diffstat (limited to 'arch/arm/plat-iop')
| -rw-r--r-- | arch/arm/plat-iop/pci.c | 3 | ||||
| -rw-r--r-- | arch/arm/plat-iop/time.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-iop/pci.c b/arch/arm/plat-iop/pci.c index 77fa7cc7d16..ce31f316ac7 100644 --- a/arch/arm/plat-iop/pci.c +++ b/arch/arm/plat-iop/pci.c @@ -257,7 +257,8 @@ void __init iop3xx_atu_setup(void) *IOP3XX_OUMWTVR0 = 0; /* Outbound window 1 */ - *IOP3XX_OMWTVR1 = IOP3XX_PCI_LOWER_MEM_BA + IOP3XX_PCI_MEM_WINDOW_SIZE; + *IOP3XX_OMWTVR1 = IOP3XX_PCI_LOWER_MEM_BA + + IOP3XX_PCI_MEM_WINDOW_SIZE / 2; *IOP3XX_OUMWTVR1 = 0; /* BAR 3 ( Disabled ) */ diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c index 3695bbe3ee2..8da95d57c21 100644 --- a/arch/arm/plat-iop/time.c +++ b/arch/arm/plat-iop/time.c @@ -85,7 +85,7 @@ void __init iop_init_time(unsigned long tick_rate) { u32 timer_ctl; - ticks_per_jiffy = (tick_rate + HZ/2) / HZ; + ticks_per_jiffy = DIV_ROUND_CLOSEST(tick_rate, HZ); ticks_per_usec = tick_rate / 1000000; next_jiffy_time = 0xffffffff; iop_tick_rate = tick_rate; |