ARM: S5PV310: Add support FIMD
Subsystems (4)
cover ARM: S5PV310: Add support FIMD
This patch adds support FIMD(Fully Interactive Mobile Display) on S5PV310 and S5PC210. The 3rd patch is update s3c-fb for it and others are for platform data.
[PATCH 1/4] ARM: S5PV310: Add FIMD resource definition
[PATCH 2/4] ARM: S5PV310: Add platform device and helper functions for FIMD [PATCH 3/4] s3c-fb: Add support S5PV310 FIMD
[PATCH 4/4] ARM: S5PV310: Add platform data for S5PV310 FIMD and LTE480WV platform-lcd
PATCH 1/4 ARM: S5PV310: Add FIMD resource definition
From: Jonghun Han <[email protected]>
This patch adds resource definitions for S5PV310 FIMD. IRQ and SFR definitions are added.
--- arch/arm/mach-s5pv310/include/mach/irqs.h | 8 ++++++++ arch/arm/mach-s5pv310/include/mach/map.h | 5 +++++ 2 files changed, 13 insertions(+), 0 deletions(-)
arch/arm/mach-s5pv310/include/mach/irqs.h +8 -0
@@ -54,6 +54,14 @@#define COMBINER_GROUP (x) ((x) * MAX_IRQ_IN_COMBINER + IRQ_SPI(64))#define COMBINER_IRQ (x, y) (COMBINER_GROUP(x) + y) +#define IRQ_FIMD0_FIFO COMBINER_IRQ(11, 0) +#define IRQ_FIMD0_VSYNC COMBINER_IRQ(11, 1) +#define IRQ_FIMD0_SYSTEM COMBINER_IRQ(11, 2) + +#define IRQ_FIMD1_FIFO COMBINER_IRQ(12, 0) +#define IRQ_FIMD1_VSYNC COMBINER_IRQ(12, 1) +#define IRQ_FIMD1_SYSTEM COMBINER_IRQ(12, 2) +#define IRQ_TIMER0_VIC COMBINER_IRQ(22, 0)#define IRQ_TIMER1_VIC COMBINER_IRQ(22, 1)#define IRQ_TIMER2_VIC COMBINER_IRQ(22, 2)
arch/arm/mach-s5pv310/include/mach/map.h +5 -0
@@ -56,6 +56,9 @@#define S5PV310_PA_GPIO2 (0x11000000)#define S5PV310_PA_GPIO3 (0x03860000) +#define S5PV310_PA_FIMD0 (0x11C00000) +#define S5PV310_PA_FIMD1 (0x12000000) +#define S5PV310_PA_HSMMC (x) (0x12510000 + ((x) * 0x10000))#define S5PV310_PA_UART (0x13800000)
@@ -78,6 +81,8 @@#define S5P_PA_SDRAM S5PV310_PA_SDRAM/* compatibiltiy defines. */ +#define S5P_PA_FIMD0 S5PV310_PA_FIMD0 +#define S5P_PA_FIMD1 S5PV310_PA_FIMD1#define S3C_PA_UART S5PV310_PA_UART#define S3C_PA_HSMMC0 S5PV310_PA_HSMMC(0)#define S3C_PA_HSMMC1 S5PV310_PA_HSMMC(1)
Signature · 1 line
1.6.2.5
PATCH 2/4 ARM: S5PV310: Add platform device and helper functions for FIMD
In reply to Sangbeom KimFrom: Jonghun Han <[email protected]>
This patch adds platform device s5p_device_fimd0 for S5PV310 FIMD0. S5PV310 has two FIMDs(FIMD0, FIMD1). FIMD1 will be added later. Some definitions used to enable S5PV310 FIMD0 are added.
--- arch/arm/mach-s5pv310/Kconfig | 7 +++ arch/arm/mach-s5pv310/Makefile | 1 + arch/arm/mach-s5pv310/cpu.c | 3 + arch/arm/mach-s5pv310/include/mach/regs-fb.h | 21 ++++++++ arch/arm/mach-s5pv310/setup-fimd0-24bpp.c | 47 ++++++++++++++++++ arch/arm/plat-s5p/Kconfig | 5 ++ arch/arm/plat-s5p/Makefile | 1 + arch/arm/plat-s5p/dev-fimd0.c | 67 ++++++++++++++++++++++++++ arch/arm/plat-samsung/include/plat/devs.h | 1 + arch/arm/plat-samsung/include/plat/fb-core.h | 15 ++++++ 10 files changed, 168 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-fb.h create mode 100644 arch/arm/mach-s5pv310/setup-fimd0-24bpp.c create mode 100644 arch/arm/plat-s5p/dev-fimd0.c
arch/arm/mach-s5pv310/Kconfig +7 -0
@@ -14,6 +14,11 @@ config CPU_S5PV310 help Enable S5PV310 CPU support +config S5PV310_SETUP_FIMD0_24BPP + bool + help + Common setup code for FIMD0 with an 24bpp RGB display helper. + config S5PV310_SETUP_I2C1 bool help
@@ -95,12 +100,14 @@ menu "S5PV310 Machines" config MACH_SMDKV310 bool "SMDKV310" select CPU_S5PV310 + select S5P_DEV_FIMD0 select S3C_DEV_RTC select S3C_DEV_WDT select S3C_DEV_HSMMC select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC3 + select S5PV310_SETUP_FIMD0_24BPP select S5PV310_SETUP_SDHCI help Machine support for Samsung SMDKV310
arch/arm/mach-s5pv310/Makefile +1 -0
@@ -28,6 +28,7 @@ obj-$(CONFIG_MACH_UNIVERSAL_C210) += mach-universal_c210.o # device support +obj-$(CONFIG_S5PV310_SETUP_FIMD0_24BPP) += setup-fimd0-24bpp.o obj-$(CONFIG_S5PV310_SETUP_I2C1) += setup-i2c1.o obj-$(CONFIG_S5PV310_SETUP_I2C2) += setup-i2c2.o obj-$(CONFIG_S5PV310_SETUP_I2C3) += setup-i2c3.o
arch/arm/mach-s5pv310/cpu.c +3 -0
@@ -18,6 +18,8 @@#include <plat/cpu.h> #include <plat/clock.h> +#include <plat/devs.h> +#include <plat/fb-core.h> #include <plat/s5pv310.h> #include <plat/sdhci.h>
@@ -105,6 +107,7 @@ void __init s5pv310_map_io(void)s5pv310_default_sdhci1 ();s5pv310_default_sdhci2 ();s5pv310_default_sdhci3 (); +s5p_fb_setname (0 ,"s5pv310-fb" );/* FIMD0 */ }void __init s5pv310_init_clocks (int xtal)
arch/arm/mach-s5pv310/include/mach/regs-fb.h new file +21 -0
@@ -0,0 +1,21 @@ +/* +* Copyright 2010 Ben Dooks <[email protected]> +* +* Dummy framebuffer to allow build for the moment. +* +* 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-v4.h> + +static inline unsigned int s3c_fb_pal_reg (unsigned int window,int reg) +{ +return 0x2400 + (window *256 *4 ) + reg; +} + +#endif /* __ASM_ARCH_MACH_REGS_FB_H */
arch/arm/mach-s5pv310/setup-fimd0-24bpp.c new file +47 -0
47 lines not on this page · raw message
arch/arm/plat-s5p/Kconfig +5 -0
@@ -52,6 +52,11 @@ config S5P_DEV_FIMC2 help Compile in platform device definitions for FIMC controller 2 +config S5P_DEV_FIMD0 + bool + help + Compile in platform device definitions for FIMD controller 0 + config S5P_DEV_ONENAND bool help
arch/arm/plat-s5p/Makefile +1 -0
@@ -27,4 +27,5 @@ obj-$(CONFIG_PM) += irq-pm.o obj-$(CONFIG_S5P_DEV_FIMC0) += dev-fimc0.o obj-$(CONFIG_S5P_DEV_FIMC1) += dev-fimc1.o obj-$(CONFIG_S5P_DEV_FIMC2) += dev-fimc2.o +obj-$(CONFIG_S5P_DEV_FIMD0) += dev-fimd0.o obj-$(CONFIG_S5P_DEV_ONENAND) += dev-onenand.o
arch/arm/plat-s5p/dev-fimd0.c new file +67 -0
67 lines not on this page · raw message
arch/arm/plat-samsung/include/plat/devs.h +1 -0
@@ -40,6 +40,7 @@ extern struct platform_device s3c64xx_device_ac97;extern struct platform_device s3c_device_ts;extern struct platform_device s3c_device_fb; +extern struct platform_device s5p_device_fimd0;extern struct platform_device s3c_device_ohci;extern struct platform_device s3c_device_lcd;extern struct platform_device s3c_device_wdt;
arch/arm/plat-samsung/include/plat/fb-core.h +15 -0
@@ -26,4 +26,19 @@ static inline void s3c_fb_setname(char *name) #endif } +/* Re-define device name depending on support. */ +static inline void s5p_fb_setname (int id,char *name) +{ +switch (id) { +#ifdef CONFIG_S5P_DEV_FIMD0 +case 0 : + s5p_device_fimd0.name = name; +break ; +#endif +default : +printk (KERN_ERR "%s: invalid device id(%d)\n" , __func__, id); +break ; + } +} +#endif /* __ASM_PLAT_FB_CORE_H */
Signature · 1 line
1.6.2.5
PATCH 3/4 s3c-fb: Add support S5PV310 FIMD
In reply to Sangbeom KimFrom: Jonghun Han <[email protected]>
This patch adds s3c_fb_driverdata for S5PV310 FIMD0. The clk_type is added to distinguish clock type in structure s3c_fb_variant and lcd_clk is added in structure s3c_fb to calculate divider for lcd panel.
FIMD can handles two clocks. The one is for FIMD IP and the other is for LCD pixel clock. Before S5PV310 LCD pixel clock can be same with FIMD IP clock. From S5PV310 LCD pixel clock is separated from FIMD IP clock.
---
NOTE: This patch is only for FIMD0.
FIMD1 will be implemented later.
drivers/video/Kconfig | 2 +- drivers/video/s3c-fb.c | 128 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 114 insertions(+), 16 deletions(-)
drivers/video/Kconfig +1 -1
@@ -1946,7 +1946,7 @@ config FB_TMIO_ACCELL config FB_S3C tristate "Samsung S3C framebuffer support" - depends on FB && S3C_DEV_FB + depends on FB && (S3C_DEV_FB || S5P_DEV_FIMD0) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
drivers/video/s3c-fb.c +113 -15
221 lines not on this page · raw message
Signature · 1 line
1.6.2.5
PATCH 3/4 s3c-fb: Add support S5PV310 FIMD
1AFAAVgAzADEAMAAgAEY
ASQBNAEQA
x-cr-puzzleid: {C4CCB40E-D5C6-4119-AA7C-BBBA7A1503E4}
Hello,
Quoted 133 lines · Sangbeom Kim
From: Jonghun Han <[email protected]>
This patch adds
s3c_fb_driverdatafor S5PV310 FIMD0. Theclk_typeis added to distinguish clock type in structures3c_fb_variantandlcd_clkis added in structures3c_fbto calculate divider for lcd panel.
FIMD can handles two clocks. The one is for FIMD IP and the other is for LCD pixel clock. Before S5PV310 LCD pixel clock can be same with FIMD IP clock. From S5PV310 LCD pixel clock is separated from FIMD IP clock.Signed-off-by Jonghun Han <[email protected]>Reviewed-by Kukjin Kim <[email protected]>Signed-off-by Sangbeom Kim <[email protected]>Cc Ben Dooks <[email protected]>---
NOTE: This patch is only for FIMD0.
FIMD1 will be implemented later.drivers/video/Kconfig | 2 +- drivers/video/s3c-fb.c | 128 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 114 insertions(+), 16 deletions(-)drivers/video/Kconfig +1
-1@@ -1946,7 +1946,7 @@ config FB_TMIO_ACCELL config FB_S3C tristate "Samsung S3C framebuffer support" - depends on FB && S3C_DEV_FB + depends on FB && (S3C_DEV_FB || S5P_DEV_FIMD0) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLITdrivers/video/s3c-fb.c +35
-6@@ -65,6 +65,9 @@ struct s3c_fb;#define VIDOSD_C (win, variant) (OSD_BASE(win, variant) + 0x08)#define VIDOSD_D (win, variant) (OSD_BASE(win, variant) + 0x0C) +#define FIMD_CLK_TYPE0 0 +#define FIMD_CLK_TYPE1 1 +/** * struct s3c_fb_variant - fb variant information * @is_2443: Set if S3C2443/S3C2416 style hardware. @@ -97,6 +100,7 @@ struct s3c_fb_variant { unsigned int has_prtcon:1; unsigned int has_shadowcon:1; + unsigned int clk_type:1; };/** @@ -183,7 +187,8 @@ struct s3c_fb_vsync {* struct s3c_fb - overall hardware state of the hardware * @dev: The device that we bound to, for printing, etc. * @regs_res: The resource we claimed for the IO registers. -* @bus_clk: The clk (hclk) feeding our interface and possibly pixclk. +* @bus_clk: The clk (hclk) feeding FIMD IP core. +* @lcd_clk: The clk (sclk) feeding our interface and possibly pixclk. * @regs: The mapped hardware registers. * @variant: Variant information for this hardware. * @enabled: A bitmask of enabled hardware windows. @@ -197,6 +202,7 @@ struct s3c_fb {struct device *dev;struct resource *regs_res;struct clk *bus_clk; +struct clk *lcd_clk;void __iomem *regs;struct s3c_fb_variant variant;@@ -334,7 +340,7 @@ static int s3c_fb_check_var(struct fb_var_screeninfo *var,*/ static int s3c_fb_calc_pixclk (struct s3c_fb *sfb,unsigned int pixclk) { -unsigned long clk =clk_get_rate (sfb->bus_clk); +unsigned long clk =clk_get_rate (sfb->lcd_clk);unsigned long long tmp;unsigned int result;@@ -517,7 +523,7 @@ static int s3c_fb_set_par(struct fb_info *info) data =VIDTCON2_LINEVAL (var->yres -1 ) |VIDTCON2_HOZVAL (var->xres -1 ); -writel (data, regs +sfb->variant.vidtcon +8 ); +writel (data, regs + sfb->variant.vidtcon +8 ); }/* write the buffer address */ @@ -1286,8 +1292,10 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)struct s3c_fb_platdata *pd;struct s3c_fb *sfb;struct resource *res; +struct clk *mout_mpll =NULL ;int win;int ret =0 ; +u32 rate =134000000 ; fbdrv = (struct s3c_fb_driverdata *)platform_get_device_id (pdev)->driver_data;@@ -1314,19 +1322,56 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev) sfb->pdata = pd; sfb->variant = fbdrv->variant; - sfb->bus_clk =clk_get (dev,"lcd" ); -if (IS_ERR (sfb->bus_clk)) { -dev_err (dev,"failed to get bus clock\n" ); +switch (sfb->variant.clk_type) { +case FIMD_CLK_TYPE0 : + sfb->bus_clk =clk_get (dev,"lcd" ); +if (IS_ERR (sfb->bus_clk)) { +dev_err (dev,"failed to get bus clock\n" ); + goto err_sfb; + } + +clk_enable (sfb->bus_clk); + + sfb->lcd_clk = sfb->bus_clk; +break ; + +case FIMD_CLK_TYPE1 : + sfb->bus_clk =clk_get (&pdev->dev,"fimd" ); +if (IS_ERR (sfb->bus_clk)) { +dev_err (&pdev->dev,"failed to get clock for fimd\n" ); + goto err_sfb; + } +clk_enable (sfb->bus_clk); + + sfb->lcd_clk =clk_get (&pdev->dev,"sclk_fimd" ); +if (IS_ERR (sfb->lcd_clk)) { +dev_err (&pdev->dev,"failed to get sclk for fimd\n" );
drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct platform_device *pdev) · line 1358
Quoted 10 lines
drivers/video/s3c-fb.c +10
-0+ goto err_bus_clk; + } + + mout_mpll =clk_get (&pdev->dev,"mout_mpll" ); +if (IS_ERR (mout_mpll)) { +dev_err (&pdev->dev,"failed to get mout_mpll\n" ); + goto err_lcd_clk; + } +clk_set_parent (sfb->lcd_clk, mout_mpll); +clk_put (mout_mpll);
I don't think that the driver is the right place to change the parent of the sclk_fimd clock. It should be done in the boot loader or the board startup code.
We should also be a bit more consistent on clock naming. s3c6410..s5pv210 used the 'lcd' clock name. Maybe you should also provide a patch to rename all these clocks to common name.
Quoted 120 lines
drivers/video/s3c-fb.c +65
-9+ +clk_set_rate (sfb->lcd_clk, rate); +clk_enable (sfb->lcd_clk); +dev_dbg (&pdev->dev,"set fimd sclk rate to %d\n" , rate); +break ; + +default : +dev_err (dev,"failed to enable clock for FIMD\n" ); goto err_sfb; } -clk_enable (sfb->bus_clk); - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (!res) {dev_err (dev,"failed to find registers\n" ); ret = -ENOENT ; - goto err_clk; + goto err_lcd_clk; } sfb->regs_res = request_mem_region(res->start, resource_size(res),@@ -1334,7 +1379,7 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)if (!sfb->regs_res) {dev_err (dev,"failed to claim register region\n" ); ret = -ENOENT ; - goto err_clk; + goto err_lcd_clk; } sfb->regs =ioremap (res->start,resource_size (res));@@ -1413,9 +1458,15 @@ err_req_region:release_resource (sfb->regs_res);kfree (sfb->regs_res); -err_clk: -clk_disable (sfb->bus_clk); -clk_put (sfb->bus_clk); +err_lcd_clk: +clk_disable (sfb->lcd_clk); +clk_put (sfb->lcd_clk); + +err_bus_clk: +if (sfb->variant.clk_type !=FIMD_CLK_TYPE0 ) { +clk_disable (sfb->bus_clk); +clk_put (sfb->bus_clk); + } err_sfb:kfree (sfb);@@ -1442,8 +1493,20 @@ static int __devexit s3c_fb_remove(struct platform_device *pdev)iounmap (sfb->regs); -clk_disable (sfb->bus_clk); -clk_put (sfb->bus_clk); +switch (sfb->variant.clk_type) { +case FIMD_CLK_TYPE1 : +clk_disable (sfb->lcd_clk); +clk_put (sfb->lcd_clk); +/* fall through to default case */ +case FIMD_CLK_TYPE0 : +clk_disable (sfb->bus_clk); +clk_put (sfb->bus_clk); +break ; +default : +dev_err (sfb->dev,"invalid clock type(%d)\n" , + sfb->variant.clk_type); +break ; + }release_resource (sfb->regs_res);kfree (sfb->regs_res);@@ -1470,6 +1533,7 @@ static int s3c_fb_suspend(struct platform_device *pdev, pm_message_t state) }clk_disable (sfb->bus_clk); +return 0 ; }@@ -1656,6 +1720,37 @@ static struct s3c_fb_driverdata s3c_fb_data_s5pv210 = { .win[4] = &s3c_fb_data_64xx_wins[4], }; +static struct s3c_fb_driverdata s3c_fb_data_s5pv310 = { + .variant = { + .nr_windows =5 , + .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 , + [3 ] =0x3000 , + [4 ] =0x3400 , + }, + + .has_shadowcon =1 , + .clk_type =FIMD_CLK_TYPE1 , + }, + .win[0 ] = &s3c_fb_data_64xx_wins[0 ], + .win[1 ] = &s3c_fb_data_64xx_wins[1 ], + .win[2 ] = &s3c_fb_data_64xx_wins[2 ], + .win[3 ] = &s3c_fb_data_64xx_wins[3 ], + .win[4 ] = &s3c_fb_data_64xx_wins[4 ], +}; +/* S3C2443/S3C2416 style hardware */ static struct s3c_fb_driverdata s3c_fb_data_s3c2443 = { .variant = {
drivers/video/s3c-fb.c static struct platform_device_id s3c_fb_driver_ids[] = {
Quoted 10 lines
drivers/video/s3c-fb.c +3
-1@@ -1703,6 +1798,9 @@ static struct platform_device_id s3c_fb_driver_ids[] = { .name = "s5pv210-fb", .driver_data = (unsigned long)&s3c_fb_data_s5pv210, }, { + .name = "s5pv310-fb", + .driver_data = (unsigned long)&s3c_fb_data_s5pv310, + }, { .name = "s3c2443-fb", .driver_data = (unsigned long)&s3c_fb_data_s3c2443, }, --
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
PATCH 3/4 s3c-fb: Add support S5PV310 FIMD
1AFAAVgAzADEAMAAgAEY
ASQBNAEQA
x-cr-puzzleid: {B7526269-A73C-412A-8DAE-B8EB603CF9D0}
Hi,
Quoted 40 lines · Marek Szyprowski
-----Original Message-----
From: Marek Szyprowski [mailto:[email protected]]
Sent: Tuesday, October 19, 2010 4:22 PM
To: 'Sangbeom Kim'; [email protected]; linux-samsung- [email protected]; [email protected]
Cc: 'Jonghun Han'; [email protected]; [email protected]; ben- [email protected]; [email protected]
Subject: RE: [PATCH 3/4] s3c-fb: Add support S5PV310 FIMD1AFAAVgAzADEAMAAgAEY
ASQBNAEQA
x-cr-puzzleid: {C4CCB40E-D5C6-4119-AA7C-BBBA7A1503E4}Hello,
Quoted 3 lines · Sangbeom Kim
From: Jonghun Han <[email protected]>
This patch adds
s3c_fb_driverdatafor S5PV310 FIMD0. Theclk_typeisadded
Quoted 1 line
to distinguish clock type in structure
s3c_fb_variantandlcd_clkisadded
Quoted 9 lines
in structure
s3c_fbto calculate divider for lcd panel.
FIMD can handles two clocks. The one is for FIMD IP and the other is for LCD pixel clock. Before S5PV310 LCD pixel clock can be same with FIMD IP clock. From S5PV310 LCD pixel clock is separated from FIMD IP clock.Signed-off-by Jonghun Han <[email protected]>Reviewed-by Kukjin Kim <[email protected]>Signed-off-by Sangbeom Kim <[email protected]>Cc Ben Dooks <[email protected]>Quoted 5 lines
---
NOTE: This patch is only for FIMD0.
FIMD1 will be implemented later.drivers/video/Kconfig | 2 +- drivers/video/s3c-fb.c | 128++++++++++++++++++++++++++++++++++++++++++------
Quoted 2 lines
2 files changed, 114 insertions(+), 16 deletions(-)
[snip]
Quoted 31 lines
drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct
Quoted 2 lines
drivers/video/s3c-fb.c +0
-0/* write the buffer address */ @@ -1286,8 +1292,10 @@ static int __devinit s3c_fb_probe(struct
platform_device*pdev)drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct
Quoted 12 lines
drivers/video/s3c-fb.c +2
-0struct s3c_fb_platdata *pd;struct s3c_fb *sfb;struct resource *res; +struct clk *mout_mpll =NULL ;int win;int ret =0 ; +u32 rate =134000000 ; fbdrv = (struct s3c_fb_driverdata *)platform_get_device_id (pdev)- driver_data;@@ -1314,19 +1322,56 @@ static int __devinit s3c_fb_probe(struct
platform_device*pdev)Quoted 15 lines
drivers/video/s3c-fb.c +9
-3sfb->pdata = pd; sfb->variant = fbdrv->variant; - sfb->bus_clk =clk_get (dev,"lcd" ); -if (IS_ERR (sfb->bus_clk)) { -dev_err (dev,"failed to get bus clock\n" ); +switch (sfb->variant.clk_type) { +case FIMD_CLK_TYPE0 : + sfb->bus_clk =clk_get (dev,"lcd" ); +if (IS_ERR (sfb->bus_clk)) { +dev_err (dev,"failed to get bus clock\n" ); + goto err_sfb; + } + +clk_enable (sfb->bus_clk);
Quoted 8 lines
drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct platform_device *pdev)
Quoted 8 lines
drivers/video/s3c-fb.c +8
-0+ + sfb->lcd_clk = sfb->bus_clk; +break ; + +case FIMD_CLK_TYPE1 : + sfb->bus_clk =clk_get (&pdev->dev,"fimd" ); +if (IS_ERR (sfb->bus_clk)) { + dev_err(&pdev->dev, "failed to get clock for
fimd\n");
Quoted 7 lines
drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct platform_device *pdev)
Quoted 7 lines
drivers/video/s3c-fb.c +7
-0+ goto err_sfb; + } +clk_enable (sfb->bus_clk); + + sfb->lcd_clk =clk_get (&pdev->dev,"sclk_fimd" ); +if (IS_ERR (sfb->lcd_clk)) { + dev_err(&pdev->dev, "failed to get sclk for
fimd\n");
Quoted 6 lines
Quoted 6 lines
drivers/video/s3c-fb.c +6
-0+ goto err_bus_clk; + } + + mout_mpll =clk_get (&pdev->dev,"mout_mpll" ); +if (IS_ERR (mout_mpll)) { +dev_err (&pdev->dev,"failed to get mout_mpll\n" );
Quoted 9 lines
drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct platform_device *pdev) · line 1358
Quoted 4 lines
drivers/video/s3c-fb.c +4
-0+ goto err_lcd_clk; + } +clk_set_parent (sfb->lcd_clk, mout_mpll); +clk_put (mout_mpll);I don't think that the driver is the right place to change the parent of the
sclk_fimd
clock. It should be done in the boot loader or the board startup code.
As you know, there are two clock sources for LCD pixel clock. s3c-fb only used 'lcd' clock as a parent of LCD pixel clock. But from S5PV310 SCLK_FIMD is only used as a source of LCD pixel clock. And SCLK_FIMD is only for FIMD. So the parent of the SCLK_FIMD can be selected in the driver.
In my opinion it doesn't matter.
Quoted 6 lines
We should also be a bit more consistent on clock naming. s3c6410..s5pv210 used the 'lcd'
clock name. Maybe you should also provide a patch to rename all these clocks to common
name.
Please refer to the following diagram.
Before S5PV310 clk 'lcd' was used for FIMD IP core clock and source of the LCD pixel clock.
But the mux used to select source of LCD pixel clock is removed. So 'lcd' clock is only used for core clock of FIMD IP. It isn't used for LCD pixel clock.
As a result clock name was changed from lcd to fimd in the S5PV310 datasheet.
I agree to rearrange clock name later.
Before S5PV310
------------------------------------
dsys bus
----------------+-------------------
|
|1.clk 'lcd'
|
| FIMD block
+---+-----------+
4.mout_mpll |\ | | |
--------|m| | +-+-+ +----+ |
|u|-+ | | +-+core| |
|x| | | | +----+ |
|/ | | | |\ |
| | +-|m| +---+ |
| | |u|--+div| |
+------+---|x| +---+ |
2.SCLK_FIMD | |/ | |
| | |
+----------+----+
|
inside of SoC |
-----------------------+--------------------------
outside of SoC |
| 3.LCD pixel clock
|
+--------------+
| LCD module |
+--------------+S5PV310
------------------------------------
dsys bus
----------------+-------------------
|
|1.clk 'fimd'
|
| FIMD block
+---+-----------+
4.mout_mpll |\ | | |
--------|m| | | +----+ |
|u|-+ | +---+core| |
|x| | | +----+ |
|/ | | |
| | +---+ |
| | +--+div| |
+------+-----+ +---+ |
2.SCLK_FIMD | | |
| | |
+----------+----+
|
inside of SoC |
-----------------------+--------------------------
outside of SoC |
| 3.LCD pixel clock
|
+--------------+
| LCD module |
+--------------+Quoted 49 lines
drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct
Quoted 23 lines
drivers/video/s3c-fb.c +9
-3+ +clk_set_rate (sfb->lcd_clk, rate); +clk_enable (sfb->lcd_clk); +dev_dbg (&pdev->dev,"set fimd sclk rate to %d\n" , rate); +break ; + +default : +dev_err (dev,"failed to enable clock for FIMD\n" ); goto err_sfb; } -clk_enable (sfb->bus_clk); - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (!res) {dev_err (dev,"failed to find registers\n" ); ret = -ENOENT ; - goto err_clk; + goto err_lcd_clk; } sfb->regs_res = request_mem_region(res->start, resource_size(res),@@ -1334,7 +1379,7 @@ static int __devinit s3c_fb_probe(struct
platform_device*pdev)Quoted 25 lines
drivers/video/s3c-fb.c +10
-4if (!sfb->regs_res) {dev_err (dev,"failed to claim register region\n" ); ret = -ENOENT ; - goto err_clk; + goto err_lcd_clk; } sfb->regs =ioremap (res->start,resource_size (res));@@ -1413,9 +1458,15 @@ err_req_region:release_resource (sfb->regs_res);kfree (sfb->regs_res); -err_clk: -clk_disable (sfb->bus_clk); -clk_put (sfb->bus_clk); +err_lcd_clk: +clk_disable (sfb->lcd_clk); +clk_put (sfb->lcd_clk); + +err_bus_clk: +if (sfb->variant.clk_type !=FIMD_CLK_TYPE0 ) { +clk_disable (sfb->bus_clk); +clk_put (sfb->bus_clk); + }
Quoted 2 lines
drivers/video/s3c-fb.c err_req_region: · line 1472
Quoted 2 lines
drivers/video/s3c-fb.c +0
-0err_sfb:kfree (sfb);
[snip]
BRs,
PATCH 3/4 s3c-fb: Add support S5PV310 FIMD
Hello, Jonghun.
Below is my opinion.
Have a good time :)
Quoted 130 lines
-----Original Message-----
From: linux-fbdev-owner at vger.kernel.org [mailto:linux-fbdev-
owner at vger.kernel.org] On Behalf Of Jonghun Han
Sent: Thursday, October 21, 2010 12:45 PM
To: 'Marek Szyprowski'; 'Sangbeom Kim'; linux-arm-
kernel at lists.infradead.org; linux-samsung-soc at vger.kernel.org; linux- fbdev at vger.kernel.org
Cc: akpm at linux-foundation.org; kgene.kim at samsung.com; ben-linux at fluff.org; kyungmin.park at samsung.com
Subject: RE: [PATCH 3/4] s3c-fb: Add support S5PV310 FIMD1AFAAVgAzADEAMAAgAEY
ASQBNAEQA
x-cr-puzzleid: {B7526269-A73C-412A-8DAE-B8EB603CF9D0}Hi,
Quoted 6 lines · Marek Szyprowski
-----Original Message-----
From: Marek Szyprowski [mailto:m.szyprowski at samsung.com]
Sent: Tuesday, October 19, 2010 4:22 PM
To: 'Sangbeom Kim'; linux-arm-kernel at lists.infradead.org; linux-samsung- soc at vger.kernel.org; linux-fbdev at vger.kernel.org
Cc: 'Jonghun Han'; akpm at linux-foundation.org; kgene.kim at samsung.com;ben-
Quoted 9 lines
linux at fluff.org; kyungmin.park at samsung.com
Subject: RE: [PATCH 3/4] s3c-fb: Add support S5PV310 FIMD1AFAAVgAzADEAMAAgAEY
ASQBNAEQA
x-cr-puzzleid: {C4CCB40E-D5C6-4119-AA7C-BBBA7A1503E4}Hello,
Quoted 10 lines
Quoted 3 lines · Sangbeom Kim
From: Jonghun Han <[email protected]>
This patch adds
s3c_fb_driverdatafor S5PV310 FIMD0. Theclk_typeisadded
Quoted 1 line
to distinguish clock type in structure
s3c_fb_variantandlcd_clkisadded
Quoted 2 lines
in structure
s3c_fbto calculate divider for lcd panel. FIMD can handles two clocks. The one is for FIMD IP and the other isfor
Quoted 1 line
Quoted 1 line
LCD pixel clock. Before S5PV310 LCD pixel clock can be same with FIMD
IP
Quoted 14 lines
Quoted 11 lines
clock. From S5PV310 LCD pixel clock is separated from FIMD IP clock.
Signed-off-by Jonghun Han <[email protected]>Reviewed-by Kukjin Kim <[email protected]>Signed-off-by Sangbeom Kim <[email protected]>Cc Ben Dooks <[email protected]>---
NOTE: This patch is only for FIMD0.
FIMD1 will be implemented later.drivers/video/Kconfig | 2 +- drivers/video/s3c-fb.c | 128++++++++++++++++++++++++++++++++++++++++++------
Quoted 2 lines
2 files changed, 114 insertions(+), 16 deletions(-)[snip]
Quoted 31 lines
drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct
Quoted 2 lines
drivers/video/s3c-fb.c +0
-0/* write the buffer address */ @@ -1286,8 +1292,10 @@ static int __devinit s3c_fb_probe(struct
platform_device*pdev)drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct
Quoted 12 lines
drivers/video/s3c-fb.c +2
-0struct s3c_fb_platdata *pd;struct s3c_fb *sfb;struct resource *res; +struct clk *mout_mpll =NULL ;int win;int ret =0 ; +u32 rate =134000000 ; fbdrv = (struct s3c_fb_driverdata *)platform_get_device_id (pdev)- driver_data;@@ -1314,19 +1322,56 @@ static int __devinit s3c_fb_probe(struct
platform_device*pdev)Quoted 15 lines
drivers/video/s3c-fb.c +9
-3sfb->pdata = pd; sfb->variant = fbdrv->variant; - sfb->bus_clk =clk_get (dev,"lcd" ); -if (IS_ERR (sfb->bus_clk)) { -dev_err (dev,"failed to get bus clock\n" ); +switch (sfb->variant.clk_type) { +case FIMD_CLK_TYPE0 : + sfb->bus_clk =clk_get (dev,"lcd" ); +if (IS_ERR (sfb->bus_clk)) { +dev_err (dev,"failed to get bus clock\n" ); + goto err_sfb; + } + +clk_enable (sfb->bus_clk);Quoted 8 lines
drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct platform_device *pdev)
Quoted 8 lines
drivers/video/s3c-fb.c +8
-0+ + sfb->lcd_clk = sfb->bus_clk; +break ; + +case FIMD_CLK_TYPE1 : + sfb->bus_clk =clk_get (&pdev->dev,"fimd" ); +if (IS_ERR (sfb->bus_clk)) { + dev_err(&pdev->dev, "failed to get clock forfimd\n");
Quoted 7 lines
drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct platform_device *pdev)
Quoted 7 lines
drivers/video/s3c-fb.c +7
-0+ goto err_sfb; + } +clk_enable (sfb->bus_clk); + + sfb->lcd_clk =clk_get (&pdev->dev,"sclk_fimd" ); +if (IS_ERR (sfb->lcd_clk)) { + dev_err(&pdev->dev, "failed to get sclk forfimd\n");
Quoted 6 lines
Quoted 6 lines
drivers/video/s3c-fb.c +6
-0+ goto err_bus_clk; + } + + mout_mpll =clk_get (&pdev->dev,"mout_mpll" ); +if (IS_ERR (mout_mpll)) { +dev_err (&pdev->dev,"failed to get mout_mpll\n" );Quoted 9 lines
drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct platform_device *pdev) · line 1358
Quoted 4 lines
drivers/video/s3c-fb.c +4
-0+ goto err_lcd_clk; + } +clk_set_parent (sfb->lcd_clk, mout_mpll); +clk_put (mout_mpll);I don't think that the driver is the right place to change the parent of the
sclk_fimd
clock. It should be done in the boot loader or the board startup code.
Quoted 7 lines
As you know, there are two clock sources for LCD pixel clock. s3c-fb only used 'lcd' clock as a parent of LCD pixel clock. But from S5PV310
SCLK_FIMDis only used as a source of LCD pixel clock. AndSCLK_FIMDis only for FIMD. So the parent of theSCLK_FIMDcan be selected in the driver.
In my opinion it doesn't matter.
Parent clock is specific to machine
because machines could have different type of lcd panel each other and any parent clocks for FIMD could be used according to the lcd panel. So for stable pixel clock setting, parent clock should be set at machine specific code and FIMD driver should preserve just clock gating.
Quoted 140 lines
Quoted 2 lines
We should also be a bit more consistent on clock naming.
s3c6410..s5pv210
Quoted 5 lines
used the 'lcd'
clock name. Maybe you should also provide a patch to rename all these clocks to common
name.Please refer to the following diagram.
Before S5PV310 clk 'lcd' was used for FIMD IP core clock and source of the LCD pixel clock.
But the mux used to select source of LCD pixel clock is removed. So 'lcd' clock is only used for core clock of FIMD IP. It isn't used for LCD
pixel clock.
As a result clock name was changed from lcd to fimd in the S5PV310 datasheet.
I agree to rearrange clock name later.Before S5PV310
------------------------------------ dsys bus ----------------+------------------- | |1.clk 'lcd' | | FIMD block +---+-----------+ 4.mout_mpll |\ | | | --------|m| | +-+-+ +----+ | |u|-+ | | +-+core| | |x| | | | +----+ | |/ | | | |\ | | | +-|m| +---+ | | | |u|--+div| | +------+---|x| +---+ | 2.SCLK_FIMD | |/ | | | | | +----------+----+ | inside of SoC | -----------------------+-------------------------- outside of SoC | | 3.LCD pixel clock | +--------------+ | LCD module | +--------------+S5PV310
------------------------------------ dsys bus ----------------+------------------- | |1.clk 'fimd' | | FIMD block +---+-----------+ 4.mout_mpll |\ | | | --------|m| | | +----+ | |u|-+ | +---+core| | |x| | | +----+ | |/ | | | | | +---+ | | | +--+div| | +------+-----+ +---+ | 2.SCLK_FIMD | | | | | | +----------+----+ | inside of SoC | -----------------------+-------------------------- outside of SoC | | 3.LCD pixel clock | +--------------+ | LCD module | +--------------+Quoted 49 lines
drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct
Quoted 23 lines
drivers/video/s3c-fb.c +9
-3+ +clk_set_rate (sfb->lcd_clk, rate); +clk_enable (sfb->lcd_clk); +dev_dbg (&pdev->dev,"set fimd sclk rate to %d\n" , rate); +break ; + +default : +dev_err (dev,"failed to enable clock for FIMD\n" ); goto err_sfb; } -clk_enable (sfb->bus_clk); - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (!res) {dev_err (dev,"failed to find registers\n" ); ret = -ENOENT ; - goto err_clk; + goto err_lcd_clk; } sfb->regs_res = request_mem_region(res->start, resource_size(res),@@ -1334,7 +1379,7 @@ static int __devinit s3c_fb_probe(struct
platform_device*pdev)Quoted 25 lines
drivers/video/s3c-fb.c +10
-4if (!sfb->regs_res) {dev_err (dev,"failed to claim register region\n" ); ret = -ENOENT ; - goto err_clk; + goto err_lcd_clk; } sfb->regs =ioremap (res->start,resource_size (res));@@ -1413,9 +1458,15 @@ err_req_region:release_resource (sfb->regs_res);kfree (sfb->regs_res); -err_clk: -clk_disable (sfb->bus_clk); -clk_put (sfb->bus_clk); +err_lcd_clk: +clk_disable (sfb->lcd_clk); +clk_put (sfb->lcd_clk); + +err_bus_clk: +if (sfb->variant.clk_type !=FIMD_CLK_TYPE0 ) { +clk_disable (sfb->bus_clk); +clk_put (sfb->bus_clk); + }Quoted 2 lines
drivers/video/s3c-fb.c err_req_region: · line 1472
Quoted 2 lines
drivers/video/s3c-fb.c +0
-0err_sfb:kfree (sfb);[snip]
BRs,
--
To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 3/4 s3c-fb: Add support S5PV310 FIMD
Hi,
Thanks for comment.
[snip]
Quoted 14 lines
Quoted 6 lines
Quoted 5 lines
I don't think that the driver is the right place to change the parent of the
sclk_fimd
clock. It should be done in the boot loader or the board startup code.Quoted 7 lines
As you know, there are two clock sources for LCD pixel clock. s3c-fb only used 'lcd' clock as a parent of LCD pixel clock. But from S5PV310
SCLK_FIMDis only used as a source of LCD pixel clock. AndSCLK_FIMDis only for FIMD. So the parent of theSCLK_FIMDcan be selected in the driver.
In my opinion it doesn't matter.
Quoted 6 lines
Parent clock is specific to machine
because machines could have different type of lcd panel each other and any parent clocks for FIMD could be used according to the lcd panel. So for stable pixel clock setting, parent clock should be set at machine specific code and FIMD driver should preserve just clock gating.
Right. Parent clock is specific to machine.
But as you know, 'mout_mpll' can cover almost LCD pixel clock. If other parent clock is needed, I'll get the parent clock or separator via platform data from board file.
It is better than setting parent clock in board file at the point of samsung mainline scheme.
BRs,
PATCH 3/4 s3c-fb: Add support S5PV310 FIMD
In reply to Sangbeom KimQuoted 10 lines · Sangbeom Kim
From: Jonghun Han <[email protected]>
This patch adds
s3c_fb_driverdatafor S5PV310 FIMD0. Theclk_typeis added to distinguish clock type in structures3c_fb_variantandlcd_clkis added in structures3c_fbto calculate divider for lcd panel.
FIMD can handles two clocks. The one is for FIMD IP and the other is for LCD pixel clock. Before S5PV310 LCD pixel clock can be same with FIMD IP clock. From S5PV310 LCD pixel clock is separated from FIMD IP clock.
Quoted 4 lines
Signed-off-by Jonghun Han <[email protected]>Reviewed-by Kukjin Kim <[email protected]>Signed-off-by Sangbeom Kim <[email protected]>Cc Ben Dooks <[email protected]>
Hi Ben,
How do you think about this?
If you're ok, I'd like to send this to upstream via mmotm.
Quoted 5 lines
---
NOTE: This patch is only for FIMD0.
FIMD1 will be implemented later.drivers/video/Kconfig | 2 +- drivers/video/s3c-fb.c | 128
++++++++++++++++++++++++++++++++++++++++++----
drivers/video/s3c-fb.c static int s3c_fb_check_var(struct fb_var_screeninfo
Quoted 57 lines
--
2 files changed, 114 insertions(+), 16 deletions(-)drivers/video/Kconfig +1
-1@@ -1946,7 +1946,7 @@ config FB_TMIO_ACCELL config FB_S3C tristate "Samsung S3C framebuffer support" - depends on FB && S3C_DEV_FB + depends on FB && (S3C_DEV_FB || S5P_DEV_FIMD0) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLITdrivers/video/s3c-fb.c +7
-1@@ -65,6 +65,9 @@ struct s3c_fb;#define VIDOSD_C (win, variant) (OSD_BASE(win, variant) + 0x08)#define VIDOSD_D (win, variant) (OSD_BASE(win, variant) + 0x0C) +#define FIMD_CLK_TYPE0 0 +#define FIMD_CLK_TYPE1 1 +/** * struct s3c_fb_variant - fb variant information * @is_2443: Set if S3C2443/S3C2416 style hardware. @@ -97,6 +100,7 @@ struct s3c_fb_variant { unsigned int has_prtcon:1; unsigned int has_shadowcon:1; + unsigned int clk_type:1; };/** @@ -183,7 +187,8 @@ struct s3c_fb_vsync {* struct s3c_fb - overall hardware state of the hardware * @dev: The device that we bound to, for printing, etc. * @regs_res: The resource we claimed for the IO registers. -* @bus_clk: The clk (hclk) feeding our interface and possibly pixclk. +* @bus_clk: The clk (hclk) feeding FIMD IP core. +* @lcd_clk: The clk (sclk) feeding our interface and possibly pixclk. * @regs: The mapped hardware registers. * @variant: Variant information for this hardware. * @enabled: A bitmask of enabled hardware windows. @@ -197,6 +202,7 @@ struct s3c_fb {struct device *dev;struct resource *regs_res;struct clk *bus_clk; +struct clk *lcd_clk;void __iomem *regs;struct s3c_fb_variant variant;@@ -334,7 +340,7 @@ static int s3c_fb_check_var(struct fb_var_screeninfo
*var,
Quoted 45 lines
drivers/video/s3c-fb.c +4
-2*/ static int s3c_fb_calc_pixclk (struct s3c_fb *sfb,unsigned int pixclk) { -unsigned long clk =clk_get_rate (sfb->bus_clk); +unsigned long clk =clk_get_rate (sfb->lcd_clk);unsigned long long tmp;unsigned int result;@@ -517,7 +523,7 @@ static int s3c_fb_set_par(struct fb_info *info) data =VIDTCON2_LINEVAL (var->yres -1 ) |VIDTCON2_HOZVAL (var->xres -1 ); -writel (data, regs +sfb->variant.vidtcon +8 ); +writel (data, regs + sfb->variant.vidtcon +8 ); }/* write the buffer address */ @@ -1286,8 +1292,10 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)struct s3c_fb_platdata *pd;struct s3c_fb *sfb;struct resource *res; +struct clk *mout_mpll =NULL ;int win;int ret =0 ; +u32 rate =134000000 ; fbdrv = (struct s3c_fb_driverdata *)platform_get_device_id(pdev)-Quoted 1 line
driver_data;drivers/video/s3c-fb.c +7
-3@@ -1314,19 +1322,56 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev) sfb->pdata = pd; sfb->variant = fbdrv->variant; - sfb->bus_clk =clk_get (dev,"lcd" ); -if (IS_ERR (sfb->bus_clk)) { -dev_err (dev,"failed to get bus clock\n" ); +switch (sfb->variant.clk_type) { +case FIMD_CLK_TYPE0 : + sfb->bus_clk =clk_get (dev,"lcd" ); +if (IS_ERR (sfb->bus_clk)) { +dev_err (dev,"failed to get bus clock\n" ); + goto err_sfb; + }
drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct · line 1342
Quoted 10 lines
drivers/video/s3c-fb.c +10
-0+ +clk_enable (sfb->bus_clk); + + sfb->lcd_clk = sfb->bus_clk; +break ; + +case FIMD_CLK_TYPE1 : + sfb->bus_clk =clk_get (&pdev->dev,"fimd" ); +if (IS_ERR (sfb->bus_clk)) { + dev_err(&pdev->dev, "failed to get clock for
fimd\n");
drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct platform_device *pdev)
Quoted 7 lines
drivers/video/s3c-fb.c +7
-0+ goto err_sfb; + } +clk_enable (sfb->bus_clk); + + sfb->lcd_clk =clk_get (&pdev->dev,"sclk_fimd" ); +if (IS_ERR (sfb->lcd_clk)) { + dev_err(&pdev->dev, "failed to get sclk for
fimd\n");
drivers/video/s3c-fb.c static int s3c_fb_suspend(struct platform_device
Quoted 86 lines
drivers/video/s3c-fb.c +19
-3+ goto err_bus_clk; + } + + mout_mpll =clk_get (&pdev->dev,"mout_mpll" ); +if (IS_ERR (mout_mpll)) { +dev_err (&pdev->dev,"failed to get mout_mpll\n" ); + goto err_lcd_clk; + } +clk_set_parent (sfb->lcd_clk, mout_mpll); +clk_put (mout_mpll); + +clk_set_rate (sfb->lcd_clk, rate); +clk_enable (sfb->lcd_clk); +dev_dbg (&pdev->dev,"set fimd sclk rate to %d\n" , rate); +break ; + +default : +dev_err (dev,"failed to enable clock for FIMD\n" ); goto err_sfb; } -clk_enable (sfb->bus_clk); - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (!res) {dev_err (dev,"failed to find registers\n" ); ret = -ENOENT ; - goto err_clk; + goto err_lcd_clk; }drivers/video/s3c-fb.c +1
-1sfb->regs_res = request_mem_region(res->start, resource_size(res),@@ -1334,7 +1379,7 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)if (!sfb->regs_res) {dev_err (dev,"failed to claim register region\n" ); ret = -ENOENT ; - goto err_clk; + goto err_lcd_clk; }drivers/video/s3c-fb.c +23
-5sfb->regs =ioremap (res->start,resource_size (res));@@ -1413,9 +1458,15 @@ err_req_region:release_resource (sfb->regs_res);kfree (sfb->regs_res); -err_clk: -clk_disable (sfb->bus_clk); -clk_put (sfb->bus_clk); +err_lcd_clk: +clk_disable (sfb->lcd_clk); +clk_put (sfb->lcd_clk); + +err_bus_clk: +if (sfb->variant.clk_type !=FIMD_CLK_TYPE0 ) { +clk_disable (sfb->bus_clk); +clk_put (sfb->bus_clk); + } err_sfb:kfree (sfb);@@ -1442,8 +1493,20 @@ static int __devexit s3c_fb_remove(struct platform_device *pdev) iounmap(sfb->regs); -clk_disable (sfb->bus_clk); -clk_put (sfb->bus_clk); +switch (sfb->variant.clk_type) { +case FIMD_CLK_TYPE1 : +clk_disable (sfb->lcd_clk); +clk_put (sfb->lcd_clk); +/* fall through to default case */ +case FIMD_CLK_TYPE0 : +clk_disable (sfb->bus_clk); +clk_put (sfb->bus_clk); +break ; +default : +dev_err (sfb->dev,"invalid clock type(%d)\n" , + sfb->variant.clk_type); +break ; + }release_resource (sfb->regs_res);drivers/video/s3c-fb.c +0
-0kfree (sfb->regs_res);@@ -1470,6 +1533,7 @@ static int s3c_fb_suspend(struct platform_device
*pdev,
drivers/video/s3c-fb.c static struct s3c_fb_driverdata s3c_fb_data_s5pv210
Quoted 9 lines
drivers/video/s3c-fb.c +1
-0pm_message_t state) }clk_disable (sfb->bus_clk); +return 0 ; }@@ -1656,6 +1720,37 @@ static struct s3c_fb_driverdata s3c_fb_data_s5pv210
=
drivers/video/s3c-fb.c static struct platform_device_id s3c_fb_driver_ids[]
Quoted 39 lines
drivers/video/s3c-fb.c +31
-0{ .win[4] = &s3c_fb_data_64xx_wins[4], }; +static struct s3c_fb_driverdata s3c_fb_data_s5pv310 = { + .variant = { + .nr_windows =5 , + .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 , + [3 ] =0x3000 , + [4 ] =0x3400 , + }, + + .has_shadowcon =1 , + .clk_type =FIMD_CLK_TYPE1 , + }, + .win[0 ] = &s3c_fb_data_64xx_wins[0 ], + .win[1 ] = &s3c_fb_data_64xx_wins[1 ], + .win[2 ] = &s3c_fb_data_64xx_wins[2 ], + .win[3 ] = &s3c_fb_data_64xx_wins[3 ], + .win[4 ] = &s3c_fb_data_64xx_wins[4 ], +}; +/* S3C2443/S3C2416 style hardware */ static struct s3c_fb_driverdata s3c_fb_data_s3c2443 = {drivers/video/s3c-fb.c +0
-0.variant = {@@ -1703,6 +1798,9 @@ static struct platform_device_id s3c_fb_driver_ids[]
=
Quoted 11 lines
drivers/video/s3c-fb.c +3
-0{ .name = "s5pv210-fb", .driver_data = (unsigned long)&s3c_fb_data_s5pv210, }, { + .name = "s5pv310-fb", + .driver_data = (unsigned long)&s3c_fb_data_s5pv310, + }, { .name = "s3c2443-fb", .driver_data = (unsigned long)&s3c_fb_data_s3c2443,},
--
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 3/4 s3c-fb: Add support S5PV310 FIMD
Hello, all.
This is my opinion and patch.
Jonghun's patch is adding clock type(FIMD_CLK_TYPE1 or FIMD_CLK_TYPE2) and alsoclk_type variable to s3c_fb_variant to select which clock would be used. I think we could meet that simply if source clock and parent clock names are set to platform data in machine file.
I added my comments to Jonghun's patch and attached modified patch below. Thank you.
(quoted diff) +0 -0
b/arch/arm/plat-samsung/include/plat/fb.h
index ed70fc5..411380e 100644
arch/arm/plat-samsung/include/plat/fb.h +7 -0
@@ -47,6 +47,10 @@ struct s3c_fb_pd_win {* @vidcon1: The base vidcon1 values to control the panel data output. * @win: The setup data for each hardware window, or NULL for unused. * @display_mode: The LCD output display mode. +* @sclk_name: source clock name and sclk_name valiable should be set +* at machine specific file. +* @pclk_name: parent clock name and pclk_name valiable should be set +* at machine specific file. * * The platform data supplies the video driver with all the information * it requires to work with the display(s) attached to the machine. It
@@ -63,6 +67,9 @@ struct s3c_fb_platdata {u32 vidcon0;u32 vidcon1; + +const char *sclk_name; +const char *pclk_name; };
drivers/video/s3c-fb.c +2 -1
@@ -27,6 +27,7 @@#include <mach/map.h> #include <plat/regs-fb-v4.h> #include <plat/fb.h> +#include <plat/clock.h> /* This driver will export a number of framebuffer interfaces depending * on the configuration passed in via the platform data. Each fb instance
@@ -183,7 +184,7 @@ struct s3c_fb_vsync {* struct s3c_fb - overall hardware state of the hardware * @dev: The device that we bound to, for printing, etc. * @regs_res: The resource we claimed for the IO registers. -* @bus_clk: The clk (hclk) feeding our interface and possibly pixclk. +* @lcd_clk: The clk (hclk or sclk) feeding our interface and possibly
pixclk.
* @regs: The mapped hardware registers.
* @variant: Variant information for this hardware.
* @enabled: A bitmask of enabled hardware windows.
@@ -196,7 +197,7 @@ struct s3c_fb_vsync {
struct s3c_fb {
struct device *dev;
struct resource *regs_res;
- struct clk *bus_clk;
+ struct clk *lcd_clk;
void __iomem *regs;
struct s3c_fb_variant variant;
@@ -334,7 +335,11 @@ static int s3c_fb_check_var(struct fb_var_screeninfo *var,
*/
static int s3c_fb_calc_pixclk(struct s3c_fb *sfb, unsigned int pixclk) {
- unsigned long clk = clk_get_rate(sfb->bus_clk);
+ /**
+ * if it fails to get clock rate from lcd_clk
+ * then would get it from parent clock of lcd_clk.
+ */
+ unsigned long clk = clk_get_rate(sfb->lcd_clk);
unsigned long long tmp;
unsigned int result;
@@ -1314,13 +1319,22 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)
sfb->pdata = pd;
sfb->variant = fbdrv->variant;
- sfb->bus_clk = clk_get(dev, "lcd");
- if (IS_ERR(sfb->bus_clk)) {
- dev_err(dev, "failed to get bus clock\n");
+ /* if sclk_name is NULL then it would use bus clock as default. */
+ if (!pd->sclk_name)
+ sfb->lcd_clk = clk_get(dev, "lcd");
+ else
+ sfb->lcd_clk = clk_get(dev, pd->sclk_name);
+
+ if (IS_ERR(sfb->lcd_clk)) {
+ dev_err(dev, "failed to get lcd clock\n");
+ clk_put(sfb->lcd_clk);
goto err_sfb;
}
- clk_enable(sfb->bus_clk);
+ if (pd->pclk_name)
+ sfb->lcd_clk->parent = clk_get(dev, pd->pclk_name);
+
+ clk_enable(sfb->lcd_clk);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) {
@@ -1414,8 +1428,8 @@ err_req_region:
kfree(sfb->regs_res);
err_clk:
- clk_disable(sfb->bus_clk);
- clk_put(sfb->bus_clk);
+ clk_disable(sfb->lcd_clk);
+ clk_put(sfb->lcd_clk);
err_sfb:
kfree(sfb);
@@ -1442,8 +1456,8 @@ static int __devexit s3c_fb_remove(struct platform_device *pdev)
iounmap(sfb->regs);
- clk_disable(sfb->bus_clk);
- clk_put(sfb->bus_clk);
+ clk_disable(sfb->lcd_clk);
+ clk_put(sfb->lcd_clk);
release_resource(sfb->regs_res); kfree(sfb->regs_res);
@@ -1469,7 +1483,8 @@ static int s3c_fb_suspend(struct platform_device *pdev, pm_message_t state)
s3c_fb_blank(FB_BLANK_POWERDOWN, win->fbinfo);
}
- clk_disable(sfb->bus_clk);
+ clk_disable(sfb->lcd_clk);
+
return 0;
}
@@ -1480,7 +1495,7 @@ static int s3c_fb_resume(struct platform_device *pdev)
struct s3c_fb_win *win;
int win_no;
- clk_enable(sfb->bus_clk);
+ clk_enable(sfb->lcd_clk);
/* setup registers */
writel(pd->vidcon1, sfb->regs + VIDCON1);
@@ -1656,6 +1671,36 @@ static struct s3c_fb_driverdata s3c_fb_data_s5pv210 = {
.win[4] = &s3c_fb_data_64xx_wins[4],
};
+static struct s3c_fb_driverdata s3c_fb_data_s5pv310 = {
+ .variant = {
+ .nr_windows = 5,
+ .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,
+ [3] = 0x3000,
+ [4] = 0x3400,
+ },
+
+ .has_shadowcon = 1,
+ },
+ .win[0] = &s3c_fb_data_64xx_wins[0],
+ .win[1] = &s3c_fb_data_64xx_wins[1],
+ .win[2] = &s3c_fb_data_64xx_wins[2],
+ .win[3] = &s3c_fb_data_64xx_wins[3],
+ .win[4] = &s3c_fb_data_64xx_wins[4],+};
+
/* S3C2443/S3C2416 style hardware */
static struct s3c_fb_driverdata s3c_fb_data_s3c2443 = {
.variant = {
@@ -1703,6 +1748,9 @@ static struct platform_device_id s3c_fb_driver_ids[] = {
.name = "s5pv210-fb",
.driver_data = (unsigned long)&s3c_fb_data_s5pv210,
}, {
+ .name = "s5pv310-fb",
+ .driver_data = (unsigned long)&s3c_fb_data_s5pv310,
+ }, {
.name = "s3c2443-fb",
.driver_data = (unsigned long)&s3c_fb_data_s3c2443,
},
Quoted 62 lines
-----Original Message-----
From: linux-fbdev-owner at vger.kernel.org [mailto:linux-fbdev- owner at vger.kernel.org] On Behalf Of Kukjin Kim
Sent: Friday, November 12, 2010 2:26 PM
To: 'Sangbeom Kim'; linux-arm-kernel at lists.infradead.org; linux-samsung- soc at vger.kernel.org; linux-fbdev at vger.kernel.org
Cc: ben-linux at fluff.org; akpm at linux-foundation.org; 'Jonghun Han'
Subject: RE: [PATCH 3/4] s3c-fb: Add support S5PV310 FIMDQuoted 4 lines · Sangbeom Kim
From: Jonghun Han <[email protected]>
This patch adds
s3c_fb_driverdatafor S5PV310 FIMD0. Theclk_typeisadded
Quoted 1 line
to distinguish clock type in structure
s3c_fb_variantandlcd_clkisadded
Quoted 9 lines
in structure
s3c_fbto calculate divider for lcd panel.
FIMD can handles two clocks. The one is for FIMD IP and the other is for LCD pixel clock. Before S5PV310 LCD pixel clock can be same with FIMD IP clock. From S5PV310 LCD pixel clock is separated from FIMD IP clock.Signed-off-by Jonghun Han <[email protected]>Reviewed-by Kukjin Kim <[email protected]>Signed-off-by Sangbeom Kim <[email protected]>Cc Ben Dooks <[email protected]>Hi Ben,
How do you think about this?
If you're ok, I'd like to send this to upstream via mmotm.Quoted 5 lines
---
NOTE: This patch is only for FIMD0.
FIMD1 will be implemented later.drivers/video/Kconfig | 2 +- drivers/video/s3c-fb.c | 128++++++++++++++++++++++++++++++++++++++++++----
Quoted 24 lines
--
2 files changed, 114 insertions(+), 16 deletions(-)drivers/video/Kconfig +1
-1@@ -1946,7 +1946,7 @@ config FB_TMIO_ACCELL config FB_S3C tristate "Samsung S3C framebuffer support" - depends on FB && S3C_DEV_FB + depends on FB && (S3C_DEV_FB || S5P_DEV_FIMD0) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLITdrivers/video/s3c-fb.c +0
-0@@ -65,6 +65,9 @@ struct s3c_fb;#define VIDOSD_C (win, variant) (OSD_BASE(win, variant) + 0x08)#define VIDOSD_D (win, variant) (OSD_BASE(win, variant) + 0x0C)
Quoted 3 lines
drivers/video/s3c-fb.c struct s3c_fb; · line 70
Quoted 3 lines
drivers/video/s3c-fb.c +3
-0+#define FIMD_CLK_TYPE0 0 +#define FIMD_CLK_TYPE1 1 +
this macro is unnecessary.
Quoted 21 lines
Quoted 21 lines
drivers/video/s3c-fb.c +3
-1/** * struct s3c_fb_variant - fb variant information * @is_2443: Set if S3C2443/S3C2416 style hardware. @@ -97,6 +100,7 @@ struct s3c_fb_variant { unsigned int has_prtcon:1; unsigned int has_shadowcon:1; + unsigned int clk_type:1; };/** @@ -183,7 +187,8 @@ struct s3c_fb_vsync {* struct s3c_fb - overall hardware state of the hardware * @dev: The device that we bound to, for printing, etc. * @regs_res: The resource we claimed for the IO registers. -* @bus_clk: The clk (hclk) feeding our interface and possibly pixclk. +* @bus_clk: The clk (hclk) feeding FIMD IP core. +* @lcd_clk: The clk (sclk) feeding our interface and possibly pixclk. * @regs: The mapped hardware registers. * @variant: Variant information for this hardware. * @enabled: A bitmask of enabled hardware windows.
Quoted 8 lines
drivers/video/s3c-fb.c struct s3c_fb { · line 208
Quoted 8 lines
drivers/video/s3c-fb.c +1
-0@@ -197,6 +202,7 @@ struct s3c_fb {struct device *dev;struct resource *regs_res;struct clk *bus_clk; +struct clk *lcd_clk;void __iomem *regs;struct s3c_fb_variant variant;
bus_clk and lcd_clk could be integrated as lcd_clk.
and Ben, lcd_clk is better then bus_clk because hclk or sclk could be used according to lcd panel on machine for stable use.
Quoted 83 lines
drivers/video/s3c-fb.c static int s3c_fb_check_var(struct fb_var_screeninfo
Quoted 1 line
drivers/video/s3c-fb.c +0
-0@@ -334,7 +340,7 @@ static int s3c_fb_check_var(struct fb_var_screeninfo*var,
Quoted 49 lines
drivers/video/s3c-fb.c +4
-2*/ static int s3c_fb_calc_pixclk (struct s3c_fb *sfb,unsigned int pixclk) { -unsigned long clk =clk_get_rate (sfb->bus_clk); +unsigned long clk =clk_get_rate (sfb->lcd_clk);unsigned long long tmp;unsigned int result;@@ -517,7 +523,7 @@ static int s3c_fb_set_par(struct fb_info *info) data =VIDTCON2_LINEVAL (var->yres -1 ) |VIDTCON2_HOZVAL (var->xres -1 ); -writel (data, regs +sfb->variant.vidtcon +8 ); +writel (data, regs + sfb->variant.vidtcon +8 ); }/* write the buffer address */ @@ -1286,8 +1292,10 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)struct s3c_fb_platdata *pd;struct s3c_fb *sfb;struct resource *res; +struct clk *mout_mpll =NULL ;int win;int ret =0 ; +u32 rate =134000000 ; fbdrv = (struct s3c_fb_driverdata *)platform_get_device_id(pdev)-Quoted 1 line
driver_data;drivers/video/s3c-fb.c +7
-3@@ -1314,19 +1322,56 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev) sfb->pdata = pd; sfb->variant = fbdrv->variant; - sfb->bus_clk =clk_get (dev,"lcd" ); -if (IS_ERR (sfb->bus_clk)) { -dev_err (dev,"failed to get bus clock\n" ); +switch (sfb->variant.clk_type) { +case FIMD_CLK_TYPE0 : + sfb->bus_clk =clk_get (dev,"lcd" ); +if (IS_ERR (sfb->bus_clk)) { +dev_err (dev,"failed to get bus clock\n" ); + goto err_sfb; + }drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct · line 1346
Quoted 10 lines
drivers/video/s3c-fb.c +10
-0+ +clk_enable (sfb->bus_clk); + + sfb->lcd_clk = sfb->bus_clk; +break ; + +case FIMD_CLK_TYPE1 : + sfb->bus_clk =clk_get (&pdev->dev,"fimd" ); +if (IS_ERR (sfb->bus_clk)) { + dev_err(&pdev->dev, "failed to get clock forfimd\n");
drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct · line 1353
Quoted 7 lines
drivers/video/s3c-fb.c +7
-0+ goto err_sfb; + } +clk_enable (sfb->bus_clk); + + sfb->lcd_clk =clk_get (&pdev->dev,"sclk_fimd" ); +if (IS_ERR (sfb->lcd_clk)) { + dev_err(&pdev->dev, "failed to get sclk forfimd\n");
Quoted 13 lines
drivers/video/s3c-fb.c +13
-0+ goto err_bus_clk; + } + + mout_mpll =clk_get (&pdev->dev,"mout_mpll" ); +if (IS_ERR (mout_mpll)) { +dev_err (&pdev->dev,"failed to get mout_mpll\n" ); + goto err_lcd_clk; + } +clk_set_parent (sfb->lcd_clk, mout_mpll); +clk_put (mout_mpll); + +clk_set_rate (sfb->lcd_clk, rate); +clk_enable (sfb->lcd_clk);
Quoted 8 lines
drivers/video/s3c-fb.c static int __devinit s3c_fb_probe(struct · line 1374
Quoted 8 lines
drivers/video/s3c-fb.c +5
-0+dev_dbg (&pdev->dev,"set fimd sclk rate to %d\n" , rate); +break ; + +default : +dev_err (dev,"failed to enable clock for FIMD\n" ); goto err_sfb; }
This code above is unnecessary. if sclk_name of platform data is null then it could get clock "lcd" otherwise sclk_name.
in case of "lcd", fimd would use bus clock as parent clock but for sclk_name, sclk_fimd clock.
and
if (pd->pclk_name)
sfb->lcd_clk->parent = clk_get(dev, pd->pclk_name);
by adding the code above,
we could get appropriate clock rate through clk_get_rate(sfb->lcd_clk) call at s3c_fb_calc_pixclk function.
(clk_get_rate function gets clock rate of parent if lcd_clk->rate is 0)
Quoted 49 lines
Quoted 47 lines
drivers/video/s3c-fb.c +0
-2-clk_enable (sfb->bus_clk); - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (!res) {dev_err (dev,"failed to find registers\n" );drivers/video/s3c-fb.c +2
-2ret = -ENOENT ; - goto err_clk; + goto err_lcd_clk; } sfb->regs_res = request_mem_region(res->start, resource_size(res),@@ -1334,7 +1379,7 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)if (!sfb->regs_res) {dev_err (dev,"failed to claim register region\n" ); ret = -ENOENT ; - goto err_clk; + goto err_lcd_clk; }drivers/video/s3c-fb.c +9
-5sfb->regs =ioremap (res->start,resource_size (res));@@ -1413,9 +1458,15 @@ err_req_region:release_resource (sfb->regs_res);kfree (sfb->regs_res); -err_clk: -clk_disable (sfb->bus_clk); -clk_put (sfb->bus_clk); +err_lcd_clk: +clk_disable (sfb->lcd_clk); +clk_put (sfb->lcd_clk); + +err_bus_clk: +if (sfb->variant.clk_type !=FIMD_CLK_TYPE0 ) { +clk_disable (sfb->bus_clk); +clk_put (sfb->bus_clk); + } err_sfb:kfree (sfb);@@ -1442,8 +1493,20 @@ static int __devexit s3c_fb_remove(struct platform_device *pdev) iounmap(sfb->regs); -clk_disable (sfb->bus_clk); -clk_put (sfb->bus_clk);
Quoted 14 lines
Quoted 4 lines
drivers/video/s3c-fb.c +4
-0+switch (sfb->variant.clk_type) { +case FIMD_CLK_TYPE1 : +clk_disable (sfb->lcd_clk); +clk_put (sfb->lcd_clk);drivers/video/s3c-fb.c static int __devexit s3c_fb_remove(struct · line 1510
Quoted 10 lines
drivers/video/s3c-fb.c +10
-0+/* fall through to default case */ +case FIMD_CLK_TYPE0 : +clk_disable (sfb->bus_clk); +clk_put (sfb->bus_clk); +break ; +default : +dev_err (sfb->dev,"invalid clock type(%d)\n" , + sfb->variant.clk_type); +break ; + }
this code above is unnecessary anymore.
Quoted 35 lines
drivers/video/s3c-fb.c static int s3c_fb_suspend(struct platform_device
Quoted 4 lines
drivers/video/s3c-fb.c +0
-0release_resource (sfb->regs_res);kfree (sfb->regs_res);@@ -1470,6 +1533,7 @@ static int s3c_fb_suspend(struct platform_device*pdev,
drivers/video/s3c-fb.c static struct s3c_fb_driverdata
Quoted 9 lines
drivers/video/s3c-fb.c +1
-0pm_message_t state) }clk_disable (sfb->bus_clk); +return 0 ; }@@ -1656,6 +1720,37 @@ static struct s3c_fb_driverdata
s3c_fb_data_s5pv210
=Quoted 19 lines
drivers/video/s3c-fb.c +15
-0{ .win[4] = &s3c_fb_data_64xx_wins[4], }; +static struct s3c_fb_driverdata s3c_fb_data_s5pv310 = { + .variant = { + .nr_windows =5 , + .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 ,
Quoted 8 lines
drivers/video/s3c-fb.c static struct s3c_fb_driverdata · line 1746
Quoted 8 lines
drivers/video/s3c-fb.c +8
-0+ [1] = 0x2800, + [2] = 0x2c00, + [3] = 0x3000, + [4] = 0x3400, + }, + + .has_shadowcon = 1, + .clk_type = FIMD_CLK_TYPE1,
clk_type is unnecessary anymore.
Quoted 39 lines
drivers/video/s3c-fb.c static struct platform_device_id
Quoted 12 lines
drivers/video/s3c-fb.c +8
-0+ }, + .win[0] = &s3c_fb_data_64xx_wins[0], + .win[1] = &s3c_fb_data_64xx_wins[1], + .win[2] = &s3c_fb_data_64xx_wins[2], + .win[3] = &s3c_fb_data_64xx_wins[3], + .win[4] = &s3c_fb_data_64xx_wins[4], +}; +/* S3C2443/S3C2416 style hardware */ static struct s3c_fb_driverdata s3c_fb_data_s3c2443 = {drivers/video/s3c-fb.c +0
-0.variant = {@@ -1703,6 +1798,9 @@ static struct platform_device_ids3c_fb_driver_ids[]
=Quoted 11 lines
drivers/video/s3c-fb.c +3
-0{ .name = "s5pv210-fb", .driver_data = (unsigned long)&s3c_fb_data_s5pv210, }, { + .name = "s5pv310-fb", + .driver_data = (unsigned long)&s3c_fb_data_s5pv310, + }, { .name = "s3c2443-fb", .driver_data = (unsigned long)&s3c_fb_data_s3c2443,},
--Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.--
To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 3/4 s3c-fb: Add support S5PV310 FIMD
Quoted 4 lines · Inki Dae
(quoted diff) +0
-0@@ -1314,13 +1319,22 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev) sfb->pdata = pd; sfb->variant = fbdrv->variant;
Review static int __devinit s3c_fb_probe(struct · line 1328
Quoted 10 lines
(quoted diff) +6
-3- sfb->bus_clk = clk_get(dev, "lcd"); - if (IS_ERR(sfb->bus_clk)) { - dev_err(dev, "failed to get bus clock\n"); + /* if sclk_name is NULL then it would use bus clock as default. */ + if (!pd->sclk_name) + sfb->lcd_clk = clk_get(dev, "lcd"); + else + sfb->lcd_clk = clk_get(dev, pd->sclk_name); +
No, this is totally pointless. Simply establish a clk lookup for the configuration you are running on in your board code and always have clk_get() operate on a fixed id. You can use this same scheme with any optional clocks you have too, and reconfigure according to whether the lookups for optional clocks succeeded or not.
PATCH 3/4 s3c-fb: Add support S5PV310 FIMD
Quoted 16 lines
-----Original Message-----
From: Paul Mundt [mailto:lethal at linux-sh.org]
Sent: Friday, November 12, 2010 7:09 PM
To: Inki Dae
Cc: 'Kukjin Kim'; 'Sangbeom Kim'; linux-arm-kernel at lists.infradead.org; linux-samsung-soc at vger.kernel.org; linux-fbdev at vger.kernel.org; ben- linux at fluff.org; akpm at linux-foundation.org; 'Jonghun Han'
Subject: Re: [PATCH 3/4] s3c-fb: Add support S5PV310 FIMDQuoted 5 lines · Inki Dae
(quoted diff) +0
-0@@ -1314,13 +1319,22 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev) sfb->pdata = pd; sfb->variant = fbdrv->variant;
Quoted 11 lines
Review static int __devinit s3c_fb_probe(struct · line 1328
Quoted 9 lines
(quoted diff) +6
-3- sfb->bus_clk = clk_get(dev, "lcd"); - if (IS_ERR(sfb->bus_clk)) { - dev_err(dev, "failed to get bus clock\n"); + /* if sclk_name is NULL then it would use bus clock as default. */ + if (!pd->sclk_name) + sfb->lcd_clk = clk_get(dev, "lcd"); + else + sfb->lcd_clk = clk_get(dev, pd->sclk_name); +No, this is totally pointless. Simply establish a clk lookup for the configuration you are running on in your board code
You mean, call the function at s3c_fb_probe() establishing clk lookup in board code?
Sorry but I could understand. Please give me more detail.
Quoted 4 lines
and always have
clk_get()operate on a fixed id. You can use this same scheme with any optional clocks you have too, and reconfigure according to whether the lookups for optional clocks succeeded or not.
optional clocks could be sclk_name?
I will glad to show me some example for it.
thank you.
PATCH 3/4 s3c-fb: Add support S5PV310 FIMD
Quoted 27 lines · Inki Dae
Quoted 16 lines
-----Original Message-----
From: Paul Mundt [mailto:lethal at linux-sh.org]
Sent: Friday, November 12, 2010 7:09 PM
To: Inki Dae
Cc: 'Kukjin Kim'; 'Sangbeom Kim'; linux-arm-kernel at lists.infradead.org; linux-samsung-soc at vger.kernel.org; linux-fbdev at vger.kernel.org; ben- linux at fluff.org; akpm at linux-foundation.org; 'Jonghun Han'
Subject: Re: [PATCH 3/4] s3c-fb: Add support S5PV310 FIMDQuoted 5 lines · Inki Dae
(quoted diff) +0
-0@@ -1314,13 +1319,22 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev) sfb->pdata = pd; sfb->variant = fbdrv->variant;Quoted 11 lines
Review static int __devinit s3c_fb_probe(struct · line 1328
Quoted 9 lines
(quoted diff) +6
-3- sfb->bus_clk = clk_get(dev, "lcd"); - if (IS_ERR(sfb->bus_clk)) { - dev_err(dev, "failed to get bus clock\n"); + /* if sclk_name is NULL then it would use bus clock as default. */ + if (!pd->sclk_name) + sfb->lcd_clk = clk_get(dev, "lcd"); + else + sfb->lcd_clk = clk_get(dev, pd->sclk_name); +No, this is totally pointless. Simply establish a clk lookup for the configuration you are running on in your board code
Quoted 4 lines
You mean, call the function at
s3c_fb_probe()establishing clk lookup in board code?
Sorry but I could understand. Please give me more detail.
I mean use a clkdev lookup for resolving the clock instead of passing around a string via platform data. Look at the asm/clkdev.h API and all of the boards that are using it.
PATCH 4/4 ARM: S5PV310: Add platform data for S5PV310 FIMD and LTE480WV platform-lcd
In reply to Sangbeom KimFrom: Jonghun Han <[email protected]>
Some platform data for S5PV310 FIMD0 are added.
LTE480WV lcd pannel used by SMDKV310 are added via platform-lcd interface. extern helper functions used by machine file are added.
--- arch/arm/mach-s5pv310/mach-smdkv310.c | 72 +++++++++++++++++++++++++++++++ arch/arm/plat-samsung/include/plat/fb.h | 14 ++++++ 2 files changed, 86 insertions(+), 0 deletions(-)
arch/arm/mach-s5pv310/mach-smdkv310.c +72 -0
@@ -9,7 +9,9 @@*/ #include <linux/serial_core.h> +#include <linux/delay.h> #include <linux/gpio.h> +#include <linux/lcd.h> #include <linux/mmc/host.h> #include <linux/platform_device.h>
@@ -17,13 +19,17 @@#include <asm/mach-types.h> #include <asm/hardware/cache-l2x0.h> +#include <video/platform_lcd.h> +#include <plat/regs-serial.h> #include <plat/s5pv310.h> #include <plat/cpu.h> #include <plat/devs.h> +#include <plat/fb.h> #include <plat/sdhci.h> #include <mach/map.h> +#include <mach/regs-fb.h> /* Following are default values for UCON, ULCON and UFCON UART registers */ #define SMDKV310_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \
@@ -106,7 +112,71 @@ static struct s3c_sdhci_platdata smdkv310_hsmmc3_pdata __initdata = { .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL, }; +static void lcd_lte480wv_set_power (struct plat_lcd_data *pd, +unsigned int power) +{ +if (power) { +#if !defined(CONFIG_BACKLIGHT_PWM ) +gpio_request (S5PV310_GPD0 (1 ),"GPD0" ); +gpio_direction_output (S5PV310_GPD0 (1 ),1 ); +gpio_free (S5PV310_GPD0 (1 )); +#endif +/* fire nRESET on power up */ +gpio_request (S5PV310_GPX0 (6 ),"GPX0" ); + +gpio_direction_output (S5PV310_GPX0 (6 ),1 ); +mdelay (100 ); + +gpio_set_value (S5PV310_GPX0 (6 ),0 ); +mdelay (10 ); + +gpio_set_value (S5PV310_GPX0 (6 ),1 ); +mdelay (10 ); + +gpio_free (S5PV310_GPX0 (6 )); + }else { +#if !defined(CONFIG_BACKLIGHT_PWM ) +gpio_request (S5PV310_GPD0 (1 ),"GPD0" ); +gpio_direction_output (S5PV310_GPD0 (1 ),0 ); +gpio_free (S5PV310_GPD0 (1 )); +#endif + } +} + +static struct plat_lcd_data smdkv310_lcd_lte480wv_data = { + .set_power = lcd_lte480wv_set_power, +}; + +static struct platform_device smdkv310_lcd_lte480wv = { + .name ="platform-lcd" , + .dev.parent = &s5p_device_fimd0.dev, + .dev.platform_data = &smdkv310_lcd_lte480wv_data, +}; + +static struct s3c_fb_pd_win smdkv310_fb_win0 = { + .win_mode = { + .left_margin =13 , + .right_margin =8 , + .upper_margin =7 , + .lower_margin =5 , + .hsync_len =3 , + .vsync_len =1 , + .xres =800 , + .yres =480 , + }, + .max_bpp =32 , + .default_bpp =24 , +}; +static struct s3c_fb_platdata smdkv310_lcd0_pdata__initdata = { + .win[0 ] = &smdkv310_fb_win0, + .vidcon0 =VIDCON0_VIDOUT_RGB |VIDCON0_PNRMODE_RGB , + .vidcon1 =VIDCON1_INV_HSYNC |VIDCON1_INV_VSYNC , + .setup_gpio = s5pv310_fimd0_gpio_setup_24bpp, +}; +static struct platform_device *smdkv310_devices[]__initdata = { + &s5p_device_fimd0, + &smdkv310_lcd_lte480wv, &s3c_device_hsmmc0, &s3c_device_hsmmc1, &s3c_device_hsmmc2,
@@ -133,6 +203,8 @@ static void __init smdkv310_machine_init(void)l2x0_init (S5P_VA_L2CC ,1 <<28 ,0xffffffff );#endif +s5p_fimd0_set_platdata (&smdkv310_lcd0_pdata); +platform_add_devices (smdkv310_devices,ARRAY_SIZE (smdkv310_devices)); }
arch/arm/plat-samsung/include/plat/fb.h +14 -0
@@ -74,6 +74,14 @@ struct s3c_fb_platdata {extern void s3c_fb_set_platdata (struct s3c_fb_platdata *pd);/** +* s5p_fimd0_set_platdata() - Setup the FB device with platform data. +* @pd: The platform data to set. The data is copied from the passed structure +* so the machine data can mark the data __initdata so that any unused +* machines will end up dumping their data@runtime. +*/ +extern void s5p_fimd0_set_platdata (struct s3c_fb_platdata *pd); + +/** * s3c64xx_fb_gpio_setup_24bpp() - S3C64XX setup function for 24bpp LCD * * Initialise the GPIO for an 24bpp LCD display on the RGB interface.
@@ -94,4 +102,10 @@ extern void s5pc100_fb_gpio_setup_24bpp(void);*/ extern void s5pv210_fb_gpio_setup_24bpp (void ); +/** +* s5pv310_fimd0_gpio_setup_24bpp() - S5PV310/S5PC210 setup function for 24bpp LCD0 +* +* Initialise the GPIO for an 24bpp LCD display on the RGB interface 0. +*/ +extern void s5pv310_fimd0_gpio_setup_24bpp (void );#endif /* __PLAT_S3C_FB_H */
Signature · 1 line
1.6.2.5
PATCH 4/4 ARM: S5PV310: Add platform data for S5PV310 FIMD and LTE480WV platform-lcd
Hello,
Quoted 35 lines · Sangbeom Kim
From: Jonghun Han <[email protected]>
Some platform data for S5PV310 FIMD0 are added.
LTE480WV lcd pannel used by SMDKV310 are added via platform-lcd interface. extern helper functions used by machine file are added.Signed-off-by Jonghun Han <[email protected]>Signed-off-by Sangbeom Kim <[email protected]>--- arch/arm/mach-s5pv310/mach-smdkv310.c | 72 +++++++++++++++++++++++++++++++ arch/arm/plat-samsung/include/plat/fb.h | 14 ++++++ 2 files changed, 86 insertions(+), 0 deletions(-)...
arch/arm/plat-samsung/include/plat/fb.h +8
-0@@ -74,6 +74,14 @@ struct s3c_fb_platdata {extern void s3c_fb_set_platdata (struct s3c_fb_platdata *pd);/** +* s5p_fimd0_set_platdata() - Setup the FB device with platform data. +* @pd: The platform data to set. The data is copied from the passed structure +* so the machine data can mark the data __initdata so that any unused +* machines will end up dumping their data at runtime. +*/ +extern void s5p_fimd0_set_platdata (struct s3c_fb_platdata *pd); + +/** * s3c64xx_fb_gpio_setup_24bpp() - S3C64XX setup function for 24bpp LCD * * Initialise the GPIO for an 24bpp LCD display on the RGB interface.
arch/arm/plat-samsung/include/plat/fb.h extern void s5pc100_fb_gpio_setup_24bpp(void); · line 111
Quoted 10 lines
arch/arm/plat-samsung/include/plat/fb.h +6
-0@@ -94,4 +102,10 @@ extern void s5pc100_fb_gpio_setup_24bpp(void);*/ extern void s5pv210_fb_gpio_setup_24bpp (void ); +/** +* s5pv310_fimd0_gpio_setup_24bpp() - S5PV310/S5PC210 setup function for 24bpp LCD0 +* +* Initialise the GPIO for an 24bpp LCD display on the RGB interface 0. +*/ +extern void s5pv310_fimd0_gpio_setup_24bpp (void );#endif /* __PLAT_S3C_FB_H */
Changes to arch/arm/plat-samsung/include/plat/fb.h file should go together with patch 2/4 from your series - they are not related to SMDK board at all.
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center