arm: mxs: Add LCDIF clock configuration function
Subsystems (3)
PATCH 1/4 arm: mxs: Add LCDIF clock configuration function
This function turns on the LCDIF clock and configures it's frequency. The dividers settings are calculated within the function and the current implementation should be fast and accurate.
--- arch/arm/cpu/arm926ejs/mxs/clock.c | 93 +++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mxs/clock.h | 1 + 2 files changed, 94 insertions(+)
arch/arm/cpu/arm926ejs/mxs/clock.c +93 -0
@@ -325,6 +325,99 @@ void mxs_set_ssp_busclock(unsigned int bus, uint32_t freq) bus, tgtclk, freq); } +void mxs_set_lcdclk (uint32_t freq) +{ +struct mxs_clkctrl_regs *clkctrl_regs = + (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE ; +uint32_t fp, x, k_rest, k_best, x_best, tk; +int32_t k_best_l =999 , k_best_t =0 , x_best_l =0xff , x_best_t =0xff ; + +if (freq ==0 ) +return ; + +#if defined(CONFIG_MX23 ) +writel (CLKCTRL_CLKSEQ_BYPASS_PIX , &clkctrl_regs->hw_clkctrl_clkseq_clr); +#elif defined(CONFIG_MX28 ) +writel (CLKCTRL_CLKSEQ_BYPASS_DIS_LCDIF , &clkctrl_regs->hw_clkctrl_clkseq_clr); +#endif + +/* +* / 18 \ 1 1 +* freq kHz = | 480000000 Hz * -- | * --- * ------ +* \ x / k 1000 +* +* 480000000 Hz 18 +* ------------ * -- +* freq kHz x +* k = ------------------- +* 1000 +*/ + + fp = ((PLL_FREQ_KHZ *1000 ) / freq) *18 ; + +for (x =18 ; x <=35 ; x++) { + tk = fp / x; +if ((tk /1000 ==0 ) || (tk /1000 >255 )) +continue ; + + k_rest = tk %1000 ; + +if (k_rest < (k_best_l %1000 )) { + k_best_l = tk; + x_best_l = x; + } + +if (k_rest > (k_best_t %1000 )) { + k_best_t = tk; + x_best_t = x; + } + } + +if (1000 - (k_best_t %1000 ) > (k_best_l %1000 )) { + k_best = k_best_l; + x_best = x_best_l; + }else { + k_best = k_best_t; + x_best = x_best_t; + } + + k_best /=1000 ; + +#if defined(CONFIG_MX23 ) +writeb (CLKCTRL_FRAC_CLKGATE , + &clkctrl_regs->hw_clkctrl_frac0_set[CLKCTRL_FRAC0_PIX ]); +writeb (CLKCTRL_FRAC_CLKGATE | (x_best &CLKCTRL_FRAC_FRAC_MASK ), + &clkctrl_regs->hw_clkctrl_frac0[CLKCTRL_FRAC0_PIX ]); +writeb (CLKCTRL_FRAC_CLKGATE , + &clkctrl_regs->hw_clkctrl_frac0_clr[CLKCTRL_FRAC0_PIX ]); + +writel (CLKCTRL_PIX_CLKGATE , + &clkctrl_regs->hw_clkctrl_pix_set); +clrsetbits_le32 (&clkctrl_regs->hw_clkctrl_pix, +CLKCTRL_PIX_DIV_MASK |CLKCTRL_PIX_CLKGATE , + k_best <<CLKCTRL_PIX_DIV_OFFSET ); + +while (readl (&clkctrl_regs->hw_clkctrl_pix) &CLKCTRL_PIX_BUSY ) + ; +#elif defined(CONFIG_MX28 ) +writeb (CLKCTRL_FRAC_CLKGATE , + &clkctrl_regs->hw_clkctrl_frac1_set[CLKCTRL_FRAC1_PIX ]); +writeb (CLKCTRL_FRAC_CLKGATE | (x_best &CLKCTRL_FRAC_FRAC_MASK ), + &clkctrl_regs->hw_clkctrl_frac1[CLKCTRL_FRAC1_PIX ]); +writeb (CLKCTRL_FRAC_CLKGATE , + &clkctrl_regs->hw_clkctrl_frac1_clr[CLKCTRL_FRAC1_PIX ]); + +writel (CLKCTRL_DIS_LCDIF_CLKGATE , + &clkctrl_regs->hw_clkctrl_lcdif_set); +clrsetbits_le32 (&clkctrl_regs->hw_clkctrl_lcdif, +CLKCTRL_DIS_LCDIF_DIV_MASK |CLKCTRL_DIS_LCDIF_CLKGATE , + k_best <<CLKCTRL_DIS_LCDIF_DIV_OFFSET ); + +while (readl (&clkctrl_regs->hw_clkctrl_lcdif) &CLKCTRL_DIS_LCDIF_BUSY ) + ; +#endif +} +uint32_t mxc_get_clock (enum mxc_clock clk) {switch (clk) {
arch/arm/include/asm/arch-mxs/clock.h +1 -0
@@ -59,6 +59,7 @@ uint32_t mxc_get_clock(enum mxc_clock clk);void mxs_set_ioclk (enum mxs_ioclock io,uint32_t freq);void mxs_set_sspclk (enum mxs_sspclock ssp,uint32_t freq,int xtal);void mxs_set_ssp_busclock (unsigned int bus,uint32_t freq); +void mxs_set_lcdclk (uint32_t freq);/* Compatibility with the FEC Ethernet driver */ #define imx_get_fecclk () mxc_get_clock(MXC_AHB_CLK)
Signature · 1 line
1.7.10.4
PATCH 1/4 arm: mxs: Add LCDIF clock configuration function
Hi Stefano,
you missed these.
Quoted 123 lines
This function turns on the LCDIF clock and configures it's frequency. The dividers settings are calculated within the function and the current implementation should be fast and accurate.
Signed-off-by Marek Vasut <[email protected]>Cc Fabio Estevam <[email protected]>Cc Otavio Salvador <[email protected]>Cc Stefano Babic <[email protected]>--- arch/arm/cpu/arm926ejs/mxs/clock.c | 93 +++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mxs/clock.h | 1 + 2 files changed, 94 insertions(+)(quoted diff) +0
-0
b/arch/arm/cpu/arm926ejs/mxs/clock.cindex 43e7663..f94107f 100644arch/arm/cpu/arm926ejs/mxs/clock.c +14
-0@@ -325,6 +325,99 @@ void mxs_set_ssp_busclock(unsigned int bus, uint32_t freq) bus, tgtclk, freq); } +void mxs_set_lcdclk (uint32_t freq) +{ +struct mxs_clkctrl_regs *clkctrl_regs = + (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE ; +uint32_t fp, x, k_rest, k_best, x_best, tk; +int32_t k_best_l =999 , k_best_t =0 , x_best_l =0xff , x_best_t =0xff ; + +if (freq ==0 ) +return ; + +#if defined(CONFIG_MX23 ) +writel (CLKCTRL_CLKSEQ_BYPASS_PIX , &clkctrl_regs->hw_clkctrl_clkseq_clr); +#elif defined(CONFIG_MX28 ) + writel(CLKCTRL_CLKSEQ_BYPASS_DIS_LCDIF,
&clkctrl_regs->hw_clkctrl_clkseq_clr); +#endifarch/arm/cpu/arm926ejs/mxs/clock.c +78
-0+ +/* +* / 18 \ 1 1 +* freq kHz = | 480000000 Hz * -- | * --- * ------ +* \ x / k 1000 +* +* 480000000 Hz 18 +* ------------ * -- +* freq kHz x +* k = ------------------- +* 1000 +*/ + + fp = ((PLL_FREQ_KHZ *1000 ) / freq) *18 ; + +for (x =18 ; x <=35 ; x++) { + tk = fp / x; +if ((tk /1000 ==0 ) || (tk /1000 >255 )) +continue ; + + k_rest = tk %1000 ; + +if (k_rest < (k_best_l %1000 )) { + k_best_l = tk; + x_best_l = x; + } + +if (k_rest > (k_best_t %1000 )) { + k_best_t = tk; + x_best_t = x; + } + } + +if (1000 - (k_best_t %1000 ) > (k_best_l %1000 )) { + k_best = k_best_l; + x_best = x_best_l; + }else { + k_best = k_best_t; + x_best = x_best_t; + } + + k_best /=1000 ; + +#if defined(CONFIG_MX23 ) +writeb (CLKCTRL_FRAC_CLKGATE , + &clkctrl_regs->hw_clkctrl_frac0_set[CLKCTRL_FRAC0_PIX ]); +writeb (CLKCTRL_FRAC_CLKGATE | (x_best &CLKCTRL_FRAC_FRAC_MASK ), + &clkctrl_regs->hw_clkctrl_frac0[CLKCTRL_FRAC0_PIX ]); +writeb (CLKCTRL_FRAC_CLKGATE , + &clkctrl_regs->hw_clkctrl_frac0_clr[CLKCTRL_FRAC0_PIX ]); + +writel (CLKCTRL_PIX_CLKGATE , + &clkctrl_regs->hw_clkctrl_pix_set); +clrsetbits_le32 (&clkctrl_regs->hw_clkctrl_pix, +CLKCTRL_PIX_DIV_MASK |CLKCTRL_PIX_CLKGATE , + k_best <<CLKCTRL_PIX_DIV_OFFSET ); + +while (readl (&clkctrl_regs->hw_clkctrl_pix) &CLKCTRL_PIX_BUSY ) + ; +#elif defined(CONFIG_MX28 ) +writeb (CLKCTRL_FRAC_CLKGATE , + &clkctrl_regs->hw_clkctrl_frac1_set[CLKCTRL_FRAC1_PIX ]); +writeb (CLKCTRL_FRAC_CLKGATE | (x_best &CLKCTRL_FRAC_FRAC_MASK ), + &clkctrl_regs->hw_clkctrl_frac1[CLKCTRL_FRAC1_PIX ]); +writeb (CLKCTRL_FRAC_CLKGATE , + &clkctrl_regs->hw_clkctrl_frac1_clr[CLKCTRL_FRAC1_PIX ]); + +writel (CLKCTRL_DIS_LCDIF_CLKGATE , + &clkctrl_regs->hw_clkctrl_lcdif_set); +clrsetbits_le32 (&clkctrl_regs->hw_clkctrl_lcdif, +CLKCTRL_DIS_LCDIF_DIV_MASK |CLKCTRL_DIS_LCDIF_CLKGATE , + k_best <<CLKCTRL_DIS_LCDIF_DIV_OFFSET ); + +while (readl (&clkctrl_regs->hw_clkctrl_lcdif) &CLKCTRL_DIS_LCDIF_BUSY ) + ; +#endif +} +uint32_t mxc_get_clock (enum mxc_clock clk) {switch (clk) {(quoted diff) +0
-0
b/arch/arm/include/asm/arch-mxs/clock.hindex 3f7d3f0..9be53f0 100644
arch/arm/include/asm/arch-mxs/clock.h uint32_t mxc_get_clock(enum mxc_clock clk); · line 65
Quoted 7 lines
arch/arm/include/asm/arch-mxs/clock.h +1
-0@@ -59,6 +59,7 @@ uint32_t mxc_get_clock(enum mxc_clock clk);void mxs_set_ioclk (enum mxs_ioclock io,uint32_t freq);void mxs_set_sspclk (enum mxs_sspclock ssp,uint32_t freq,int xtal);void mxs_set_ssp_busclock (unsigned int bus,uint32_t freq); +void mxs_set_lcdclk (uint32_t freq);/* Compatibility with the FEC Ethernet driver */ #define imx_get_fecclk () mxc_get_clock(MXC_AHB_CLK)
Best regards,
Marek Vasut
PATCH 2/4 arm: mxs: Add LCDIF registers for i.MX233
In reply to Marek VasutExtend the regs-lcdif.h with registers for i.MX233.
--- arch/arm/include/asm/arch-mxs/regs-lcdif.h | 36 +++++++++++++++++++++------- 1 file changed, 27 insertions(+), 9 deletions(-)
arch/arm/include/asm/arch-mxs/regs-lcdif.h +27 -9
@@ -32,10 +32,17 @@struct mxs_lcdif_regs {mxs_reg_32 (hw_lcdif_ctrl)/* 0x00 */ mxs_reg_32(hw_lcdif_ctrl1) /* 0x10 */ +#if defined(CONFIG_MX28 ) mxs_reg_32(hw_lcdif_ctrl2) /* 0x20 */ - mxs_reg_32(hw_lcdif_transfer_count) /* 0x30 */ -mxs_reg_32 (hw_lcdif_cur_buf)/* 0x40 */ - mxs_reg_32(hw_lcdif_next_buf) /* 0x50 */ +#endif +mxs_reg_32 (hw_lcdif_transfer_count)/* 0x20/0x30 */ + mxs_reg_32(hw_lcdif_cur_buf) /* 0x30/0x40 */ + mxs_reg_32(hw_lcdif_next_buf) /* 0x40/0x50 */ + +#if defined(CONFIG_MX23 ) +uint32_t reserved1[4 ]; +#endif +mxs_reg_32 (hw_lcdif_timing)/* 0x60 */ mxs_reg_32(hw_lcdif_vdctrl0) /* 0x70 */mxs_reg_32 (hw_lcdif_vdctrl1)/* 0x80 */
@@ -54,13 +61,19 @@ struct mxs_lcdif_regs { mxs_reg_32(hw_lcdif_csc_coeffctrl4) /* 0x150 */ mxs_reg_32(hw_lcdif_csc_offset) /* 0x160 */ mxs_reg_32(hw_lcdif_csc_limit) /* 0x170 */ - mxs_reg_32(hw_lcdif_data) /* 0x180 */ - mxs_reg_32(hw_lcdif_bm_error_stat) /* 0x190 */ + +#if defined(CONFIG_MX23 ) +uint32_t reserved2[12 ]; +#endif + mxs_reg_32(hw_lcdif_data) /* 0x1b0/0x180 */ + mxs_reg_32(hw_lcdif_bm_error_stat) /* 0x1c0/0x190 */ +#if defined(CONFIG_MX28 ) mxs_reg_32(hw_lcdif_crc_stat) /* 0x1a0 */ - mxs_reg_32(hw_lcdif_lcdif_stat) /* 0x1b0 */ - mxs_reg_32(hw_lcdif_version) /* 0x1c0 */ - mxs_reg_32(hw_lcdif_debug0) /* 0x1d0 */ - mxs_reg_32(hw_lcdif_debug1) /* 0x1e0 */ +#endif + mxs_reg_32(hw_lcdif_lcdif_stat) /* 0x1d0/0x1b0 */ + mxs_reg_32(hw_lcdif_version) /* 0x1e0/0x1c0 */ + mxs_reg_32(hw_lcdif_debug0) /* 0x1f0/0x1d0 */ + mxs_reg_32(hw_lcdif_debug1) /* 0x200/0x1e0 */ mxs_reg_32(hw_lcdif_debug2) /* 0x1f0 */ };#endif
@@ -191,8 +204,13 @@ struct mxs_lcdif_regs {#define LCDIF_VDCTRL1_VSYNC_PERIOD_MASK 0xffffffff#define LCDIF_VDCTRL1_VSYNC_PERIOD_OFFSET 0 +#if defined(CONFIG_MX23 ) +#define LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH_MASK (0xff << 24) +#define LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH_OFFSET 24 +#elif defined(CONFIG_MX28 )#define LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH_MASK (0x3fff << 18)#define LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH_OFFSET 18 +#endif #define LCDIF_VDCTRL2_HSYNC_PERIOD_MASK 0x3ffff#define LCDIF_VDCTRL2_HSYNC_PERIOD_OFFSET 0
Signature · 1 line
1.7.10.4
PATCH 2/4 arm: mxs: Add LCDIF registers for i.MX233
Quoted 7 lines · Marek Vasut
Extend the
regs-lcdif.hwith registers for i.MX233.Signed-off-by Marek Vasut <[email protected]>Cc Fabio Estevam <[email protected]>Cc Otavio Salvador <[email protected]>Cc Stefano Babic <[email protected]>---
Applied to u-boot-imx, thanks.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 3/4 arm: mxs: Add MXS LCDIF driver
In reply to Marek VasutAdd basic LCD driver for i.MX233 and i.MX28. This driver allows framebuffer console and framebuffer logo.
--- drivers/video/Makefile | 1 + drivers/video/cfb_console.c | 4 + drivers/video/mxsfb.c | 189 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 194 insertions(+) create mode 100644 drivers/video/mxsfb.c
drivers/video/Makefile +1 -0
@@ -49,6 +49,7 @@ COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o videomodes.o COBJS-$(CONFIG_VIDEO_MB86R0xGDC) += mb86r0xgdc.o videomodes.o COBJS-$(CONFIG_VIDEO_MX3) += mx3fb.o videomodes.o COBJS-$(CONFIG_VIDEO_IPUV3) += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o +COBJS-$(CONFIG_VIDEO_MXS) += mxsfb.o videomodes.o COBJS-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o COBJS-$(CONFIG_VIDEO_SM501) += sm501.o
drivers/video/cfb_console.c +4 -0
@@ -151,6 +151,10 @@#endif #endif +#ifdef CONFIG_VIDEO_MXS +#define VIDEO_FB_16BPP_WORD_SWAP +#endif +/* * Defines for the MB862xx driver */
drivers/video/mxsfb.c new file +189 -0
189 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 3/4 arm: mxs: Add MXS LCDIF driver
Quoted 8 lines · On Sun, 28 Apr 2013 21:20:03 +0200 Marek Vasut <[email protected]> wrote:
Add basic LCD driver for i.MX233 and i.MX28. This driver allows framebuffer console and framebuffer logo.
Signed-off-by Marek Vasut <[email protected]>Cc Anatolij Gustschin <[email protected]>Cc Fabio Estevam <[email protected]>Cc Otavio Salvador <[email protected]>Cc Stefano Babic <[email protected]>
PATCH 3/4 arm: mxs: Add MXS LCDIF driver
Quoted 6 lines · Anatolij Gustschin
Quoted 3 lines · On Sun, 28 Apr 2013 21:20:03 +0200 Marek Vasut <[email protected]> wrote:
Add basic LCD driver for i.MX233 and i.MX28. This driver allows framebuffer console and framebuffer logo.
Quoted 8 lines
Quoted 5 lines
Signed-off-by Marek Vasut <[email protected]>Cc Anatolij Gustschin <[email protected]>Cc Fabio Estevam <[email protected]>Cc Otavio Salvador <[email protected]>Cc Stefano Babic <[email protected]>
Thanks, Anatolji
Marek, also this patchset will flow now.
Regards,
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 3/4 arm: mxs: Add MXS LCDIF driver
In reply to Marek VasutQuoted 9 lines · Marek Vasut
Add basic LCD driver for i.MX233 and i.MX28. This driver allows framebuffer console and framebuffer logo.
Signed-off-by Marek Vasut <[email protected]>Cc Anatolij Gustschin <[email protected]>Cc Fabio Estevam <[email protected]>Cc Otavio Salvador <[email protected]>Cc Stefano Babic <[email protected]>---
Applied to u-boot-imx, thanks.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 4/4 arm: mxs: video: Enable MXS LCDIF on M28EVK
In reply to Marek VasutEnable LCD output support on M28EVK.
--- include/configs/m28evk.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
include/configs/m28evk.h +19 -0
@@ -76,6 +76,7 @@#define CONFIG_CMD_SF #define CONFIG_CMD_SPI #define CONFIG_CMD_USB +#define CONFIG_VIDEO /* * Memory configurations
@@ -268,6 +269,24 @@#endif /* +* LCD +*/ +#ifdef CONFIG_VIDEO +#define CONFIG_CFB_CONSOLE +#define CONFIG_VIDEO_MXS +#define CONFIG_VIDEO_LOGO +#define CONFIG_VIDEO_SW_CURSOR +#define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_SPLASH_SCREEN +#define CONFIG_CMD_BMP +#define CONFIG_BMP_16BPP +#define CONFIG_VIDEO_BMP_RLE8 +#define CONFIG_VIDEO_BMP_GZIP +#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10) +#endif + +/* * Boot Linux */ #define CONFIG_CMDLINE_TAG
Signature · 1 line
1.7.10.4
PATCH 4/4 arm: mxs: video: Enable MXS LCDIF on M28EVK
Quoted 7 lines · On Sun, 28 Apr 2013 21:20:04 +0200 Marek Vasut <[email protected]> wrote:
Enable LCD output support on M28EVK.
Signed-off-by Marek Vasut <[email protected]>Cc Anatolij Gustschin <[email protected]>Cc Fabio Estevam <[email protected]>Cc Otavio Salvador <[email protected]>Cc Stefano Babic <[email protected]>
PATCH 4/4 arm: mxs: video: Enable MXS LCDIF on M28EVK
In reply to Marek VasutQuoted 8 lines · Marek Vasut
Enable LCD output support on M28EVK.
Signed-off-by Marek Vasut <[email protected]>Cc Anatolij Gustschin <[email protected]>Cc Fabio Estevam <[email protected]>Cc Otavio Salvador <[email protected]>Cc Stefano Babic <[email protected]>---
Applied to u-boot-imx, thanks.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 1/4 arm: mxs: Add LCDIF clock configuration function
In reply to Marek VasutQuoted 9 lines · Marek Vasut
This function turns on the LCDIF clock and configures it's frequency. The dividers settings are calculated within the function and the current implementation should be fast and accurate.
Signed-off-by Marek Vasut <[email protected]>Cc Fabio Estevam <[email protected]>Cc Otavio Salvador <[email protected]>Cc Stefano Babic <[email protected]>---
Applied to u-boot-imx, thanks.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================