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
0b7b73ab206c ("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>

diff --git a/MAINTAINERS b/MAINTAINERS
index 651616ed8ae25e8e790915721d86c6404cb171fa..75c4d7ebef09e0063aab25e8fe1a1d6010d1cbe8 100644 (file)
--- 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 85a5bf5639d91a9c4d0f5cba5b6e1fe06890fc10..fa6a19c1ae9bd722884906ffceeaf0ae1917f596 100644 (file)
--- 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 (file)
index a16837c..0000000
--- 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__ */