Skip to contentSkip to conversation

ARM: S3C64XX: fix uart clock setup for mini6410/real6410

PATCH New Darius Augulis 2 participants 3 messages Nov 7, 2010 – Nov 16, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: S3C64XX: fix uart clock setup for mini6410/real6410

Don't rewrite clock config in UCON preconfigured by bootloader. No need to set 10th bit in UCON because [11:10] 2'b00 means source clock is PCLK too. If set, console does not work if bootloader has preconfigured [11:10] with 2'b00.
If not set, console works with any bootloader config value (2'bxx).
More information about clock setup in UCON is available in "S3C6410X RISC Microprocessor User's Manual, Revision 1.20" p. 31-13 (Chapter 31.6.2
UART CONTROL REGISTER).

---
 arch/arm/mach-s3c64xx/mach-mini6410.c |    2 +-
 arch/arm/mach-s3c64xx/mach-real6410.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-s3c64xx/mach-mini6410.c +1 -1
index 3864afa..5823976 100644
@@ -45,7 +45,7 @@
 
 #include <video/platform_lcd.h>
 
-#define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)
+#define UCON S3C2410_UCON_DEFAULT
 #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB)
 #define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)
 
arch/arm/mach-s3c64xx/mach-real6410.c +1 -1
index f9ef9b5..4957ab0 100644
@@ -46,7 +46,7 @@
 
 #include <video/platform_lcd.h>
 
-#define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)
+#define UCON S3C2410_UCON_DEFAULT
 #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB)
 #define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)
 
#1 lore raw

PATCH 1/1 ARM: S3C64XX: fix uart clock setup for mini6410/real6410

Hi Kukjin,

could you please add this to your tree?

thanks,
Darius

Quoted 43 lines · Darius Augulis

Don't rewrite clock config in UCON preconfigured by bootloader. No need to set 10th bit in UCON because [11:10] 2'b00 means source clock is PCLK too. If set, console does not work if bootloader has preconfigured [11:10] with 2'b00.
If not set, console works with any bootloader config value (2'bxx).
More information about clock setup in UCON is available in "S3C6410X RISC Microprocessor User's Manual, Revision 1.20" p. 31-13 (Chapter 31.6.2
UART CONTROL REGISTER).

---
  arch/arm/mach-s3c64xx/mach-mini6410.c |    2 +-
  arch/arm/mach-s3c64xx/mach-real6410.c |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-s3c64xx/mach-mini6410.c +1 -1
index 3864afa..5823976 100644
@@ -45,7 +45,7 @@
 
  #include<video/platform_lcd.h>
 
-#define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)
+#define UCON S3C2410_UCON_DEFAULT
  #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB)
  #define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)
 
arch/arm/mach-s3c64xx/mach-real6410.c +1 -1
index f9ef9b5..4957ab0 100644
@@ -46,7 +46,7 @@
 
  #include<video/platform_lcd.h>
 
-#define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)
+#define UCON S3C2410_UCON_DEFAULT
  #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB)
  #define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)
#2 lore raw

PATCH 1/1 ARM: S3C64XX: fix uart clock setup for mini6410/real6410

Quoted 3 lines · Darius Augulis

Hi Kukjin,

Hi Darius :-)

Quoted 2 lines

could you please add this to your tree?

Ok...will apply.
And this will be sent to upstream next -rc pull request.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

Quoted 26 lines · Darius Augulis

arch/arm/mach-

Quoted 19 lines

Don't rewrite clock config in UCON preconfigured by bootloader. No need to set 10th bit in UCON because [11:10] 2'b00 means source clock is PCLK too. If set, console does not work if bootloader has preconfigured [11:10] with 2'b00.
If not set, console works with any bootloader config value (2'bxx).
More information about clock setup in UCON is available in "S3C6410X RISC Microprocessor User's Manual, Revision 1.20" p. 31-13 (Chapter 31.6.2
UART CONTROL REGISTER).

---
  arch/arm/mach-s3c64xx/mach-mini6410.c |    2 +-
  arch/arm/mach-s3c64xx/mach-real6410.c |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach- renamed from arch/arm/mach-s3c64xx/mach-mini6410.c +0 -0

s3c64xx/mach-mini6410.c

Quoted 5 lines

index 3864afa..5823976 100644

arch/arm/mach-s3c64xx/mach-mini6410.c +0 -0
@@ -45,7 +45,7 @@
 
Quoted 5 lines

arch/arm/mach-s3c64xx/mach-mini6410.c

Quoted 5 lines
arch/arm/mach-s3c64xx/mach-mini6410.c +1 -1
  #include<video/platform_lcd.h>
 
-#define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)
+#define UCON S3C2410_UCON_DEFAULT
  #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE |

S3C2410_LCON_STOPB)

Quoted 9 lines

arch/arm/mach-

Quoted 3 lines
arch/arm/mach-s3c64xx/mach-mini6410.c +0 -0
  #define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)
 
arch/arm/mach- renamed from arch/arm/mach-s3c64xx/mach-real6410.c +0 -0

s3c64xx/mach-real6410.c

Quoted 5 lines

index f9ef9b5..4957ab0 100644

arch/arm/mach-s3c64xx/mach-real6410.c +0 -0
@@ -46,7 +46,7 @@
 
Quoted 5 lines

arch/arm/mach-s3c64xx/mach-real6410.c line 50

Quoted 5 lines
arch/arm/mach-s3c64xx/mach-real6410.c +1 -1
  #include<video/platform_lcd.h>
 
-#define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)
+#define UCON S3C2410_UCON_DEFAULT
  #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE |

S3C2410_LCON_STOPB)

Quoted 1 line
Quoted 1 line
arch/arm/mach-s3c64xx/mach-real6410.c +0 -0
  #define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)