mpc52xx: IPEK01 board support
Subsystems (2)
v2 cover mpc52xx: IPEK01 board support
This patch add support for the IPEK01 MPC5200 based board. It requires three patches for the Fujitsu MB862xx driver.
Changes since v1:
- send patches properly
Wolfgang
Anatolij Gustschin (1):
video: mb862xx: add option CONFIG_VIDEO_MB862xx_ACCEL for 32bpp mode
Wolfgang Grandegger (3):
video: mb862xx: improve board-specific Lime configuration
video: mb862xx: add option VIDEO_FB_16BPP_WORD_SWAP for IPEK01
mpc52xx: add support for the IPEK01 board
MAINTAINERS | 2 + MAKEALL | 1 + Makefile | 3 + board/ipek01/Makefile | 50 ++++++ board/ipek01/config.mk | 30 +++ board/ipek01/ipek01.c | 282 +++++++++++++++++++++++++++++ board/lwmon5/lwmon5.c | 7 - board/socrates/socrates.c | 46 +---- drivers/video/cfb_console.c | 4 +- drivers/video/mb862xx.c | 50 +++++- include/configs/ipek01.h | 408 +++++++++++++++++++++++++++++++++++++++++++ include/configs/lwmon5.h | 12 +- include/configs/socrates.h | 7 + include/mb862xx.h | 5 + 14 files changed, 852 insertions(+), 55 deletions(-) create mode 100644 board/ipek01/Makefile create mode 100644 board/ipek01/config.mk create mode 100644 board/ipek01/ipek01.c create mode 100644 include/configs/ipek01.h
PATCH v2 1/4 video: mb862xx: improve board-specific Lime configuration
From: Wolfgang Grandegger <[email protected]>
To avoid board-specific code accessing the mb862xx registers directly, the public function mb862xx_probe() has been introduced. Furthermore, the "Change of Clock Frequency" and "Set Memory I/F Mode" registers are now defined by CONFIG_SYS_MB862xx_CCF and CONFIG_SYS_MB862xx__MMR, respectively. The BSPs for the socrates and lwmon5 boards have been adapted accordingly.
--- board/lwmon5/lwmon5.c | 7 ------ board/socrates/socrates.c | 46 ++++++------------------------------------- drivers/video/mb862xx.c | 34 +++++++++++++++++++++++++++++++- include/configs/lwmon5.h | 10 +++----- include/configs/socrates.h | 5 ++++ include/mb862xx.h | 5 ++++ 6 files changed, 54 insertions(+), 53 deletions(-)
board/lwmon5/lwmon5.c +0 -7
@@ -532,13 +532,6 @@ unsigned int board_video_init (void)udelay (500 );gpio_write_bit (CONFIG_SYS_GPIO_LIME_RST ,1 ); -/* Lime memory clock adjusted to 100MHz */ -out_be32 ((void *)CONFIG_SYS_LIME_SDRAM_CLOCK ,CONFIG_SYS_LIME_CLOCK_100MHZ ); -/* Wait untill time expired. Because of requirements in lime manual */ -udelay (300 ); -/* Write lime controller memory parameters */ -out_be32 ((void *)CONFIG_SYS_LIME_MMR ,CONFIG_SYS_LIME_MMR_VALUE ); - mb862xx.winSizeX =640 ; mb862xx.winSizeY =480 ; mb862xx.gdfBytesPP =2 ;
board/socrates/socrates.c +7 -39
80 lines not on this page · raw message
drivers/video/mb862xx.c +33 -1
@@ -340,6 +340,30 @@ unsigned int card_init (void) }#endif + +#if !defined(CONFIG_VIDEO_CORALP ) +int mb862xx_probe (unsigned int addr) +{ +GraphicDevice *dev = &mb862xx; +unsigned int reg; + + dev->frameAdrs = addr; + dev->dprBase = dev->frameAdrs +GC_DRAW_BASE ; + +/* Try to access GDC ID/Revision registers */ + reg =HOST_RD_REG (GC_CID ); + reg =HOST_RD_REG (GC_CID ); +if (reg ==0x303 ) { + reg =DE_RD_REG (GC_REV ); + reg =DE_RD_REG (GC_REV ); +if ((reg & ~0xff ) ==0x20050100 ) +return MB862XX_TYPE_LIME ; + } + +return 0 ; +} +#endif +void *video_hw_init (void ) {GraphicDevice *dev = &mb862xx;
@@ -359,8 +383,16 @@ void *video_hw_init (void)if ((dev->frameAdrs =board_video_init ()) ==0 ) {puts ("Controller not found!\n" );return NULL ; - }else + }else {puts ("Lime\n" ); + +/* Set Change of Clock Frequency Register */ +HOST_WR_REG (GC_CCF , CONFIG_SYS_MB862xx_CCF); +/* Delay required */ +udelay (300 ); +/* Set Memory I/F Mode Register) */ +HOST_WR_REG (GC_MMR , CONFIG_SYS_MB862xx_MMR); + }#endif de_init ();
include/configs/lwmon5.h +4 -6
@@ -495,8 +495,6 @@/*----------------------------------------------------------------------- * Graphics (Fujitsu Lime) *----------------------------------------------------------------------*/ -/* SDRAM Clock frequency adjustment register */ -#define CONFIG_SYS_LIME_SDRAM_CLOCK 0xC1FC0038/* Lime Clock frequency is to set 100MHz */ #define CONFIG_SYS_LIME_CLOCK_100MHZ 0x00000#if 0
@@ -504,15 +502,15 @@#define CONFIG_SYS_LIME_CLOCK_133MHZ 0x10000#endif -/* SDRAM Parameter register */ -#define CONFIG_SYS_LIME_MMR 0xC1FCFFFC/* SDRAM parameter value; was 0x414FB7F2, caused several vertical bars and pixel flare on display when 133MHz was configured. According to SDRAM chip datasheet CAS Latency is 3 for 133MHz and -75 Speed Grade */ #ifdef CONFIG_SYS_LIME_CLOCK_133MHZ -#define CONFIG_SYS_LIME_MMR_VALUE 0x414FB7F3 +#define CONFIG_SYS_MB862xx_MMR 0x414FB7F3 +#define CONFIG_SYS_MB862xx_CCF CONFIG_SYS_LIME_CLOCK_133MHZ#else -#define CONFIG_SYS_LIME_MMR_VALUE 0x414FB7F2 +#define CONFIG_SYS_MB862xx_MMR 0x414FB7F2 +#define CONFIG_SYS_MB862xx_CCF CONFIG_SYS_LIME_CLOCK_100MHZ#endif /*-----------------------------------------------------------------------
include/configs/socrates.h +5 -0
@@ -210,6 +210,11 @@#define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)/* decompressed img */ +/* SDRAM Clock frequency, 100MHz (0x0000) or 133MHz (0x10000) */ +#define CONFIG_SYS_MB862xx_CCF 0x10000 +/* SDRAM parameter */ +#define CONFIG_SYS_MB862xx_MMR 0x4157BA63 +/* Serial Port */ #define CONFIG_CONS_INDEX 1
include/mb862xx.h +5 -0
@@ -32,6 +32,8 @@#define PCI_DEVICE_ID_CORAL_P 0x2019#define PCI_DEVICE_ID_CORAL_PA 0x201E +#define MB862XX_TYPE_LIME 0x1 +#define GC_HOST_BASE 0x01fc0000#define GC_DISP_BASE 0x01fd0000#define GC_DRAW_BASE 0x01ff0000
@@ -39,6 +41,7 @@/* Host interface registers */ #define GC_SRST 0x0000002c#define GC_CCF 0x00000038 +#define GC_CID 0x000000f0#define GC_MMR 0x0000fffc/*
@@ -99,6 +102,7 @@#define GC_FC 0x00000480#define GC_BC 0x00000484#define GC_FIFO 0x000004a0 +#define GC_REV 0x00008084#define GC_GEO_FIFO 0x00008400 typedef struct {
@@ -106,6 +110,7 @@ typedef struct {unsigned int value; } gdc_regs; +int mb862xx_probe (unsigned int addr);const gdc_regs *board_get_regs (void );unsigned int board_video_init (void );void board_backlight_switch (int );
Signature · 1 line
1.6.2.5
PATCH v2 2/4 video: mb862xx: add option CONFIG_VIDEO_MB862xx_ACCEL for 32bpp mode
From: Anatolij Gustschin <[email protected]>
The new IPEK01 board can use the 32 bpp mode for the Lime graphics controller. For this mode, video accelaration does not work. This patch makes the accelaration configurable via CONFIG_VIDEO_MB862xx_ACCEL, which is enabled for the lwmon5 and the socrates board for backward compatibility.
--- drivers/video/cfb_console.c | 2 ++ drivers/video/mb862xx.c | 16 +++++++++++++++- include/configs/lwmon5.h | 1 + include/configs/socrates.h | 1 + 4 files changed, 19 insertions(+), 1 deletions(-)
drivers/video/cfb_console.c +2 -0
@@ -146,9 +146,11 @@ CONFIG_VIDEO_HW_CURSOR: - Uses the hardware cursor capability of the#ifdef CONFIG_VIDEO_CORALP #define VIDEO_FB_LITTLE_ENDIAN #endif +#ifdef CONFIG_VIDEO_MB862xx_ACCEL#define VIDEO_HW_RECTFILL #define VIDEO_HW_BITBLT #endif +#endif /*****************************************************************************/ /* Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc */
drivers/video/mb862xx.c +15 -1
@@ -89,6 +89,7 @@ unsigned int fr_div[] = { 0x00000f00, 0x00000900, 0x00000500 }; (GC_DISP_BASE | GC_L0PAL0) + \ ((idx) << 2)), (val)) +#if defined(CONFIG_VIDEO_MB862xx_ACCEL)static void gdc_sw_reset (void ) {GraphicDevice *dev = &mb862xx;
@@ -129,6 +130,7 @@ static void de_wait_slots (int slots) break; } } +#endif #if !defined(CONFIG_VIDEO_CORALP )static void board_disp_init (void )
@@ -144,11 +146,13 @@ static void board_disp_init (void)#endif /* -* Init drawing engine +* Init drawing engine if accel enabled. +* Also clears visible framebuffer. */ static void de_init (void ) {GraphicDevice *dev = &mb862xx; +#if defined(CONFIG_VIDEO_MB862xx_ACCEL)int cf = (dev->gdfBytesPP ==1 ) ?0x0000 :0x8000 ; dev->dprBase = dev->frameAdrs +GC_DRAW_BASE ;
@@ -174,6 +178,14 @@ static void de_init (void)DE_WR_FIFO (dev->winSizeY <<16 | dev->winSizeX);/* sync with SW access to framebuffer */ de_wait (); +#else +unsigned int i, *p; + + i = dev->winSizeX * dev->winSizeY; + p = (unsigned int *)dev->frameAdrs; +while (i--) + *p++ =0 ; +#endif }#if defined(CONFIG_VIDEO_CORALP )
@@ -421,6 +433,7 @@ void video_set_lut (unsigned int index, unsigned char r,L0PAL_WR_REG (index, (r <<16 ) | (g <<8 ) | (b)); } +#if defined(CONFIG_VIDEO_MB862xx_ACCEL)/* * Drawing engine Fill and BitBlt screen region */
@@ -462,3 +475,4 @@ void video_hw_bitblt (unsigned int bpp, unsigned int src_x,DE_WR_FIFO ((height <<16 ) | width); de_wait (); /* sync */ } +#endif
include/configs/lwmon5.h +1 -0
@@ -344,6 +344,7 @@/* Video console */ #define CONFIG_VIDEO #define CONFIG_VIDEO_MB862xx +#define CONFIG_VIDEO_MB862xx_ACCEL#define CONFIG_CFB_CONSOLE #define CONFIG_VIDEO_LOGO #define CONFIG_CONSOLE_EXTRA_INFO
include/configs/socrates.h +1 -0
@@ -198,6 +198,7 @@#define CONFIG_VIDEO #define CONFIG_VIDEO_MB862xx +#define CONFIG_VIDEO_MB862xx_ACCEL#define CONFIG_CFB_CONSOLE #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO
Signature · 1 line
1.6.2.5
PATCH v2 3/4 video: mb862xx: add option VIDEO_FB_16BPP_WORD_SWAP for IPEK01
From: Wolfgang Grandegger <[email protected]>
In 16 bpp mode, the new IPEK01 board only requires swapping of D16 words for D32 accesses due to the diffferent connecting to the GDC bus. This patch introduces the configuration option VIDEO_FB_16BPP_WORD_SWAP, which should be set for all board using the mb862xx in 16 bpp mode. For the IPEK01, VIDEO_FB_16BPP_PIXEL_SWAP should not be set.
--- drivers/video/cfb_console.c | 2 +- include/configs/lwmon5.h | 1 + include/configs/socrates.h | 1 + 3 files changed, 3 insertions(+), 1 deletions(-)
drivers/video/cfb_console.c +1 -1
@@ -321,7 +321,7 @@ void console_cursor (int state);#else #define SWAP16 (x) (x)#define SWAP32 (x) (x) -#if defined(VIDEO_FB_16BPP_PIXEL_SWAP ) +#if defined(VIDEO_FB_16BPP_WORD_SWAP )#define SHORTSWAP32 (x) ( ((x) >> 16) | ((x) << 16) )#else #define SHORTSWAP32 (x) (x)
include/configs/lwmon5.h +1 -0
@@ -349,6 +349,7 @@#define CONFIG_VIDEO_LOGO #define CONFIG_CONSOLE_EXTRA_INFO #define VIDEO_FB_16BPP_PIXEL_SWAP +#define VIDEO_FB_16BPP_WORD_SWAP #define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_SW_CURSOR
include/configs/socrates.h +1 -0
@@ -204,6 +204,7 @@#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CONSOLE_EXTRA_INFO #define VIDEO_FB_16BPP_PIXEL_SWAP +#define VIDEO_FB_16BPP_WORD_SWAP #define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_VIDEO_SW_CURSOR
Signature · 1 line
1.6.2.5
PATCH v2 4/4 mpc52xx: add support for the IPEK01 board
From: Wolfgang Grandegger <[email protected]>
This patch adds support for the board IPEK01 based on the MPC5200. The Futjitsu Lime graphics controller is configured in 16 bpp mode.
--- MAINTAINERS | 2 + MAKEALL | 1 + Makefile | 3 + board/ipek01/Makefile | 50 ++++++ board/ipek01/config.mk | 30 ++++ board/ipek01/ipek01.c | 282 ++++++++++++++++++++++++++++++++ include/configs/ipek01.h | 408 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 776 insertions(+), 0 deletions(-) create mode 100644 board/ipek01/Makefile create mode 100644 board/ipek01/config.mk create mode 100644 board/ipek01/ipek01.c create mode 100644 include/configs/ipek01.h
MAINTAINERS +2 -0
@@ -201,6 +201,8 @@ Frank Gottschling <[email protected]> Wolfgang Grandegger <[email protected]> + ipek01 MPC5200 + CCM MPC855 PN62 MPC8240
MAKEALL +1 -0
@@ -63,6 +63,7 @@ LIST_5xxx=" \ icecube_5100 \ icecube_5200 \ inka4x0 \ + ipek01 \ lite5200b \ mcc200 \ mecp5200 \
Makefile +3 -0
@@ -606,6 +606,9 @@ jupiter_config: unconfig inka4x0_config: unconfig @$(MKCONFIG) inka4x0 ppc mpc5xxx inka4x0 +ipek01_config: unconfig + @$(MKCONFIG) -a ipek01 ppc mpc5xxx ipek01 + lite5200b_config \ lite5200b_PM_config \ lite5200b_LOWBOOT_config: unconfig
board/ipek01/Makefile new file +50 -0
50 lines not on this page · raw message
board/ipek01/config.mk new file +30 -0
@@ -0,0 +1,30 @@ +# +# (C) Copyright 2003-2004 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +# +# IPEK01 board +# + +TEXT_BASE = 0xfc000000 + +PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
board/ipek01/ipek01.c new file +282 -0
282 lines not on this page · raw message
include/configs/ipek01.h new file +408 -0
408 lines not on this page · raw message
Signature · 1 line
1.6.2.5
PATCH v2 4/4 mpc52xx: add support for the IPEK01 board
Dear Wolfgang Grandegger,
Quoted 6 lines · In message <[email protected]> you wrote:
From: Wolfgang Grandegger <[email protected]>
This patch adds support for the board IPEK01 based on the MPC5200. The Futjitsu Lime graphics controller is configured in 16 bpp mode.
Signed-off-by Wolfgang Grandegger <[email protected]>
Quoted 13 lines
--- MAINTAINERS | 2 + MAKEALL | 1 + Makefile | 3 + board/ipek01/Makefile | 50 ++++++ board/ipek01/config.mk | 30 ++++ board/ipek01/ipek01.c | 282 ++++++++++++++++++++++++++++++++ include/configs/ipek01.h | 408 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 776 insertions(+), 0 deletions(-) create mode 100644 board/ipek01/Makefile create mode 100644 board/ipek01/config.mk create mode 100644 board/ipek01/ipek01.c create mode 100644 include/configs/ipek01.h
As this patch depends on the previous 3 patches which have to go through Anatolij's repository, I will put this patch on hold until Anatolij has applied these (which he cannot do until we have a "next" branch, which I hope to be able to set up RSN).
Sorry for the delay.
Best regards,
Wolfgang Denk
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "The number of Unix installations has grown to 10, with more expected." - The Unix Programmer's Manual, 2nd Edition, June, 1972
Wolfgang Denk
AppliedPATCH v2 4/4 mpc52xx: add support for the IPEK01 board
In reply to Wolfgang GrandeggerDear Wolfgang Grandegger,
Quoted 6 lines · In message <[email protected]> you wrote:
From: Wolfgang Grandegger <[email protected]>
This patch adds support for the board IPEK01 based on the MPC5200. The Futjitsu Lime graphics controller is configured in 16 bpp mode.
Signed-off-by Wolfgang Grandegger <[email protected]>
Quoted 13 lines
--- MAINTAINERS | 2 + MAKEALL | 1 + Makefile | 3 + board/ipek01/Makefile | 50 ++++++ board/ipek01/config.mk | 30 ++++ board/ipek01/ipek01.c | 282 ++++++++++++++++++++++++++++++++ include/configs/ipek01.h | 408 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 776 insertions(+), 0 deletions(-) create mode 100644 board/ipek01/Makefile create mode 100644 board/ipek01/config.mk create mode 100644 board/ipek01/ipek01.c create mode 100644 include/configs/ipek01.h
Applied to "next" branch, thanks.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de To be a winner, all you need to give is all you have.
PATCH v2 3/4 video: mb862xx: add option VIDEO_FB_16BPP_WORD_SWAP for IPEK01
In reply to Wolfgang GrandeggerQuoted 8 lines · On Fri, 23 Oct 2009 12:03:15 +0200 Wolfgang Grandegger <[email protected]>…
From: Wolfgang Grandegger <[email protected]>
In 16 bpp mode, the new IPEK01 board only requires swapping of D16 words for D32 accesses due to the diffferent connecting to the GDC bus. This patch introduces the configuration option
VIDEO_FB_16BPP_WORD_SWAP, which should be set for all board using the mb862xx in 16 bpp mode. For the IPEK01,VIDEO_FB_16BPP_PIXEL_SWAPshould not be set.
Quoted 6 lines
Signed-off-by Wolfgang Grandegger <[email protected]>--- drivers/video/cfb_console.c | 2 +- include/configs/lwmon5.h | 1 + include/configs/socrates.h | 1 + 3 files changed, 3 insertions(+), 1 deletions(-)
Applied to u-boot-video/next. Thanks!
Best regards,
Anatolij
PATCH v2 2/4 video: mb862xx: add option CONFIG_VIDEO_MB862xx_ACCEL for 32bpp mode
In reply to Wolfgang GrandeggerQuoted 8 lines · On Fri, 23 Oct 2009 12:03:14 +0200 Wolfgang Grandegger <[email protected]>…
From: Anatolij Gustschin <[email protected]>
The new IPEK01 board can use the 32 bpp mode for the Lime graphics controller. For this mode, video accelaration does not work. This patch makes the accelaration configurable via
CONFIG_VIDEO_MB862xx_ACCEL, which is enabled for the lwmon5 and the socrates board for backward compatibility.
Quoted 8 lines
Signed-off-by Anatolij Gustschin <[email protected]>Signed-off-by Wolfgang Grandegger <[email protected]>--- drivers/video/cfb_console.c | 2 ++ drivers/video/mb862xx.c | 16 +++++++++++++++- include/configs/lwmon5.h | 1 + include/configs/socrates.h | 1 + 4 files changed, 19 insertions(+), 1 deletions(-)
Applied to u-boot-video/next. Thanks!
Best regards,
Anatolij
PATCH v2 1/4 video: mb862xx: improve board-specific Lime configuration
In reply to Wolfgang GrandeggerQuoted 10 lines · On Fri, 23 Oct 2009 12:03:13 +0200 Wolfgang Grandegger <[email protected]>…
From: Wolfgang Grandegger <[email protected]>
To avoid board-specific code accessing the mb862xx registers directly, the public function
mb862xx_probe()has been introduced. Furthermore, the "Change of Clock Frequency" and "Set Memory I/F Mode" registers are now defined byCONFIG_SYS_MB862xx_CCFandCONFIG_SYS_MB862xx__MMR, respectively. The BSPs for the socrates and lwmon5 boards have been adapted accordingly.Signed-off-by Wolfgang Grandegger <[email protected]>
Quoted 8 lines
--- board/lwmon5/lwmon5.c | 7 ------ board/socrates/socrates.c | 46 ++++++------------------------------------- drivers/video/mb862xx.c | 34 +++++++++++++++++++++++++++++++- include/configs/lwmon5.h | 10 +++----- include/configs/socrates.h | 5 ++++ include/mb862xx.h | 5 ++++ 6 files changed, 54 insertions(+), 53 deletions(-)
Applied to u-boot-video/next. Thanks!
Best regards,
Anatolij