From: shc_work@mail.ru (Alexander Shiyan)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 16/17] ARM clps711x: Replaced frequency settings to definition
Date: Sat, 21 Apr 2012 13:11:29 +0400 [thread overview]
Message-ID: <1334999490-27177-17-git-send-email-shc_work@mail.ru> (raw)
In-Reply-To: <1334999490-27177-1-git-send-email-shc_work@mail.ru>
Some CPUs from CLPS711X-line can operate at frequencies other than 73 MHz.
Added calculation of system clock frequency and the frequency of UART,
depending on processor speed.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/mach-clps711x/include/mach/hardware.h | 4 ++++
arch/arm/mach-clps711x/include/mach/timex.h | 4 +++-
drivers/tty/serial/clps711x.c | 4 ++--
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h
index 495d57b..acaf777 100644
--- a/arch/arm/mach-clps711x/include/mach/hardware.h
+++ b/arch/arm/mach-clps711x/include/mach/hardware.h
@@ -24,6 +24,10 @@
#include <asm/hardware/clps7111.h>
+#define CPU_SPEED (73728000)
+#define CPU_BUS_SPEED (CPU_SPEED / 2)
+#define UART_BAUD_BASE (CPU_BUS_SPEED / 10)
+
#define CLPS711X_PHYS_BASE (0x80000000)
#define CLPS711X_VIRT_BASE (0xff000000)
diff --git a/arch/arm/mach-clps711x/include/mach/timex.h b/arch/arm/mach-clps711x/include/mach/timex.h
index ac8823c..56f5ecf 100644
--- a/arch/arm/mach-clps711x/include/mach/timex.h
+++ b/arch/arm/mach-clps711x/include/mach/timex.h
@@ -20,4 +20,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#define CLOCK_TICK_RATE 512000
+#include <mach/hardware.h>
+
+#define CLOCK_TICK_RATE (CPU_SPEED / 144)
diff --git a/drivers/tty/serial/clps711x.c b/drivers/tty/serial/clps711x.c
index d0f719f..bae678d 100644
--- a/drivers/tty/serial/clps711x.c
+++ b/drivers/tty/serial/clps711x.c
@@ -401,7 +401,7 @@ static struct uart_port clps711x_ports[UART_NR] = {
{
.iobase = SYSCON1,
.irq = IRQ_UTXINT1, /* IRQ_URXINT1, IRQ_UMSINT */
- .uartclk = 3686400,
+ .uartclk = UART_BAUD_BASE,
.fifosize = 16,
.ops = &clps711x_pops,
.line = 0,
@@ -410,7 +410,7 @@ static struct uart_port clps711x_ports[UART_NR] = {
{
.iobase = SYSCON2,
.irq = IRQ_UTXINT2, /* IRQ_URXINT2 */
- .uartclk = 3686400,
+ .uartclk = UART_BAUD_BASE,
.fifosize = 16,
.ops = &clps711x_pops,
.line = 1,
--
1.7.3.4
next prev parent reply other threads:[~2012-04-21 9:11 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-21 9:11 clps711x patchset Alexander Shiyan
2012-04-21 9:11 ` [PATCH 01/17] ARM clps711x: Cleanup: Rename ARCH_EP7211 and ARCH_EP7212 to SOC_xxx Alexander Shiyan
2012-04-21 9:11 ` [PATCH 02/17] ARM clps711x: Added Cirrus Logic EP7312 CPU variant Alexander Shiyan
2012-04-21 11:21 ` Arnd Bergmann
2012-04-21 11:30 ` Re[2]: " Alexander Shiyan
2012-04-21 11:48 ` Russell King - ARM Linux
2012-04-21 12:11 ` Arnd Bergmann
2012-04-21 12:20 ` Russell King - ARM Linux
2012-04-22 13:58 ` Arnd Bergmann
2012-04-22 14:13 ` Russell King - ARM Linux
2012-04-22 14:24 ` Re[2]: " Alexander Shiyan
2012-04-21 9:11 ` [PATCH 03/17] ARM clps711x: Selecting CPU-variant automatically for clps711x targets Alexander Shiyan
2012-04-21 9:11 ` [PATCH 04/17] ARM clps711x: Using a single definition for virtual address register Alexander Shiyan
2012-04-21 9:11 ` [PATCH 05/17] ARM clps711x: Added missing definitions for PORT C Alexander Shiyan
2012-04-21 9:11 ` [PATCH 06/17] ARM clps711x: Remove now unused cs89712 board header Alexander Shiyan
2012-04-21 9:11 ` [PATCH 07/17] ARM clps711x: Remove unused includes Alexander Shiyan
2012-04-21 9:11 ` [PATCH 08/17] ARM clps711x: Cleanup: remove unused definitions for ep_readl/ep_writel Alexander Shiyan
2012-04-21 9:11 ` [PATCH 09/17] ARM clps711x: Using a single definition for physical address register Alexander Shiyan
2012-04-21 9:11 ` [PATCH 10/17] ARM clps711x: Address register renaming to reflect the fact that the name is the same for all arch Alexander Shiyan
2012-04-21 9:11 ` [PATCH 11/17] ARM clps711x: Move definitions of register address in one unit Alexander Shiyan
2012-04-21 9:11 ` [PATCH 12/17] ARM clps711x: Simple optimise debug_macro by removing one NOP Alexander Shiyan
2012-04-21 10:46 ` Russell King - ARM Linux
2012-04-21 10:50 ` Re[2]: " Alexander Shiyan
2012-04-21 11:18 ` Arnd Bergmann
2012-04-21 11:49 ` Arnd Bergmann
2012-04-21 9:11 ` [PATCH 13/17] ARM clps711x: Removed unused header mach/time.h Alexander Shiyan
2012-04-21 9:11 ` [PATCH 14/17] ARM clps711x: Do not mask interrupts in ack procedure Alexander Shiyan
2012-04-21 9:11 ` [PATCH 15/17] ARM clps711x: Removed unused definitions from mach/irqs.h Alexander Shiyan
2012-04-21 9:11 ` Alexander Shiyan [this message]
2012-04-21 9:11 ` [PATCH 17/17] ARM clps711x: Make select CPU spees as KConfig option Alexander Shiyan
2012-04-21 11:40 ` clps711x patchset Arnd Bergmann
2012-04-21 12:04 ` Re[2]: " Alexander Shiyan
2012-04-21 12:14 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1334999490-27177-17-git-send-email-shc_work@mail.ru \
--to=shc_work@mail.ru \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).