From: David Daney <ddaney@caviumnetworks.com> Date: Thu, 7 Oct 2010 23:03:51 +0000 (-0700) Subject: ATA: pata_octeon_cf: Use I/O clock rate for timing calculations. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1fa25ab2caf79b99094c3da6e09f20a35e8f01f8;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git ATA: pata_octeon_cf: Use I/O clock rate for timing calculations. The creation of the I/O clock domain requires some adjustments. Since the CF bus timing logic is clocked by the I/O clock, use its rate for delay calculations. Signed-off-by: David Daney <ddaney@caviumnetworks.com> Cc: Jeff Garzik <jgarzik@pobox.com> Cc: linux-ide@vger.kernel.org Patchwork: http://patchwork.linux-mips.org/patch/1660/ Acked-by: Jeff Garzik <jgarzik@redhat.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> --- diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c index 06ddd91ffeda..74b829817891 100644 --- a/drivers/ata/pata_octeon_cf.c +++ b/drivers/ata/pata_octeon_cf.c @@ -60,7 +60,7 @@ static unsigned int ns_to_tim_reg(unsigned int tim_mult, unsigned int nsecs) * Compute # of eclock periods to get desired duration in * nanoseconds. */ - val = DIV_ROUND_UP(nsecs * (octeon_get_clock_rate() / 1000000), + val = DIV_ROUND_UP(nsecs * (octeon_get_io_clock_rate() / 1000000), 1000 * tim_mult); return val;