diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-08-06 12:33:26 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-08-06 12:33:26 +0200 |
| commit | 19afbd285e011c109e5156a459ce236adb9cf1cb (patch) | |
| tree | 8098c92053f9c40dc09c99ea7eb1bfe731b244c9 /arch | |
| parent | fd58dc84cb00c68586d269887971656bf462437f (diff) | |
| parent | 491dc73fe463bdd12e292b17d847381fda306ba0 (diff) | |
| download | barebox-19afbd285e011c109e5156a459ce236adb9cf1cb.tar.gz barebox-19afbd285e011c109e5156a459ce236adb9cf1cb.tar.xz | |
Merge branch 'for-next/video'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/chumby_falconwing/falconwing.c | 2 | ||||
| -rw-r--r-- | arch/arm/boards/freescale-mx28-evk/mx28-evk.c | 2 | ||||
| -rw-r--r-- | arch/arm/boards/karo-tx28/tx28-stk5.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/fb.h | 7 |
4 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c b/arch/arm/boards/chumby_falconwing/falconwing.c index 5e569bcc9a..c866043e8b 100644 --- a/arch/arm/boards/chumby_falconwing/falconwing.c +++ b/arch/arm/boards/chumby_falconwing/falconwing.c @@ -83,7 +83,7 @@ static struct imx_fb_platformdata fb_mode = { .mode_list = &falconwing_vmode, .mode_cnt = 1, /* the NMA35 is a 24 bit display, but only 18 bits are connected */ - .ld_intf_width = STMLCDIF_18BIT, + .ld_intf_width = 18, .enable = chumby_fb_enable, .fixed_screen = (void *)(0x40000000 + SZ_64M - MAX_FB_SIZE), .fixed_screen_size = MAX_FB_SIZE, diff --git a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c index d77a6c7156..fc1237588f 100644 --- a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c +++ b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c @@ -226,7 +226,7 @@ static struct imx_fb_platformdata mx28_evk_fb_pdata = { .mode_list = mx28_evk_vmodes, .mode_cnt = ARRAY_SIZE(mx28_evk_vmodes), .dotclk_delay = 0, /* no adaption required */ - .ld_intf_width = STMLCDIF_24BIT, /* full 24 bit */ + .ld_intf_width = 24, .bits_per_pixel = 32, .fixed_screen = NULL, .enable = mx28_evk_fb_enable, diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c index 9b86d1c883..d67607b717 100644 --- a/arch/arm/boards/karo-tx28/tx28-stk5.c +++ b/arch/arm/boards/karo-tx28/tx28-stk5.c @@ -195,7 +195,7 @@ static struct imx_fb_platformdata tx28_fb_pdata = { .mode_list = tx28evk_vmodes, .mode_cnt = ARRAY_SIZE(tx28evk_vmodes), .dotclk_delay = 0, /* no adaption required */ - .ld_intf_width = STMLCDIF_24BIT, /* full 24 bit */ + .ld_intf_width = 24, .fixed_screen = (void *)(0x40000000 + SZ_128M - MAX_FB_SIZE), .fixed_screen_size = MAX_FB_SIZE, .enable = tx28_fb_enable, diff --git a/arch/arm/mach-mxs/include/mach/fb.h b/arch/arm/mach-mxs/include/mach/fb.h index 2b6825f7b5..ad28f79d57 100644 --- a/arch/arm/mach-mxs/include/mach/fb.h +++ b/arch/arm/mach-mxs/include/mach/fb.h @@ -15,11 +15,6 @@ #include <fb.h> -#define STMLCDIF_8BIT 1 /** pixel data bus to the display is of 8 bit width */ -#define STMLCDIF_16BIT 0 /** pixel data bus to the display is of 16 bit width */ -#define STMLCDIF_18BIT 2 /** pixel data bus to the display is of 18 bit width */ -#define STMLCDIF_24BIT 3 /** pixel data bus to the display is of 24 bit width */ - /** LC display uses active high data enable signal */ #define FB_SYNC_DE_HIGH_ACT (1 << 27) /** LC display will latch its data at clock's rising edge */ @@ -38,7 +33,7 @@ struct imx_fb_platformdata { unsigned mode_cnt; unsigned dotclk_delay; /**< refer manual HW_LCDIF_VDCTRL4 register */ - unsigned ld_intf_width; /**< refer STMLCDIF_* macros */ + unsigned ld_intf_width; /* interface width in bits */ unsigned bits_per_pixel; void *fixed_screen; /**< if != NULL use this as framebuffer memory */ |