diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2022-07-23 19:57:19 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2022-07-26 09:16:38 +0200 |
| commit | ded77a74ee6bc3dea72ad41129823a812e4b64f3 (patch) | |
| tree | 53165a7d4923a2abc719317c217003ddb0d7577b | |
| parent | video: fbdev: imxfb: Drop unused symbols from header (diff) | |
| download | linux-ded77a74ee6bc3dea72ad41129823a812e4b64f3.tar.xz linux-ded77a74ee6bc3dea72ad41129823a812e4b64f3.zip | |
video: fbdev: imxfb: Fold <linux/platform_data/video-imxfb.h> into only user
No source file but the driver itself includes the header containing the
platform data definition. The last user is gone since commit
8485adf17a15 ("ARM: imx: Remove imx device directory").
Move the remaining symbols directly into the driver and remove the then
unused header file.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Helge Deller <deller@gmx.de>
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/imxfb.c | 13 | ||||
| -rw-r--r-- | include/linux/platform_data/video-imxfb.h | 23 |
3 files changed, 12 insertions, 25 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 651616ed8ae2..75c4d7ebef09 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8011,7 +8011,6 @@ L: linux-fbdev@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: drivers/video/fbdev/imxfb.c -F: include/linux/platform_data/video-imxfb.h FREESCALE IMX DDR PMU DRIVER M: Frank Li <Frank.li@nxp.com> diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c index 85a5bf5639d9..fa6a19c1ae9b 100644 --- a/drivers/video/fbdev/imxfb.c +++ b/drivers/video/fbdev/imxfb.c @@ -41,7 +41,18 @@ #include <video/of_videomode.h> #include <video/videomode.h> -#include <linux/platform_data/video-imxfb.h> +#define PCR_TFT (1 << 31) +#define PCR_BPIX_8 (3 << 25) +#define PCR_BPIX_12 (4 << 25) +#define PCR_BPIX_16 (5 << 25) +#define PCR_BPIX_18 (6 << 25) + +struct imx_fb_videomode { + struct fb_videomode mode; + u32 pcr; + bool aus_mode; + unsigned char bpp; +}; /* * Complain if VAR is out of range. diff --git a/include/linux/platform_data/video-imxfb.h b/include/linux/platform_data/video-imxfb.h deleted file mode 100644 index a16837c5e43c..000000000000 --- a/include/linux/platform_data/video-imxfb.h +++ /dev/null @@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * This structure describes the machine which we are running on. - */ -#ifndef __MACH_IMXFB_H__ -#define __MACH_IMXFB_H__ - -#include <linux/fb.h> - -#define PCR_TFT (1 << 31) -#define PCR_BPIX_8 (3 << 25) -#define PCR_BPIX_12 (4 << 25) -#define PCR_BPIX_16 (5 << 25) -#define PCR_BPIX_18 (6 << 25) - -struct imx_fb_videomode { - struct fb_videomode mode; - u32 pcr; - bool aus_mode; - unsigned char bpp; -}; - -#endif /* ifndef __MACH_IMXFB_H__ */ |