diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-17 08:10:19 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-17 08:10:19 +0200 |
| commit | b4e30bb8b73c9702d3283e1b514d672978b6951d (patch) | |
| tree | eed477fdd1b707261022bb8785ef2a3d707ce118 /arch/arm/mach-imx/include/mach/imxfb.h | |
| parent | 97f279282bddf9017837c44830d6079637768607 (diff) | |
| parent | 94e2382281ba950d63df78ead7fc5ca9aad72cda (diff) | |
| download | barebox-b4e30bb8b73c9702d3283e1b514d672978b6951d.tar.gz barebox-b4e30bb8b73c9702d3283e1b514d672978b6951d.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/mach-imx/include/mach/imxfb.h')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/imxfb.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/include/mach/imxfb.h b/arch/arm/mach-imx/include/mach/imxfb.h index ea39e3198e..6df7a14dde 100644 --- a/arch/arm/mach-imx/include/mach/imxfb.h +++ b/arch/arm/mach-imx/include/mach/imxfb.h @@ -52,17 +52,11 @@ #define DMACR_HM(x) (((x) & 0xf) << 16) #define DMACR_TM(x) ((x) & 0xf) -struct imx_fb_videomode { - struct fb_videomode mode; - u32 pcr; - unsigned char bpp; -}; - /** * Define relevant framebuffer information */ struct imx_fb_platform_data { - struct imx_fb_videomode *mode; + struct fb_videomode *mode; u_int num_modes; u_int cmap_greyscale:1, @@ -73,6 +67,8 @@ struct imx_fb_platform_data { u_int pwmr; u_int lscr1; u_int dmacr; + u32 pcr; + unsigned char bpp; /** force a memory area to be used, else NULL for dynamic allocation */ void *framebuffer; |