Re: [PATCH V4 RESEND 1/6] video: s3c-fb: Add S5P64X0 specific s3c_fb_driverdata

2011-09-14 Thread Florian Tobias Schandinat
On 09/09/2011 06:00 PM, Ajay Kumar wrote:
> This patch:
>   -- Adds s3c_fb_driverdata for S5P64X0, which supports 3 windows.
>   -- Also, register "s5p64x0-fb" type driver_data.
> 
> Signed-off-by: Ajay Kumar 
> Acked-by: Jingoo Han 
> Acked-by: Kukjin Kim 

Applied.


Thanks,

Florian Tobias Schandinat

> ---
>  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,
>   },
>   {},
>  };

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


[PATCH V4 RESEND 1/6] video: s3c-fb: Add S5P64X0 specific s3c_fb_driverdata

2011-09-09 Thread Ajay Kumar
This patch:
-- Adds s3c_fb_driverdata for S5P64X0, which supports 3 windows.
-- Also, register "s5p64x0-fb" type driver_data.

Signed-off-by: Ajay Kumar 
Acked-by: Jingoo Han 
Acked-by: Kukjin Kim 
---
 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.0.4

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


[PATCH V4 RESEND 1/6] video: s3c-fb: Add S5P64X0 specific s3c_fb_driverdata

2011-09-09 Thread Ajay Kumar
This patch:
-- Adds s3c_fb_driverdata for S5P64X0, which supports 3 windows.
-- Also, register "s5p64x0-fb" type driver_data.

Signed-off-by: Ajay Kumar 
Acked-by: Jingoo Han 
Acked-by: Kukjin Kim 
---
 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.0.4

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