* [PATCH 1/6] video: s3c-fb: Add S5P64X0 specific s3c_fb_driverdata
2011-07-14 13:27 [PATCH 0/6] ARM: S5P64X0: Add Framebuffer support Ajay Kumar
@ 2011-07-14 13:27 ` Ajay Kumar
2011-07-14 13:27 ` [PATCH 2/6] ARM: S5P64X0: Add register base and IRQ for Framebuffer Ajay Kumar
` (5 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Ajay Kumar @ 2011-07-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
This patch:
Adds s3c_fb_driverdata for S5P64X0, which supports 3 windows.
Also, register "s5p64x0-fb" type driver_data.
Note: Existing s3c_fb_driverdata definitions in s3c-fb.c
supports 5 or 2 windows.
Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
---
drivers/video/s3c-fb.c | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 4aecf21..0fda252 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -1859,6 +1859,30 @@ static struct s3c_fb_driverdata s3c_fb_data_s3c2443 = {
},
};
+static struct s3c_fb_driverdata s3c_fb_data_s5p64x0 = {
+ .variant = {
+ .nr_windows = 3,
+ .vidtcon = VIDTCON0,
+ .wincon = WINCON(0),
+ .winmap = WINxMAP(0),
+ .keycon = WKEYCON,
+ .osd = VIDOSD_BASE,
+ .osd_stride = 16,
+ .buf_start = VIDW_BUF_START(0),
+ .buf_size = VIDW_BUF_SIZE(0),
+ .buf_end = VIDW_BUF_END(0),
+
+ .palette = {
+ [0] = 0x2400,
+ [1] = 0x2800,
+ [2] = 0x2c00,
+ },
+ },
+ .win[0] = &s3c_fb_data_s5p_wins[0],
+ .win[1] = &s3c_fb_data_s5p_wins[1],
+ .win[2] = &s3c_fb_data_s5p_wins[2],
+};
+
static struct platform_device_id s3c_fb_driver_ids[] = {
{
.name = "s3c-fb",
@@ -1872,6 +1896,9 @@ static struct platform_device_id s3c_fb_driver_ids[] = {
}, {
.name = "s3c2443-fb",
.driver_data = (unsigned long)&s3c_fb_data_s3c2443,
+ }, {
+ .name = "s5p64x0-fb",
+ .driver_data = (unsigned long)&s3c_fb_data_s5p64x0,
},
{},
};
--
1.7.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 2/6] ARM: S5P64X0: Add register base and IRQ for Framebuffer
2011-07-14 13:27 [PATCH 0/6] ARM: S5P64X0: Add Framebuffer support Ajay Kumar
2011-07-14 13:27 ` [PATCH 1/6] video: s3c-fb: Add S5P64X0 specific s3c_fb_driverdata Ajay Kumar
@ 2011-07-14 13:27 ` Ajay Kumar
2011-07-14 11:17 ` Marek Szyprowski
2011-07-21 1:07 ` Kukjin Kim
2011-07-14 13:27 ` [PATCH 3/6] ARM: S5P64X0: Set s3c_device_fb name Ajay Kumar
` (4 subsequent siblings)
6 siblings, 2 replies; 14+ messages in thread
From: Ajay Kumar @ 2011-07-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds:
o Framebuffer related register mappings and bit fields.
o IRQ number being used.
Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
---
arch/arm/mach-s5p64x0/include/mach/irqs.h | 4 ++++
arch/arm/mach-s5p64x0/include/mach/map.h | 3 +++
arch/arm/mach-s5p64x0/include/mach/regs-fb.h | 19 +++++++++++++++++++
3 files changed, 26 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-fb.h
diff --git a/arch/arm/mach-s5p64x0/include/mach/irqs.h b/arch/arm/mach-s5p64x0/include/mach/irqs.h
index 513abff..09995b8 100644
--- a/arch/arm/mach-s5p64x0/include/mach/irqs.h
+++ b/arch/arm/mach-s5p64x0/include/mach/irqs.h
@@ -85,6 +85,10 @@
#define IRQ_S3CUART_RX4 IRQ_S5P_UART_RX4
#define IRQ_S3CUART_RX5 IRQ_S5P_UART_RX5
+#define IRQ_LCD_FIFO IRQ_DISPCON0
+#define IRQ_LCD_VSYNC IRQ_DISPCON1
+#define IRQ_LCD_SYSTEM IRQ_DISPCON2
+
/* S5P6450 EINT feature will be added */
/*
diff --git a/arch/arm/mach-s5p64x0/include/mach/map.h b/arch/arm/mach-s5p64x0/include/mach/map.h
index 95c9125..c5ef50c 100644
--- a/arch/arm/mach-s5p64x0/include/mach/map.h
+++ b/arch/arm/mach-s5p64x0/include/mach/map.h
@@ -47,6 +47,8 @@
#define S5P64X0_PA_HSMMC(x) (0xED800000 + ((x) * 0x100000))
+#define S5P64X0_PA_FB 0xEE000000
+
#define S5P64X0_PA_I2S 0xF2000000
#define S5P6450_PA_I2S1 0xF2800000
#define S5P6450_PA_I2S2 0xF2900000
@@ -64,6 +66,7 @@
#define S3C_PA_IIC1 S5P6440_PA_IIC1
#define S3C_PA_RTC S5P64X0_PA_RTC
#define S3C_PA_WDT S5P64X0_PA_WDT
+#define S3C_PA_FB S5P64X0_PA_FB
#define S5P_PA_CHIPID S5P64X0_PA_CHIPID
#define S5P_PA_SROMC S5P64X0_PA_SROMC
diff --git a/arch/arm/mach-s5p64x0/include/mach/regs-fb.h b/arch/arm/mach-s5p64x0/include/mach/regs-fb.h
new file mode 100644
index 0000000..cbb8d8c
--- /dev/null
+++ b/arch/arm/mach-s5p64x0/include/mach/regs-fb.h
@@ -0,0 +1,19 @@
+/*
+ * linux/arch/arm/mach-s5p64x0/include/mach/regs-fb.h
+ *
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.
+ * http://www.samsung.com/
+ *
+ * Framebuffer register definitions for Samsung S5P64X0.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#ifndef __ASM_ARCH_MACH_REGS_FB_H
+#define __ASM_ARCH_MACH_REGS_FB_H __FILE__
+
+#include <plat/regs-fb.h>
+
+#endif /* __ASM_ARCH_MACH_REGS_FB_H */
--
1.7.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 2/6] ARM: S5P64X0: Add register base and IRQ for Framebuffer
2011-07-14 13:27 ` [PATCH 2/6] ARM: S5P64X0: Add register base and IRQ for Framebuffer Ajay Kumar
@ 2011-07-14 11:17 ` Marek Szyprowski
2011-07-15 5:56 ` Ajay kumar
2011-07-21 1:07 ` Kukjin Kim
1 sibling, 1 reply; 14+ messages in thread
From: Marek Szyprowski @ 2011-07-14 11:17 UTC (permalink / raw)
To: linux-arm-kernel
Hello,
On Thursday, July 14, 2011 3:27 PM Ajay Kumar wrote:
> This patch adds:
> o Framebuffer related register mappings and bit fields.
> o IRQ number being used.
>
> Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
> ---
> arch/arm/mach-s5p64x0/include/mach/irqs.h | 4 ++++
> arch/arm/mach-s5p64x0/include/mach/map.h | 3 +++
> arch/arm/mach-s5p64x0/include/mach/regs-fb.h | 19 +++++++++++++++++++
> 3 files changed, 26 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-fb.h
>
> diff --git a/arch/arm/mach-s5p64x0/include/mach/irqs.h b/arch/arm/mach-
> s5p64x0/include/mach/irqs.h
> index 513abff..09995b8 100644
> --- a/arch/arm/mach-s5p64x0/include/mach/irqs.h
> +++ b/arch/arm/mach-s5p64x0/include/mach/irqs.h
> @@ -85,6 +85,10 @@
> #define IRQ_S3CUART_RX4 IRQ_S5P_UART_RX4
> #define IRQ_S3CUART_RX5 IRQ_S5P_UART_RX5
>
> +#define IRQ_LCD_FIFO IRQ_DISPCON0
> +#define IRQ_LCD_VSYNC IRQ_DISPCON1
> +#define IRQ_LCD_SYSTEM IRQ_DISPCON2
> +
> /* S5P6450 EINT feature will be added */
>
> /*
> diff --git a/arch/arm/mach-s5p64x0/include/mach/map.h b/arch/arm/mach-
> s5p64x0/include/mach/map.h
> index 95c9125..c5ef50c 100644
> --- a/arch/arm/mach-s5p64x0/include/mach/map.h
> +++ b/arch/arm/mach-s5p64x0/include/mach/map.h
> @@ -47,6 +47,8 @@
>
> #define S5P64X0_PA_HSMMC(x) (0xED800000 + ((x) * 0x100000))
>
> +#define S5P64X0_PA_FB 0xEE000000
> +
> #define S5P64X0_PA_I2S 0xF2000000
> #define S5P6450_PA_I2S1 0xF2800000
> #define S5P6450_PA_I2S2 0xF2900000
> @@ -64,6 +66,7 @@
> #define S3C_PA_IIC1 S5P6440_PA_IIC1
> #define S3C_PA_RTC S5P64X0_PA_RTC
> #define S3C_PA_WDT S5P64X0_PA_WDT
> +#define S3C_PA_FB S5P64X0_PA_FB
>
> #define S5P_PA_CHIPID S5P64X0_PA_CHIPID
> #define S5P_PA_SROMC S5P64X0_PA_SROMC
> diff --git a/arch/arm/mach-s5p64x0/include/mach/regs-fb.h b/arch/arm/mach-
> s5p64x0/include/mach/regs-fb.h
> new file mode 100644
> index 0000000..cbb8d8c
> --- /dev/null
> +++ b/arch/arm/mach-s5p64x0/include/mach/regs-fb.h
> @@ -0,0 +1,19 @@
> +/*
> + * linux/arch/arm/mach-s5p64x0/include/mach/regs-fb.h
> + *
> + * Copyright (c) 2011 Samsung Electronics Co., Ltd.
> + * http://www.samsung.com/
> + *
> + * Framebuffer register definitions for Samsung S5P64X0.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> +*/
> +
> +#ifndef __ASM_ARCH_MACH_REGS_FB_H
> +#define __ASM_ARCH_MACH_REGS_FB_H __FILE__
> +
> +#include <plat/regs-fb.h>
> +
> +#endif /* __ASM_ARCH_MACH_REGS_FB_H */
This patch reminds me, that the arch/arm/mach-*/include/mach/regs-fb.h files
should be
completely removed. Most of them simply includes the other header from
plat-samsung,
which can be included directly by the driver.
plat-s5pc100/include/mach/regs-fb.h contains
some definitions that are not used at all afair, so it can be dropped as well.
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/6] ARM: S5P64X0: Add register base and IRQ for Framebuffer
2011-07-14 11:17 ` Marek Szyprowski
@ 2011-07-15 5:56 ` Ajay kumar
0 siblings, 0 replies; 14+ messages in thread
From: Ajay kumar @ 2011-07-15 5:56 UTC (permalink / raw)
To: linux-arm-kernel
Hi Marek,
On Thu, Jul 14, 2011 at 4:47 PM, Marek Szyprowski
<m.szyprowski@samsung.com> wrote:
>
> Hello,
>
> On Thursday, July 14, 2011 3:27 PM Ajay Kumar wrote:
>
> > This patch adds:
> > o Framebuffer related register mappings and bit fields.
> > o IRQ number being used.
> >
> > Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
> > ---
> > ?arch/arm/mach-s5p64x0/include/mach/irqs.h ? ?| ? ?4 ++++
> > ?arch/arm/mach-s5p64x0/include/mach/map.h ? ? | ? ?3 +++
> > ?arch/arm/mach-s5p64x0/include/mach/regs-fb.h | ? 19 +++++++++++++++++++
> > ?3 files changed, 26 insertions(+), 0 deletions(-)
> > ?create mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-fb.h
> >
> > diff --git a/arch/arm/mach-s5p64x0/include/mach/irqs.h b/arch/arm/mach-
> > s5p64x0/include/mach/irqs.h
> > index 513abff..09995b8 100644
> > --- a/arch/arm/mach-s5p64x0/include/mach/irqs.h
> > +++ b/arch/arm/mach-s5p64x0/include/mach/irqs.h
> > @@ -85,6 +85,10 @@
> > ?#define IRQ_S3CUART_RX4 ? ? ? ? ? ? ?IRQ_S5P_UART_RX4
> > ?#define IRQ_S3CUART_RX5 ? ? ? ? ? ? ?IRQ_S5P_UART_RX5
> >
> > +#define IRQ_LCD_FIFO ? ? ? ? IRQ_DISPCON0
> > +#define IRQ_LCD_VSYNC ? ? ? ? ? ? ? ?IRQ_DISPCON1
> > +#define IRQ_LCD_SYSTEM ? ? ? ? ? ? ? IRQ_DISPCON2
> > +
> > ?/* S5P6450 EINT feature will be added */
> >
> > ?/*
> > diff --git a/arch/arm/mach-s5p64x0/include/mach/map.h b/arch/arm/mach-
> > s5p64x0/include/mach/map.h
> > index 95c9125..c5ef50c 100644
> > --- a/arch/arm/mach-s5p64x0/include/mach/map.h
> > +++ b/arch/arm/mach-s5p64x0/include/mach/map.h
> > @@ -47,6 +47,8 @@
> >
> > ?#define S5P64X0_PA_HSMMC(x) ?(0xED800000 + ((x) * 0x100000))
> >
> > +#define S5P64X0_PA_FB ? ? ? ? ? ? ? ?0xEE000000
> > +
> > ?#define S5P64X0_PA_I2S ? ? ? ? ? ? ? 0xF2000000
> > ?#define S5P6450_PA_I2S1 ? ? ? ? ? ? ?0xF2800000
> > ?#define S5P6450_PA_I2S2 ? ? ? ? ? ? ?0xF2900000
> > @@ -64,6 +66,7 @@
> > ?#define S3C_PA_IIC1 ? ? ? ? ?S5P6440_PA_IIC1
> > ?#define S3C_PA_RTC ? ? ? ? ? S5P64X0_PA_RTC
> > ?#define S3C_PA_WDT ? ? ? ? ? S5P64X0_PA_WDT
> > +#define S3C_PA_FB ? ? ? ? ? ?S5P64X0_PA_FB
> >
> > ?#define S5P_PA_CHIPID ? ? ? ? ? ? ? ?S5P64X0_PA_CHIPID
> > ?#define S5P_PA_SROMC ? ? ? ? S5P64X0_PA_SROMC
> > diff --git a/arch/arm/mach-s5p64x0/include/mach/regs-fb.h b/arch/arm/mach-
> > s5p64x0/include/mach/regs-fb.h
> > new file mode 100644
> > index 0000000..cbb8d8c
> > --- /dev/null
> > +++ b/arch/arm/mach-s5p64x0/include/mach/regs-fb.h
> > @@ -0,0 +1,19 @@
> > +/*
> > + * linux/arch/arm/mach-s5p64x0/include/mach/regs-fb.h
> > + *
> > + * Copyright (c) 2011 Samsung Electronics Co., Ltd.
> > + * ? ? ? ? ? http://www.samsung.com/
> > + *
> > + * Framebuffer register definitions for Samsung S5P64X0.
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > +*/
> > +
> > +#ifndef __ASM_ARCH_MACH_REGS_FB_H
> > +#define __ASM_ARCH_MACH_REGS_FB_H __FILE__
> > +
> > +#include <plat/regs-fb.h>
> > +
> > +#endif /* __ASM_ARCH_MACH_REGS_FB_H */
>
> This patch reminds me, that the arch/arm/mach-*/include/mach/regs-fb.h files
> should be
> completely removed. Most of them simply includes the other header from
> plat-samsung,
> which can be included directly by the driver.
> plat-s5pc100/include/mach/regs-fb.h contains
> some definitions that are not used at all afair, so it can be dropped as well.
I consider your point.
Soon I will send a consolidating patch for all the boards.
Note: Consolidation patch set is based on S5P64X0 patch-set
>
> Best regards
> --
> Marek Szyprowski
> Samsung Poland R&D Center
>
>
>
> --
> 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
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/6] ARM: S5P64X0: Add register base and IRQ for Framebuffer
2011-07-14 13:27 ` [PATCH 2/6] ARM: S5P64X0: Add register base and IRQ for Framebuffer Ajay Kumar
2011-07-14 11:17 ` Marek Szyprowski
@ 2011-07-21 1:07 ` Kukjin Kim
1 sibling, 0 replies; 14+ messages in thread
From: Kukjin Kim @ 2011-07-21 1:07 UTC (permalink / raw)
To: linux-arm-kernel
Ajay Kumar wrote:
>
> This patch adds:
> o Framebuffer related register mappings and bit fields.
> o IRQ number being used.
>
> Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
> ---
> arch/arm/mach-s5p64x0/include/mach/irqs.h | 4 ++++
> arch/arm/mach-s5p64x0/include/mach/map.h | 3 +++
> arch/arm/mach-s5p64x0/include/mach/regs-fb.h | 19 +++++++++++++++++++
> 3 files changed, 26 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-fb.h
>
> diff --git a/arch/arm/mach-s5p64x0/include/mach/irqs.h b/arch/arm/mach-
> s5p64x0/include/mach/irqs.h
> index 513abff..09995b8 100644
> --- a/arch/arm/mach-s5p64x0/include/mach/irqs.h
> +++ b/arch/arm/mach-s5p64x0/include/mach/irqs.h
> @@ -85,6 +85,10 @@
> #define IRQ_S3CUART_RX4 IRQ_S5P_UART_RX4
> #define IRQ_S3CUART_RX5 IRQ_S5P_UART_RX5
>
> +#define IRQ_LCD_FIFO IRQ_DISPCON0
> +#define IRQ_LCD_VSYNC IRQ_DISPCON1
> +#define IRQ_LCD_SYSTEM IRQ_DISPCON2
> +
> /* S5P6450 EINT feature will be added */
>
> /*
> diff --git a/arch/arm/mach-s5p64x0/include/mach/map.h b/arch/arm/mach-
> s5p64x0/include/mach/map.h
> index 95c9125..c5ef50c 100644
> --- a/arch/arm/mach-s5p64x0/include/mach/map.h
> +++ b/arch/arm/mach-s5p64x0/include/mach/map.h
> @@ -47,6 +47,8 @@
>
> #define S5P64X0_PA_HSMMC(x) (0xED800000 + ((x) * 0x100000))
>
> +#define S5P64X0_PA_FB 0xEE000000
> +
> #define S5P64X0_PA_I2S 0xF2000000
> #define S5P6450_PA_I2S1 0xF2800000
> #define S5P6450_PA_I2S2 0xF2900000
> @@ -64,6 +66,7 @@
> #define S3C_PA_IIC1 S5P6440_PA_IIC1
> #define S3C_PA_RTC S5P64X0_PA_RTC
> #define S3C_PA_WDT S5P64X0_PA_WDT
> +#define S3C_PA_FB S5P64X0_PA_FB
>
> #define S5P_PA_CHIPID S5P64X0_PA_CHIPID
> #define S5P_PA_SROMC S5P64X0_PA_SROMC
> diff --git a/arch/arm/mach-s5p64x0/include/mach/regs-fb.h b/arch/arm/mach-
> s5p64x0/include/mach/regs-fb.h
> new file mode 100644
> index 0000000..cbb8d8c
> --- /dev/null
> +++ b/arch/arm/mach-s5p64x0/include/mach/regs-fb.h
> @@ -0,0 +1,19 @@
> +/*
> + * linux/arch/arm/mach-s5p64x0/include/mach/regs-fb.h
> + *
> + * Copyright (c) 2011 Samsung Electronics Co., Ltd.
> + * http://www.samsung.com/
> + *
> + * Framebuffer register definitions for Samsung S5P64X0.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> +*/
> +
> +#ifndef __ASM_ARCH_MACH_REGS_FB_H
> +#define __ASM_ARCH_MACH_REGS_FB_H __FILE__
> +
> +#include <plat/regs-fb.h>
> +
> +#endif /* __ASM_ARCH_MACH_REGS_FB_H */
> --
> 1.7.1
Since I applied your cleanup mach/regs-fb.h, you have to update this to
avoid conflicts.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/6] ARM: S5P64X0: Set s3c_device_fb name
2011-07-14 13:27 [PATCH 0/6] ARM: S5P64X0: Add Framebuffer support Ajay Kumar
2011-07-14 13:27 ` [PATCH 1/6] video: s3c-fb: Add S5P64X0 specific s3c_fb_driverdata Ajay Kumar
2011-07-14 13:27 ` [PATCH 2/6] ARM: S5P64X0: Add register base and IRQ for Framebuffer Ajay Kumar
@ 2011-07-14 13:27 ` Ajay Kumar
2011-07-14 13:27 ` [PATCH 4/6] ARM: S5P64X0: Add GPIO and SPCON settings for LCD Ajay Kumar
` (3 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Ajay Kumar @ 2011-07-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
For S5P6440 and S5P6450:
Set s3c_device_fb name as "s5p64x0-fb", so that "s5p64x0-fb"
type driver_data is used in s3c-fb driver.
Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
---
arch/arm/mach-s5p64x0/cpu.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5p64x0/cpu.c b/arch/arm/mach-s5p64x0/cpu.c
index a5c0095..617da3b 100644
--- a/arch/arm/mach-s5p64x0/cpu.c
+++ b/arch/arm/mach-s5p64x0/cpu.c
@@ -38,6 +38,7 @@
#include <plat/s5p6440.h>
#include <plat/s5p6450.h>
#include <plat/adc-core.h>
+#include <plat/fb-core.h>
/* Initial IO mappings */
@@ -108,6 +109,7 @@ void __init s5p6440_map_io(void)
{
/* initialize any device information early */
s3c_adc_setname("s3c64xx-adc");
+ s3c_fb_setname("s5p64x0-fb");
iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc));
iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc));
@@ -117,6 +119,7 @@ void __init s5p6450_map_io(void)
{
/* initialize any device information early */
s3c_adc_setname("s3c64xx-adc");
+ s3c_fb_setname("s5p64x0-fb");
iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc));
iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6450_iodesc));
--
1.7.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 4/6] ARM: S5P64X0: Add GPIO and SPCON settings for LCD
2011-07-14 13:27 [PATCH 0/6] ARM: S5P64X0: Add Framebuffer support Ajay Kumar
` (2 preceding siblings ...)
2011-07-14 13:27 ` [PATCH 3/6] ARM: S5P64X0: Set s3c_device_fb name Ajay Kumar
@ 2011-07-14 13:27 ` Ajay Kumar
2011-07-21 1:21 ` Kukjin Kim
2011-07-14 13:27 ` [PATCH 5/6] ARM: S5P6440: Add LCD-LTE480 and enable Framebuffer support Ajay Kumar
` (2 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Ajay Kumar @ 2011-07-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds:
o GPIO lines settings(HSYNC, VSYNC, VCLK and VD) for LCD.
o Function to select type of LCD interface (RGB/i80)
Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
---
arch/arm/mach-s5p64x0/Kconfig | 6 +++
arch/arm/mach-s5p64x0/Makefile | 1 +
arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 4 ++
arch/arm/mach-s5p64x0/setup-fb.c | 48 ++++++++++++++++++++++++
arch/arm/plat-samsung/include/plat/fb.h | 14 +++++++
5 files changed, 73 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-s5p64x0/setup-fb.c
diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig
index 017af4c..2ca5ac0 100644
--- a/arch/arm/mach-s5p64x0/Kconfig
+++ b/arch/arm/mach-s5p64x0/Kconfig
@@ -21,6 +21,12 @@ config CPU_S5P6450
help
Enable S5P6450 CPU support
+config S5P64X0_SETUP_FB
+ bool
+ help
+ Common setup code for S5P64X0 based boards with a LCD display
+ through RGB interface.
+
config S5P64X0_SETUP_I2C1
bool
help
diff --git a/arch/arm/mach-s5p64x0/Makefile b/arch/arm/mach-s5p64x0/Makefile
index ae6bf6f..43698c6 100644
--- a/arch/arm/mach-s5p64x0/Makefile
+++ b/arch/arm/mach-s5p64x0/Makefile
@@ -28,3 +28,4 @@ obj-y += dev-audio.o
obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
obj-$(CONFIG_S5P64X0_SETUP_I2C1) += setup-i2c1.o
+obj-$(CONFIG_S5P64X0_SETUP_FB) += setup-fb.o
diff --git a/arch/arm/mach-s5p64x0/include/mach/regs-gpio.h b/arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
index 0953ef6..2f07cbd 100644
--- a/arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
+++ b/arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
@@ -34,4 +34,8 @@
#define S5P6450_GPQ_BASE (S5P_VA_GPIO + 0x0180)
#define S5P6450_GPS_BASE (S5P_VA_GPIO + 0x0300)
+#define S5P64X0_SPCON0 (S5P_VA_GPIO + 0x1A0)
+#define S5P64X0_SPCON0_LCD_SEL_MASK (0x3 << 0)
+#define S5P64X0_SPCON0_LCD_SEL_RGB (0x1 << 0)
+
#endif /* __ASM_ARCH_REGS_GPIO_H */
diff --git a/arch/arm/mach-s5p64x0/setup-fb.c b/arch/arm/mach-s5p64x0/setup-fb.c
new file mode 100644
index 0000000..3e8ffad
--- /dev/null
+++ b/arch/arm/mach-s5p64x0/setup-fb.c
@@ -0,0 +1,48 @@
+/* linux/arch/arm/mach-s5p64x0/setup-fb.c
+ *
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.
+ * http://www.samsung.com/
+ *
+ * Base S5P64X0 GPIO setup information for LCD framebuffer
+ *
+ * GPIO settings for LCD on any other board based on s5p64x0
+ * should go in this file.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/fb.h>
+#include <linux/gpio.h>
+
+#include <plat/fb.h>
+#include <plat/gpio-cfg.h>
+
+#include <mach/regs-clock.h>
+#include <mach/regs-gpio.h>
+
+void s5p64x0_fb_init(int lcd_interface_type)
+{
+ unsigned int cfg;
+
+ /* select TFT LCD type (RGB I/F) */
+ cfg = readl(S5P64X0_SPCON0);
+ cfg &= ~S5P64X0_SPCON0_LCD_SEL_MASK;
+ cfg |= lcd_interface_type;
+ writel(cfg, S5P64X0_SPCON0);
+}
+
+void s5p64x0_fb_gpio_setup_24bpp(void)
+{
+ unsigned int cfg;
+
+ cfg = readl(S5P64X0_SYS_ID) & 0xf0000;
+ if (cfg == 0x40000) {
+ s3c_gpio_cfgrange_nopull(S5P6440_GPI(0), 16, S3C_GPIO_SFN(2));
+ s3c_gpio_cfgrange_nopull(S5P6440_GPJ(0), 12, S3C_GPIO_SFN(2));
+ } else if (cfg == 0x50000) {
+ s3c_gpio_cfgrange_nopull(S5P6450_GPI(0), 16, S3C_GPIO_SFN(2));
+ s3c_gpio_cfgrange_nopull(S5P6450_GPJ(0), 12, S3C_GPIO_SFN(2));
+ }
+}
diff --git a/arch/arm/plat-samsung/include/plat/fb.h b/arch/arm/plat-samsung/include/plat/fb.h
index cb3ca3a..8147c59 100644
--- a/arch/arm/plat-samsung/include/plat/fb.h
+++ b/arch/arm/plat-samsung/include/plat/fb.h
@@ -94,4 +94,18 @@ extern void s5pc100_fb_gpio_setup_24bpp(void);
*/
extern void s5pv210_fb_gpio_setup_24bpp(void);
+/**
+ * s5p64x0_fb_init() - Common setup function for LCD
+ *
+ * Select LCD I/F configuration-RGB style or i80 style
+ */
+extern void s5p64x0_fb_init(int lcd_interface_type);
+
+/**
+ * s5p64x0_fb_gpio_setup_24bpp() - Common GPIO setup function for LCD
+ *
+ * Initialise the GPIO for a LCD display on the RGB interface.
+ */
+extern void s5p64x0_fb_gpio_setup_24bpp(void);
+
#endif /* __PLAT_S3C_FB_H */
--
1.7.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 4/6] ARM: S5P64X0: Add GPIO and SPCON settings for LCD
2011-07-14 13:27 ` [PATCH 4/6] ARM: S5P64X0: Add GPIO and SPCON settings for LCD Ajay Kumar
@ 2011-07-21 1:21 ` Kukjin Kim
0 siblings, 0 replies; 14+ messages in thread
From: Kukjin Kim @ 2011-07-21 1:21 UTC (permalink / raw)
To: linux-arm-kernel
Ajay Kumar wrote:
>
> This patch adds:
> o GPIO lines settings(HSYNC, VSYNC, VCLK and VD) for LCD.
> o Function to select type of LCD interface (RGB/i80)
>
> Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
> ---
> arch/arm/mach-s5p64x0/Kconfig | 6 +++
> arch/arm/mach-s5p64x0/Makefile | 1 +
> arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 4 ++
> arch/arm/mach-s5p64x0/setup-fb.c | 48
> ++++++++++++++++++++++++
> arch/arm/plat-samsung/include/plat/fb.h | 14 +++++++
> 5 files changed, 73 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/mach-s5p64x0/setup-fb.c
>
> diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig
> index 017af4c..2ca5ac0 100644
> --- a/arch/arm/mach-s5p64x0/Kconfig
> +++ b/arch/arm/mach-s5p64x0/Kconfig
> @@ -21,6 +21,12 @@ config CPU_S5P6450
> help
> Enable S5P6450 CPU support
>
> +config S5P64X0_SETUP_FB
> + bool
> + help
> + Common setup code for S5P64X0 based boards with a LCD display
> + through RGB interface.
> +
> config S5P64X0_SETUP_I2C1
> bool
> help
> diff --git a/arch/arm/mach-s5p64x0/Makefile
b/arch/arm/mach-s5p64x0/Makefile
> index ae6bf6f..43698c6 100644
> --- a/arch/arm/mach-s5p64x0/Makefile
> +++ b/arch/arm/mach-s5p64x0/Makefile
> @@ -28,3 +28,4 @@ obj-y += dev-audio.o
> obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
>
> obj-$(CONFIG_S5P64X0_SETUP_I2C1) += setup-i2c1.o
> +obj-$(CONFIG_S5P64X0_SETUP_FB) += setup-fb.o
> diff --git a/arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
b/arch/arm/mach-
> s5p64x0/include/mach/regs-gpio.h
> index 0953ef6..2f07cbd 100644
> --- a/arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
> +++ b/arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
> @@ -34,4 +34,8 @@
> #define S5P6450_GPQ_BASE (S5P_VA_GPIO + 0x0180)
> #define S5P6450_GPS_BASE (S5P_VA_GPIO + 0x0300)
>
> +#define S5P64X0_SPCON0 (S5P_VA_GPIO + 0x1A0)
> +#define S5P64X0_SPCON0_LCD_SEL_MASK (0x3 << 0)
> +#define S5P64X0_SPCON0_LCD_SEL_RGB (0x1 << 0)
> +
> #endif /* __ASM_ARCH_REGS_GPIO_H */
> diff --git a/arch/arm/mach-s5p64x0/setup-fb.c
b/arch/arm/mach-s5p64x0/setup-fb.c
> new file mode 100644
> index 0000000..3e8ffad
> --- /dev/null
> +++ b/arch/arm/mach-s5p64x0/setup-fb.c
> @@ -0,0 +1,48 @@
> +/* linux/arch/arm/mach-s5p64x0/setup-fb.c
> + *
> + * Copyright (c) 2011 Samsung Electronics Co., Ltd.
> + * http://www.samsung.com/
> + *
> + * Base S5P64X0 GPIO setup information for LCD framebuffer
> + *
> + * GPIO settings for LCD on any other board based on s5p64x0
> + * should go in this file.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> +*/
> +
> +#include <linux/fb.h>
> +#include <linux/gpio.h>
> +
> +#include <plat/fb.h>
> +#include <plat/gpio-cfg.h>
> +
> +#include <mach/regs-clock.h>
> +#include <mach/regs-gpio.h>
> +
> +void s5p64x0_fb_init(int lcd_interface_type)
> +{
> + unsigned int cfg;
> +
> + /* select TFT LCD type (RGB I/F) */
> + cfg = readl(S5P64X0_SPCON0);
Since no need memory barrier here, just use __raw_readl
> + cfg &= ~S5P64X0_SPCON0_LCD_SEL_MASK;
> + cfg |= lcd_interface_type;
> + writel(cfg, S5P64X0_SPCON0);
__raw_writel
> +}
> +
> +void s5p64x0_fb_gpio_setup_24bpp(void)
> +{
> + unsigned int cfg;
> +
> + cfg = readl(S5P64X0_SYS_ID) & 0xf0000;
> + if (cfg == 0x40000) {
> + s3c_gpio_cfgrange_nopull(S5P6440_GPI(0), 16,
> S3C_GPIO_SFN(2));
> + s3c_gpio_cfgrange_nopull(S5P6440_GPJ(0), 12,
> S3C_GPIO_SFN(2));
> + } else if (cfg == 0x50000) {
> + s3c_gpio_cfgrange_nopull(S5P6450_GPI(0), 16,
> S3C_GPIO_SFN(2));
> + s3c_gpio_cfgrange_nopull(S5P6450_GPJ(0), 12,
> S3C_GPIO_SFN(2));
> + }
Following is more make sense ?
+ unsigned int chipid;
+
+ chipid = __raw_readl(S5P64X0_SYS_ID) & 0xff000;
+ if (chipd == 0x50000) {
+ s3c_gpio_cfgrange_nopull(S5P6450_GPI(0), 16,
S3C_GPIO_SFN(2));
+ s3c_gpio_cfgrange_nopull(S5P6450_GPJ(0), 12,
S3C_GPIO_SFN(2));
+ } else {
+ s3c_gpio_cfgrange_nopull(S5P6440_GPI(0), 16,
S3C_GPIO_SFN(2));
+ s3c_gpio_cfgrange_nopull(S5P6440_GPJ(0), 12,
S3C_GPIO_SFN(2));
+ }
> +}
> diff --git a/arch/arm/plat-samsung/include/plat/fb.h b/arch/arm/plat-
> samsung/include/plat/fb.h
> index cb3ca3a..8147c59 100644
> --- a/arch/arm/plat-samsung/include/plat/fb.h
> +++ b/arch/arm/plat-samsung/include/plat/fb.h
> @@ -94,4 +94,18 @@ extern void s5pc100_fb_gpio_setup_24bpp(void);
> */
> extern void s5pv210_fb_gpio_setup_24bpp(void);
>
> +/**
> + * s5p64x0_fb_init() - Common setup function for LCD
> + *
> + * Select LCD I/F configuration-RGB style or i80 style
> + */
> +extern void s5p64x0_fb_init(int lcd_interface_type);
> +
> +/**
> + * s5p64x0_fb_gpio_setup_24bpp() - Common GPIO setup function for LCD
> + *
> + * Initialise the GPIO for a LCD display on the RGB interface.
> + */
> +extern void s5p64x0_fb_gpio_setup_24bpp(void);
> +
> #endif /* __PLAT_S3C_FB_H */
> --
> 1.7.1
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 5/6] ARM: S5P6440: Add LCD-LTE480 and enable Framebuffer support
2011-07-14 13:27 [PATCH 0/6] ARM: S5P64X0: Add Framebuffer support Ajay Kumar
` (3 preceding siblings ...)
2011-07-14 13:27 ` [PATCH 4/6] ARM: S5P64X0: Add GPIO and SPCON settings for LCD Ajay Kumar
@ 2011-07-14 13:27 ` Ajay Kumar
2011-07-14 13:27 ` [PATCH 6/6] ARM: S5P6450: " Ajay Kumar
2011-07-15 6:12 ` [PATCH 0/6] ARM: S5P64X0: Add " Tushar Behera
6 siblings, 0 replies; 14+ messages in thread
From: Ajay Kumar @ 2011-07-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
This patch:
o Adds platform device support for LCD-LTE480.
o Adds platform data for FB with win_mode and default_bpp.
o Enables FB device support and platform-lcd support.
Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
---
arch/arm/mach-s5p64x0/Kconfig | 2 +
arch/arm/mach-s5p64x0/mach-smdk6440.c | 63 +++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig
index 2ca5ac0..c69a32d 100644
--- a/arch/arm/mach-s5p64x0/Kconfig
+++ b/arch/arm/mach-s5p64x0/Kconfig
@@ -37,6 +37,7 @@ config S5P64X0_SETUP_I2C1
config MACH_SMDK6440
bool "SMDK6440"
select CPU_S5P6440
+ select S3C_DEV_FB
select S3C_DEV_I2C1
select S3C_DEV_RTC
select S3C_DEV_WDT
@@ -44,6 +45,7 @@ config MACH_SMDK6440
select SAMSUNG_DEV_ADC
select SAMSUNG_DEV_PWM
select SAMSUNG_DEV_TS
+ select S5P64X0_SETUP_FB
select S5P64X0_SETUP_I2C1
help
Machine support for the Samsung SMDK6440
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c
index 2d559f1..a1f6f1e 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6440.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c
@@ -23,6 +23,7 @@
#include <linux/clk.h>
#include <linux/gpio.h>
#include <linux/pwm_backlight.h>
+#include <linux/fb.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@ -34,6 +35,7 @@
#include <mach/regs-clock.h>
#include <mach/i2c.h>
#include <mach/regs-gpio.h>
+#include <mach/regs-fb.h>
#include <plat/regs-serial.h>
#include <plat/gpio-cfg.h>
@@ -46,6 +48,9 @@
#include <plat/adc.h>
#include <plat/ts.h>
#include <plat/s5p-time.h>
+#include <plat/fb.h>
+
+#include <video/platform_lcd.h>
#define SMDK6440_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \
S3C2410_UCON_RXILEVEL | \
@@ -130,6 +135,60 @@ static struct platform_device smdk6440_backlight_device = {
},
};
+/* Frame Buffer */
+static struct s3c_fb_pd_win s5p6440_fb_win0 = {
+/* this is to ensure we use win0 */
+ .win_mode = {
+ .left_margin = 8,
+ .right_margin = 13,
+ .upper_margin = 7,
+ .lower_margin = 5,
+ .hsync_len = 3,
+ .vsync_len = 1,
+ .xres = 800,
+ .yres = 480,
+ .refresh = 80,
+ },
+ .max_bpp = 24,
+ .default_bpp = 24,
+};
+
+static struct s3c_fb_platdata s5p6440_lcd_pdata __initdata = {
+ .win[0] = &s5p6440_fb_win0,
+ .vidcon0 = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
+ .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
+ .setup_gpio = s5p64x0_fb_gpio_setup_24bpp,
+};
+
+/* LCD power controller */
+static void s5p6440_lte480_reset_power(struct plat_lcd_data *pd,
+ unsigned int power)
+{
+ int err;
+
+ if (power) {
+ err = gpio_request(S5P6440_GPN(5), "GPN");
+ if (err)
+ printk(KERN_ERR "failed to request GPN for lcd reset\n");
+
+ gpio_direction_output(S5P6440_GPN(5), 1);
+ gpio_set_value(S5P6440_GPN(5), 0);
+ gpio_set_value(S5P6440_GPN(5), 1);
+ gpio_free(S5P6440_GPN(5));
+ }
+}
+
+static struct plat_lcd_data s5p6440_lcd_power_data = {
+ .set_power = s5p6440_lte480_reset_power,
+};
+
+static struct platform_device smdk6440_lcd_lte480wv = {
+ .name = "platform-lcd",
+ .dev.parent = &s3c_device_fb.dev,
+ .dev.platform_data = &s5p6440_lcd_power_data,
+};
+
+
static struct platform_device *smdk6440_devices[] __initdata = {
&s3c_device_adc,
&s3c_device_rtc,
@@ -141,6 +200,8 @@ static struct platform_device *smdk6440_devices[] __initdata = {
&s5p6440_device_iis,
&s3c_device_timer[1],
&smdk6440_backlight_device,
+ &s3c_device_fb,
+ &smdk6440_lcd_lte480wv,
};
static struct s3c2410_platform_i2c s5p6440_i2c0_data __initdata = {
@@ -193,6 +254,8 @@ static void __init smdk6440_machine_init(void)
ARRAY_SIZE(smdk6440_i2c_devs0));
i2c_register_board_info(1, smdk6440_i2c_devs1,
ARRAY_SIZE(smdk6440_i2c_devs1));
+ s3c_fb_set_platdata(&s5p6440_lcd_pdata);
+ s5p64x0_fb_init(S5P64X0_SPCON0_LCD_SEL_RGB);
platform_add_devices(smdk6440_devices, ARRAY_SIZE(smdk6440_devices));
}
--
1.7.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 6/6] ARM: S5P6450: Add LCD-LTE480 and enable Framebuffer support
2011-07-14 13:27 [PATCH 0/6] ARM: S5P64X0: Add Framebuffer support Ajay Kumar
` (4 preceding siblings ...)
2011-07-14 13:27 ` [PATCH 5/6] ARM: S5P6440: Add LCD-LTE480 and enable Framebuffer support Ajay Kumar
@ 2011-07-14 13:27 ` Ajay Kumar
2011-07-15 6:12 ` [PATCH 0/6] ARM: S5P64X0: Add " Tushar Behera
6 siblings, 0 replies; 14+ messages in thread
From: Ajay Kumar @ 2011-07-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
This patch:
o Adds platform device support for LCD-LTE480.
o Adds platform data for FB with win_mode and default_bpp.
o Enables FB device support and platform-lcd support.
Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
---
arch/arm/mach-s5p64x0/Kconfig | 2 +
arch/arm/mach-s5p64x0/mach-smdk6450.c | 63 +++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig
index c69a32d..b9f3aca 100644
--- a/arch/arm/mach-s5p64x0/Kconfig
+++ b/arch/arm/mach-s5p64x0/Kconfig
@@ -53,6 +53,7 @@ config MACH_SMDK6440
config MACH_SMDK6450
bool "SMDK6450"
select CPU_S5P6450
+ select S3C_DEV_FB
select S3C_DEV_I2C1
select S3C_DEV_RTC
select S3C_DEV_WDT
@@ -60,6 +61,7 @@ config MACH_SMDK6450
select SAMSUNG_DEV_ADC
select SAMSUNG_DEV_PWM
select SAMSUNG_DEV_TS
+ select S5P64X0_SETUP_FB
select S5P64X0_SETUP_I2C1
help
Machine support for the Samsung SMDK6450
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c
index d19c469..7568f38 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c
@@ -23,6 +23,7 @@
#include <linux/clk.h>
#include <linux/gpio.h>
#include <linux/pwm_backlight.h>
+#include <linux/fb.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@ -34,6 +35,7 @@
#include <mach/regs-clock.h>
#include <mach/i2c.h>
#include <mach/regs-gpio.h>
+#include <mach/regs-fb.h>
#include <plat/regs-serial.h>
#include <plat/gpio-cfg.h>
@@ -46,6 +48,9 @@
#include <plat/adc.h>
#include <plat/ts.h>
#include <plat/s5p-time.h>
+#include <plat/fb.h>
+
+#include <video/platform_lcd.h>
#define SMDK6450_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \
S3C2410_UCON_RXILEVEL | \
@@ -148,6 +153,59 @@ static struct platform_device smdk6450_backlight_device = {
},
};
+/* Frame Buffer */
+static struct s3c_fb_pd_win s5p6450_fb_win0 = {
+/* this is to ensure we use win0 */
+ .win_mode = {
+ .left_margin = 8,
+ .right_margin = 13,
+ .upper_margin = 7,
+ .lower_margin = 5,
+ .hsync_len = 3,
+ .vsync_len = 1,
+ .xres = 800,
+ .yres = 480,
+ .refresh = 80,
+ },
+ .max_bpp = 24,
+ .default_bpp = 24,
+ };
+
+static struct s3c_fb_platdata s5p6450_lcd_pdata __initdata = {
+ .win[0] = &s5p6450_fb_win0,
+ .vidcon0 = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
+ .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
+ .setup_gpio = s5p64x0_fb_gpio_setup_24bpp,
+};
+
+/* LCD power controller */
+static void s5p6450_lte480_reset_power(struct plat_lcd_data *pd,
+ unsigned int power)
+{
+ int err;
+
+ if (power) {
+ err = gpio_request(S5P6450_GPN(5), "GPN");
+ if (err)
+ printk(KERN_ERR "failed to request GPN for lcd reset\n");
+
+ gpio_direction_output(S5P6450_GPN(5), 1);
+ gpio_set_value(S5P6450_GPN(5), 0);
+ gpio_set_value(S5P6450_GPN(5), 1);
+ gpio_free(S5P6450_GPN(5));
+ }
+}
+
+static struct plat_lcd_data s5p6450_lcd_power_data = {
+ .set_power = s5p6450_lte480_reset_power,
+};
+
+static struct platform_device smdk6450_lcd_lte480wv = {
+ .name = "platform-lcd",
+ .dev.parent = &s3c_device_fb.dev,
+ .dev.platform_data = &s5p6450_lcd_power_data,
+};
+
static struct platform_device *smdk6450_devices[] __initdata = {
&s3c_device_adc,
&s3c_device_rtc,
@@ -159,6 +217,9 @@ static struct platform_device *smdk6450_devices[] __initdata = {
&s5p6450_device_iis0,
&s3c_device_timer[1],
&smdk6450_backlight_device,
+ &s3c_device_fb,
+ &smdk6450_lcd_lte480wv,
+
/* s5p6450_device_spi0 will be added */
};
@@ -212,6 +273,8 @@ static void __init smdk6450_machine_init(void)
ARRAY_SIZE(smdk6450_i2c_devs0));
i2c_register_board_info(1, smdk6450_i2c_devs1,
ARRAY_SIZE(smdk6450_i2c_devs1));
+ s3c_fb_set_platdata(&s5p6450_lcd_pdata);
+ s5p64x0_fb_init(S5P64X0_SPCON0_LCD_SEL_RGB);
platform_add_devices(smdk6450_devices, ARRAY_SIZE(smdk6450_devices));
}
--
1.7.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 0/6] ARM: S5P64X0: Add Framebuffer support
2011-07-14 13:27 [PATCH 0/6] ARM: S5P64X0: Add Framebuffer support Ajay Kumar
` (5 preceding siblings ...)
2011-07-14 13:27 ` [PATCH 6/6] ARM: S5P6450: " Ajay Kumar
@ 2011-07-15 6:12 ` Tushar Behera
2011-07-15 6:27 ` Ajay kumar
6 siblings, 1 reply; 14+ messages in thread
From: Tushar Behera @ 2011-07-15 6:12 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 14 July 2011 06:57 PM, Ajay Kumar wrote:
> The patches are created against "for-next" branch of Kukjin Kim's tree at:
> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
>
> Patch [1/6]
> -- add "s5p64x0-fb" type driver_data(s3c_fb_driverdata).
> -- Display controller in S5P64X0 supports 3 windows.
>
> Patch [2/6]
> -- Resource definitions(_MEM, _IRQ).
>
> Patch [3/6]
> -- Set s3c_device_fb name as "s5p64x0-fb"
> for S5P6440 and S5P6450.
>
> Patch [4/6]
> -- GPIO settings for LCD in S5P6440 and S5P6450.
> -- Select LCD interface type (RGB/i80)
>
> Patch [5/6]
> -- Add support for LCD-LTE480 platform device in SMDK6440.
> -- Platform data for FB and a basic window definition.
> -- Enables FB support and platform-lcd support.
> -- Add support for window 0 with 24 BPP.
>
> Patch [6/6]
> -- Add support for LCD-LTE480 platform device in SMDK6450.
> -- Platform data for FB and a basic window definition.
> -- Enables FB support and platform-lcd support.
> -- Add support for window 0 with 24 BPP.
>
Some of the patches have got some coding syntax (DOS LINE ending etc.).
Consider running scripts/checkpatch.pl on the patches before sending the
next version.
scripts/cleanpatch can help you in fixing many of the style problems.
> o To Paul Mundt, Jingoo Han
> [Patch 1/6] video: s3c-fb: Add S5P64X0 specific s3c_fb_driverdata
>
> o To Kukjin Kim
> [Patch 2/6] ARM: S5P64X0: Add register base and IRQ for Framebuffer
> [Patch 3/6] ARM: S5P64X0: Set s3c_device_fb name
> [Patch 4/6] ARM: S5P64X0: Add GPIO and SPCON settings for LCD
> [Patch 5/6] ARM: S5P6440: Add LCD-LTE480 and enable Framebuffer support
> [Patch 6/6] ARM: S5P6450: Add LCD-LTE480 and enable Framebuffer support
>
>
> arch/arm/mach-s5p64x0/Kconfig | 10 ++++
> arch/arm/mach-s5p64x0/Makefile | 1 +
> arch/arm/mach-s5p64x0/cpu.c | 3 +
> arch/arm/mach-s5p64x0/include/mach/irqs.h | 4 ++
> arch/arm/mach-s5p64x0/include/mach/map.h | 3 +
> arch/arm/mach-s5p64x0/include/mach/regs-fb.h | 19 +++++++
> arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 4 ++
> arch/arm/mach-s5p64x0/mach-smdk6440.c | 63 +++++++++++++++++++++++
> arch/arm/mach-s5p64x0/mach-smdk6450.c | 63 +++++++++++++++++++++++
> arch/arm/mach-s5p64x0/setup-fb.c | 48 ++++++++++++++++++
> arch/arm/plat-samsung/include/plat/fb.h | 14 +++++
> drivers/video/s3c-fb.c | 64 ++++++++++++++++++++++++
> 12 files changed, 296 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-fb.h
> create mode 100644 arch/arm/mach-s5p64x0/setup-fb.c
>
> --
> 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
--
Tushar Behera
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 0/6] ARM: S5P64X0: Add Framebuffer support
2011-07-15 6:12 ` [PATCH 0/6] ARM: S5P64X0: Add " Tushar Behera
@ 2011-07-15 6:27 ` Ajay kumar
2011-07-15 10:05 ` Tushar Behera
0 siblings, 1 reply; 14+ messages in thread
From: Ajay kumar @ 2011-07-15 6:27 UTC (permalink / raw)
To: linux-arm-kernel
Hi Tushar,
On Fri, Jul 15, 2011 at 11:42 AM, Tushar Behera
<tushar.behera@linaro.org> wrote:
> On Thursday 14 July 2011 06:57 PM, Ajay Kumar wrote:
>>
>> ? ? ? ?The patches are created against "for-next" branch of Kukjin Kim's
>> tree at:
>>
>> ?git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
>>
>> ? ? ? ?Patch [1/6]
>> ? ? ? ?-- add "s5p64x0-fb" type driver_data(s3c_fb_driverdata).
>> ? ? ? ?-- Display controller in S5P64X0 supports 3 windows.
>>
>> ? ? ? ?Patch [2/6]
>> ? ? ? ?-- Resource definitions(_MEM, _IRQ).
>>
>> ? ? ? ?Patch [3/6]
>> ? ? ? ?-- Set s3c_device_fb name as "s5p64x0-fb"
>> ? ? ? ? ? for S5P6440 and S5P6450.
>>
>> ? ? ? ?Patch [4/6]
>> ? ? ? ?-- GPIO settings for LCD in S5P6440 and S5P6450.
>> ? ? ? ?-- Select LCD interface type (RGB/i80)
>>
>> ? ? ? ?Patch [5/6]
>> ? ? ? ?-- Add support for LCD-LTE480 platform device in SMDK6440.
>> ? ? ? ?-- Platform data for FB and a basic window definition.
>> ? ? ? ?-- Enables FB support and platform-lcd support.
>> ? ? ? ?-- Add support for window 0 with 24 BPP.
>>
>> ? ? ? ?Patch [6/6]
>> ? ? ? ?-- Add support for LCD-LTE480 platform device in SMDK6450.
>> ? ? ? ?-- Platform data for FB and a basic window definition.
>> ? ? ? ?-- Enables FB support and platform-lcd support.
>> ? ? ? ?-- Add support for window 0 with 24 BPP.
>>
> Some of the patches have got some coding syntax (DOS LINE ending etc.).
> Consider running scripts/checkpatch.pl on the patches before sending the
> next version.
>
> scripts/cleanpatch can help you in fixing many of the style problems.
>
I have tried running checkpatch.pl on patches 1 to 6,
and I did not encounter any error like DOS_LINE as you have mentioned.
Can you please tell me which patch is showing that error when run with
checkpatch.pl?
>> ?o To Paul Mundt, Jingoo Han
>> ? ?[Patch 1/6] video: s3c-fb: Add S5P64X0 specific s3c_fb_driverdata
>>
>> ?o To Kukjin Kim
>> ? ?[Patch 2/6] ARM: S5P64X0: Add register base and IRQ for Framebuffer
>> ? ?[Patch 3/6] ARM: S5P64X0: Set s3c_device_fb name
>> ? ?[Patch 4/6] ARM: S5P64X0: Add GPIO and SPCON settings for LCD
>> ? ?[Patch 5/6] ARM: S5P6440: Add LCD-LTE480 and enable Framebuffer support
>> ? ?[Patch 6/6] ARM: S5P6450: Add LCD-LTE480 and enable Framebuffer support
>>
>>
>> ?arch/arm/mach-s5p64x0/Kconfig ? ? ? ? ? ? ? ? ?| ? 10 ++++
>> ?arch/arm/mach-s5p64x0/Makefile ? ? ? ? ? ? ? ? | ? ?1 +
>> ?arch/arm/mach-s5p64x0/cpu.c ? ? ? ? ? ? ? ? ? ?| ? ?3 +
>> ?arch/arm/mach-s5p64x0/include/mach/irqs.h ? ? ?| ? ?4 ++
>> ?arch/arm/mach-s5p64x0/include/mach/map.h ? ? ? | ? ?3 +
>> ?arch/arm/mach-s5p64x0/include/mach/regs-fb.h ? | ? 19 +++++++
>> ?arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | ? ?4 ++
>> ?arch/arm/mach-s5p64x0/mach-smdk6440.c ? ? ? ? ?| ? 63
>> +++++++++++++++++++++++
>> ?arch/arm/mach-s5p64x0/mach-smdk6450.c ? ? ? ? ?| ? 63
>> +++++++++++++++++++++++
>> ?arch/arm/mach-s5p64x0/setup-fb.c ? ? ? ? ? ? ? | ? 48 ++++++++++++++++++
>> ?arch/arm/plat-samsung/include/plat/fb.h ? ? ? ?| ? 14 +++++
>> ?drivers/video/s3c-fb.c ? ? ? ? ? ? ? ? ? ? ? ? | ? 64
>> ++++++++++++++++++++++++
>> ?12 files changed, 296 insertions(+), 0 deletions(-)
>> ?create mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-fb.h
>> ?create mode 100644 arch/arm/mach-s5p64x0/setup-fb.c
>>
>> --
>> 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
>
>
> --
> Tushar Behera
> --
> 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
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 0/6] ARM: S5P64X0: Add Framebuffer support
2011-07-15 6:27 ` Ajay kumar
@ 2011-07-15 10:05 ` Tushar Behera
0 siblings, 0 replies; 14+ messages in thread
From: Tushar Behera @ 2011-07-15 10:05 UTC (permalink / raw)
To: linux-arm-kernel
On Friday 15 July 2011 11:57 AM, Ajay kumar wrote:
> Hi Tushar,
>
> On Fri, Jul 15, 2011 at 11:42 AM, Tushar Behera
> <tushar.behera@linaro.org> wrote:
>> On Thursday 14 July 2011 06:57 PM, Ajay Kumar wrote:
>>>
>>> The patches are created against "for-next" branch of Kukjin Kim's
>>> tree at:
>>>
>>> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
>>>
>>> Patch [1/6]
>>> -- add "s5p64x0-fb" type driver_data(s3c_fb_driverdata).
>>> -- Display controller in S5P64X0 supports 3 windows.
>>>
>>> Patch [2/6]
>>> -- Resource definitions(_MEM, _IRQ).
>>>
>>> Patch [3/6]
>>> -- Set s3c_device_fb name as "s5p64x0-fb"
>>> for S5P6440 and S5P6450.
>>>
>>> Patch [4/6]
>>> -- GPIO settings for LCD in S5P6440 and S5P6450.
>>> -- Select LCD interface type (RGB/i80)
>>>
>>> Patch [5/6]
>>> -- Add support for LCD-LTE480 platform device in SMDK6440.
>>> -- Platform data for FB and a basic window definition.
>>> -- Enables FB support and platform-lcd support.
>>> -- Add support for window 0 with 24 BPP.
>>>
>>> Patch [6/6]
>>> -- Add support for LCD-LTE480 platform device in SMDK6450.
>>> -- Platform data for FB and a basic window definition.
>>> -- Enables FB support and platform-lcd support.
>>> -- Add support for window 0 with 24 BPP.
>>>
>> Some of the patches have got some coding syntax (DOS LINE ending etc.).
>> Consider running scripts/checkpatch.pl on the patches before sending the
>> next version.
>>
>> scripts/cleanpatch can help you in fixing many of the style problems.
>>
>
> I have tried running checkpatch.pl on patches 1 to 6,
> and I did not encounter any error like DOS_LINE as you have mentioned.
> Can you please tell me which patch is showing that error when run with
> checkpatch.pl?
>
Yes you are right.
I used Thunderbird mail client to download the patches and some thing is
wrong with its settings.
>>> o To Paul Mundt, Jingoo Han
>>> [Patch 1/6] video: s3c-fb: Add S5P64X0 specific s3c_fb_driverdata
>>>
>>> o To Kukjin Kim
>>> [Patch 2/6] ARM: S5P64X0: Add register base and IRQ for Framebuffer
>>> [Patch 3/6] ARM: S5P64X0: Set s3c_device_fb name
>>> [Patch 4/6] ARM: S5P64X0: Add GPIO and SPCON settings for LCD
>>> [Patch 5/6] ARM: S5P6440: Add LCD-LTE480 and enable Framebuffer support
>>> [Patch 6/6] ARM: S5P6450: Add LCD-LTE480 and enable Framebuffer support
>>>
>>>
>>> arch/arm/mach-s5p64x0/Kconfig | 10 ++++
>>> arch/arm/mach-s5p64x0/Makefile | 1 +
>>> arch/arm/mach-s5p64x0/cpu.c | 3 +
>>> arch/arm/mach-s5p64x0/include/mach/irqs.h | 4 ++
>>> arch/arm/mach-s5p64x0/include/mach/map.h | 3 +
>>> arch/arm/mach-s5p64x0/include/mach/regs-fb.h | 19 +++++++
>>> arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 4 ++
>>> arch/arm/mach-s5p64x0/mach-smdk6440.c | 63
>>> +++++++++++++++++++++++
>>> arch/arm/mach-s5p64x0/mach-smdk6450.c | 63
>>> +++++++++++++++++++++++
>>> arch/arm/mach-s5p64x0/setup-fb.c | 48 ++++++++++++++++++
>>> arch/arm/plat-samsung/include/plat/fb.h | 14 +++++
>>> drivers/video/s3c-fb.c | 64
>>> ++++++++++++++++++++++++
>>> 12 files changed, 296 insertions(+), 0 deletions(-)
>>> create mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-fb.h
>>> create mode 100644 arch/arm/mach-s5p64x0/setup-fb.c
>>>
>>> --
>>> 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
>>
>>
>> --
>> Tushar Behera
>> --
>> 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
>>
--
Tushar Behera
^ permalink raw reply [flat|nested] 14+ messages in thread