diff options
| author |   David Daney <ddaney@caviumnetworks.com> | 2010-10-07 16:03:50 -0700 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2010-10-29 19:08:41 +0100 |
| commit | 4b8bca7028fbed182c78b4f86769e365f2075d8e (patch) | |
| tree | 7dc9523d3ce671e708a2d3d199e768357cb2d07b /arch | |
| parent | MIPS: Octeon: Add octeon_get_io_clock_rate() for cn63xx (diff) | |
| download | linux-dev-4b8bca7028fbed182c78b4f86769e365f2075d8e.tar.xz linux-dev-4b8bca7028fbed182c78b4f86769e365f2075d8e.zip | |
MIPS: Octeon: Use I/O clock rate for calculations.
The I2C and UARTS are clocked by the I/O clock, use its rate for these
devices.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Patchwork: http://patchwork.linux-mips.org/patch/1670/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/cavium-octeon/octeon-platform.c | 2 | ||||
| -rw-r--r-- | arch/mips/cavium-octeon/serial.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c index c32d40db6ba6..49c33202843b 100644 --- a/arch/mips/cavium-octeon/octeon-platform.c +++ b/arch/mips/cavium-octeon/octeon-platform.c @@ -199,7 +199,7 @@ static int __init octeon_i2c_device_init(void) num_ports = 1; for (port = 0; port < num_ports; port++) { - octeon_i2c_data[port].sys_freq = octeon_get_clock_rate(); + octeon_i2c_data[port].sys_freq = octeon_get_io_clock_rate(); /*FIXME: should be examined. At the moment is set for 100Khz */ octeon_i2c_data[port].i2c_freq = 100000; diff --git a/arch/mips/cavium-octeon/serial.c b/arch/mips/cavium-octeon/serial.c index 12dbf533b77d..057f0ae88c99 100644 --- a/arch/mips/cavium-octeon/serial.c +++ b/arch/mips/cavium-octeon/serial.c @@ -66,7 +66,7 @@ static void __init octeon_uart_set_common(struct plat_serial8250_port *p) /* Make simulator output fast*/ p->uartclk = 115200 * 16; else - p->uartclk = mips_hpt_frequency; + p->uartclk = octeon_get_io_clock_rate(); p->serial_in = octeon_serial_in; p->serial_out = octeon_serial_out; } |