diff options
author | David Daney <ddaney@caviumnetworks.com> | 2010-10-07 19:03:50 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-10-29 14:08:41 -0400 |
commit | 4b8bca7028fbed182c78b4f86769e365f2075d8e (patch) | |
tree | 7dc9523d3ce671e708a2d3d199e768357cb2d07b /arch/mips/cavium-octeon | |
parent | e195aa3039c5c4eeb60c415a7a0f3006d5cdcd3b (diff) |
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/mips/cavium-octeon')
-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 c32d40db6ba..49c33202843 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) | |||
199 | num_ports = 1; | 199 | num_ports = 1; |
200 | 200 | ||
201 | for (port = 0; port < num_ports; port++) { | 201 | for (port = 0; port < num_ports; port++) { |
202 | octeon_i2c_data[port].sys_freq = octeon_get_clock_rate(); | 202 | octeon_i2c_data[port].sys_freq = octeon_get_io_clock_rate(); |
203 | /*FIXME: should be examined. At the moment is set for 100Khz */ | 203 | /*FIXME: should be examined. At the moment is set for 100Khz */ |
204 | octeon_i2c_data[port].i2c_freq = 100000; | 204 | octeon_i2c_data[port].i2c_freq = 100000; |
205 | 205 | ||
diff --git a/arch/mips/cavium-octeon/serial.c b/arch/mips/cavium-octeon/serial.c index 12dbf533b77..057f0ae88c9 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) | |||
66 | /* Make simulator output fast*/ | 66 | /* Make simulator output fast*/ |
67 | p->uartclk = 115200 * 16; | 67 | p->uartclk = 115200 * 16; |
68 | else | 68 | else |
69 | p->uartclk = mips_hpt_frequency; | 69 | p->uartclk = octeon_get_io_clock_rate(); |
70 | p->serial_in = octeon_serial_in; | 70 | p->serial_in = octeon_serial_in; |
71 | p->serial_out = octeon_serial_out; | 71 | p->serial_out = octeon_serial_out; |
72 | } | 72 | } |