Skip to contentSkip to conversation

SMDKC100 fixes

PATCH New Marek Szyprowski 2 participants 4 messages May 18, 2010

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

PATCH 1/1 SMDKC100 fixes

Hello,

This patch series introduces 2 fixes to SMDKC100 board setup code. On request I've separated them from the s5pc1xx cleanup patch series.

This patch series includes:

[PATCH 1/2] ARM: SMDKC100: fix frame buffer definitions [PATCH 2/2] ARM: SMDKC100: remove magic values from uart setup structures

Best regards,
Marek Szyprowski

#1 lore raw

PATCH 1/2 ARM: SMDKC100: fix frame buffer definitions

The definition of the framebuffer parameters was created when s3c-fb.c driver was patched to support setting the refresh rate directly (commit 600ce1a0faafeed1ce6bcfd421bc040b941cbbc1). That patch was completely wrong and was reverted in commit eb29a5cc0b601c458bae9df2f what breaked the framebuffer on s5pc100. This patch updates framebuffer definitions to correct values.

---
 arch/arm/mach-s5pc100/mach-smdkc100.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
arch/arm/mach-s5pc100/mach-smdkc100.c +1 -2
index ae3c52c..dd8c154 100644
@@ -119,8 +119,7 @@ static struct platform_device smdkc100_lcd_powerdev = {
 static struct s3c_fb_pd_win smdkc100_fb_win0 = {
 	/* this is to ensure we use win0 */
 	.win_mode	= {
-		.refresh	= 70,
-		.pixclock	= (8+13+3+800)*(7+5+1+480),
+		.pixclock = 1000000000000ULL / ((8+13+3+800)*(7+5+1+480)*80),
 		.left_margin	= 8,
 		.right_margin	= 13,
 		.upper_margin	= 7,
Signature · 1 line
1.6.4
#2 lore raw

PATCH 2/2 ARM: SMDKC100: remove magic values from uart setup structures

In reply to Marek Szyprowski

This patch introduces nice defines for the initial values for UART devices on SMDKC100.

---
 arch/arm/mach-s5pc100/mach-smdkc100.c |   40 ++++++++++++++++++++------------
 1 files changed, 25 insertions(+), 15 deletions(-)
arch/arm/mach-s5pc100/mach-smdkc100.c +25 -15
index dd8c154..3a7dc3e 100644
@@ -44,38 +44,48 @@
 #include <plat/fb.h>
 #include <plat/iic.h>
 
-#define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)
-#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB)
-#define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)
+/* Following are default values for UCON, ULCON and UFCON UART registers */
+#define S5PC100_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\
+				 S3C2410_UCON_RXILEVEL |	\
+				 S3C2410_UCON_TXIRQMODE |	\
+				 S3C2410_UCON_RXIRQMODE |	\
+				 S3C2410_UCON_RXFIFO_TOI |	\
+				 S3C2443_UCON_RXERR_IRQEN)
+
+#define S5PC100_ULCON_DEFAULT	S3C2410_LCON_CS8
+
+#define S5PC100_UFCON_DEFAULT	(S3C2410_UFCON_FIFOMODE |	\
+				 S3C2440_UFCON_RXTRIG8 |	\
+				 S3C2440_UFCON_TXTRIG16)
 
 static struct s3c2410_uartcfg smdkc100_uartcfgs[] __initdata = {
 	[0] = {
 		.hwport	     = 0,
 		.flags	     = 0,
-		.ucon	     = 0x3c5,
-		.ulcon	     = 0x03,
-		.ufcon	     = 0x51,
+		.ucon	     = S5PC100_UCON_DEFAULT,
+		.ulcon	     = S5PC100_ULCON_DEFAULT,
+		.ufcon	     = S5PC100_UFCON_DEFAULT,
 	},
 	[1] = {
 		.hwport	     = 1,
 		.flags	     = 0,
-		.ucon	     = 0x3c5,
-		.ulcon	     = 0x03,
-		.ufcon	     = 0x51,
+		.ucon	     = S5PC100_UCON_DEFAULT,
+		.ulcon	     = S5PC100_ULCON_DEFAULT,
+		.ufcon	     = S5PC100_UFCON_DEFAULT,
 	},
 	[2] = {
 		.hwport	     = 2,
 		.flags	     = 0,
-		.ucon	     = 0x3c5,
-		.ulcon	     = 0x03,
-		.ufcon	     = 0x51,
+		.ucon	     = S5PC100_UCON_DEFAULT,
+		.ulcon	     = S5PC100_ULCON_DEFAULT,
+		.ufcon	     = S5PC100_UFCON_DEFAULT,
 	},
 	[3] = {
 		.hwport	     = 3,
 		.flags	     = 0,
-		.ucon	     = 0x3c5,
-		.ulcon	     = 0x03,
-		.ufcon	     = 0x51,
+		.ucon	     = S5PC100_UCON_DEFAULT,
+		.ulcon	     = S5PC100_ULCON_DEFAULT,
+		.ufcon	     = S5PC100_UFCON_DEFAULT,
 	},
 };
 
Signature · 1 line
1.6.4
#3 lore raw

PATCH 1/1 SMDKC100 fixes

In reply to Marek Szyprowski
Quoted 4 lines · Marek Szyprowski

Hello,

This patch series introduces 2 fixes to SMDKC100 board setup code. On request I've separated them from the s5pc1xx cleanup patch series.

ok, will apply.

Quoted 11 lines

This patch series includes:

[PATCH 1/2] ARM: SMDKC100: fix frame buffer definitions [PATCH 2/2] ARM: SMDKC100: remove magic values from uart setup structures

Best regards,
Marek Szyprowski
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 5 lines
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.