Skip to contentSkip to conversation

ARM: NUC900: enable uart support for nuc932

PATCH In review Wan ZongShun 2 participants 3 messages Dec 2, 2009 – Dec 4, 2009

Subsystems (2)
Arm (32-bit) Arm sub-architectures
lore
Share & tools
lore

Wan ZongShun

author
#0 lore raw

PATCH 4/4 ARM: NUC900: enable uart support for nuc932

Dear Russell,

This patch enables uart support for nuc932.

Signed-off-by Wan ZongShun <[email protected]>
---
 arch/arm/mach-w90x900/clock.h          |    2 ++
 arch/arm/mach-w90x900/cpu.h            |    2 +-
 arch/arm/mach-w90x900/mach-nuc932evb.c |    1 +
 arch/arm/mach-w90x900/nuc932.c         |   10 ++++++++++
 arch/arm/mach-w90x900/nuc932.h         |    1 +
 5 files changed, 15 insertions(+), 1 deletions(-)
arch/arm/mach-w90x900/clock.h +2 -0
index b9ea2e6..2a2a54a 100644
@@ -14,8 +14,10 @@
 
 #ifndef CONFIG_CPU_NUC932
 #define EXTCLK	15000000
+#define UARTCLK	11313600
 #else
 #define EXTCLK	27000000
+#define UARTCLK	57139200
 #endif
 
 void nuc900_clk_enable(struct clk *clk, int enable);
arch/arm/mach-w90x900/cpu.h +1 -1
index 4493d4d..300e35b 100644
@@ -30,7 +30,7 @@
 	.membase	= name##_BA,				\
 	.mapbase	= name##_PA,				\
 	.irq		= IRQ_##name,				\
-	.uartclk	= 11313600,				\
+	.uartclk	= UARTCLK,				\
 	.regshift	= 2,					\
 	.iotype		= UPIO_MEM,				\
 	.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,	\
arch/arm/mach-w90x900/mach-nuc932evb.c +1 -0
index bcc67d2..9f8a3f9 100644
@@ -23,6 +23,7 @@ static void __init nuc932evb_map_io(void)
 {
 	nuc932_map_io();
 	nuc932_init_clocks();
+	nuc932_init_uartclk();
 }
 
 static void __init nuc932evb_init(void)
arch/arm/mach-w90x900/nuc932.c +10 -0
index 140fa2f..44b1347 100644
@@ -80,6 +80,16 @@ void __init nuc932_map_io(void)
 	nuc900_map_io(nuc932evb_iodesc, ARRAY_SIZE(nuc932evb_iodesc));
 }
 
+/*enable NUC932 uart clock*/
+
+void __init nuc932_init_uartclk(void)
+{
+	struct clk *ck_uart = clk_get(NULL, "uart");
+	BUG_ON(IS_ERR(ck_uart));
+
+	clk_enable(ck_uart);
+}
+
 /*Init NUC932 clock*/
 
 void __init nuc932_init_clocks(void)
arch/arm/mach-w90x900/nuc932.h +1 -0
index 4cf1182..e0bafe7 100644
@@ -26,3 +26,4 @@ extern struct sys_timer nuc900_timer;
 extern void nuc932_board_init(void);
 extern void nuc932_init_clocks(void);
 extern void nuc932_map_io(void);
+extern void nuc932_init_uartclk(void);
Signature · 1 line
1.5.6.3
#1 lore raw

arch/arm/mach-w90x900/clock.h line 21

Quoted 13 lines · Wan ZongShun
arch/arm/mach-w90x900/clock.h +2 -0
index b9ea2e6..2a2a54a 100644
@@ -14,8 +14,10 @@
 
 #ifndef CONFIG_CPU_NUC932
 #define EXTCLK	15000000
+#define UARTCLK	11313600
 #else
 #define EXTCLK	27000000
+#define UARTCLK	57139200
 #endif

As far as I can see, these are the only thing which prevent a single kernel being built to cover both NUC900 and NUC932.

Can we make their selection something which is done at runtime instead of compile time? This comments goes for patch 5837/1 in the patch system as well.

author
#2 lore raw

2009/12/4 Russell King - ARM Linux <[email protected]>:

Quoted 18 lines · Wan ZongShun

arch/arm/mach-w90x900/clock.h line 21

Quoted 13 lines
arch/arm/mach-w90x900/clock.h +2 -0
index b9ea2e6..2a2a54a 100644
@@ -14,8 +14,10 @@
 
  #ifndef CONFIG_CPU_NUC932
  #define EXTCLK       15000000
+#define UARTCLK      11313600
  #else
  #define EXTCLK       27000000
+#define UARTCLK      57139200
  #endif

As far as I can see, these are the only thing which prevent a single kernel being built to cover both NUC900 and NUC932.

Quoted 4 lines

Can we make their selection something which is done at runtime instead of compile time?  This comments goes for patch 5837/1 in the patch system as well.

Do you mean that I should use following form instead?

"if (machine_is_nuc932evb())"

         code....
Signature · 3 lines
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel