From a2dccb958ca1f686bc22d1cb82ca0ab0f75b2419 Mon Sep 17 00:00:00 2001
From: Luka Perkov <luka@openwrt.org>
Date: Sun, 18 Aug 2013 01:25:40 +0000
Subject: [PATCH] kernel: drop dead glamo code
The code is not used since the s3c24xx target was removed.
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 37809
---
.../files/include/linux/glamo-engine.h | 27 --------------
.../generic/files/include/linux/glamofb.h | 35 -------------------
.../patches-3.10/850-glamo_headers.patch | 21 -----------
.../patches-3.3/850-glamo_headers.patch | 21 -----------
.../patches-3.6/850-glamo_headers.patch | 21 -----------
.../patches-3.8/850-glamo_headers.patch | 21 -----------
.../patches-3.9/850-glamo_headers.patch | 21 -----------
7 files changed, 167 deletions(-)
delete mode 100644 target/linux/generic/files/include/linux/glamo-engine.h
delete mode 100644 target/linux/generic/files/include/linux/glamofb.h
delete mode 100644 target/linux/generic/patches-3.10/850-glamo_headers.patch
delete mode 100644 target/linux/generic/patches-3.3/850-glamo_headers.patch
delete mode 100644 target/linux/generic/patches-3.6/850-glamo_headers.patch
delete mode 100644 target/linux/generic/patches-3.8/850-glamo_headers.patch
delete mode 100644 target/linux/generic/patches-3.9/850-glamo_headers.patch
diff --git a/target/linux/generic/files/include/linux/glamo-engine.h b/target/linux/generic/files/include/linux/glamo-engine.h
deleted file mode 100644
index 516d45fa6e..0000000000
--- a/target/linux/generic/files/include/linux/glamo-engine.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __GLAMO_ENGINE_H
-#define __GLAMO_ENGINE_H
-
-enum glamo_engine {
- GLAMO_ENGINE_CAPTURE = 0,
- GLAMO_ENGINE_ISP = 1,
- GLAMO_ENGINE_JPEG = 2,
- GLAMO_ENGINE_MPEG_ENC = 3,
- GLAMO_ENGINE_MPEG_DEC = 4,
- GLAMO_ENGINE_LCD = 5,
- GLAMO_ENGINE_CMDQ = 6,
- GLAMO_ENGINE_2D = 7,
- GLAMO_ENGINE_3D = 8,
- GLAMO_ENGINE_MMC = 9,
- GLAMO_ENGINE_MICROP0 = 10,
- GLAMO_ENGINE_RISC = 11,
- GLAMO_ENGINE_MICROP1_MPEG_ENC = 12,
- GLAMO_ENGINE_MICROP1_MPEG_DEC = 13,
-#if 0
- GLAMO_ENGINE_H264_DEC = 14,
- GLAMO_ENGINE_RISC1 = 15,
- GLAMO_ENGINE_SPI = 16,
-#endif
- __NUM_GLAMO_ENGINES
-};
-
-#endif
diff --git a/target/linux/generic/files/include/linux/glamofb.h b/target/linux/generic/files/include/linux/glamofb.h
deleted file mode 100644
index 5f9fab5a48..0000000000
--- a/target/linux/generic/files/include/linux/glamofb.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _LINUX_GLAMOFB_H
-#define _LINUX_GLAMOFB_H
-
-#include <linux/fb.h>
-
-#ifdef __KERNEL__
-
-struct glamo_core;
-struct glamofb_handle;
-
-struct glamo_fb_platform_data {
- int width, height;
-
- int num_modes;
- struct fb_videomode *modes;
-
- struct glamo_core *core;
-};
-
-int glamofb_cmd_mode(struct glamofb_handle *gfb, int on);
-int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val);
-
-#ifdef CONFIG_MFD_GLAMO
-void glamo_lcm_reset(struct platform_device *pdev, int level);
-#else
-#define glamo_lcm_reset(...) do {} while (0)
-#endif
-
-#endif
-
-#define GLAMOFB_ENGINE_ENABLE _IOW('F', 0x1, __u32)
-#define GLAMOFB_ENGINE_DISABLE _IOW('F', 0x2, __u32)
-#define GLAMOFB_ENGINE_RESET _IOW('F', 0x3, __u32)
-
-#endif
diff --git a/target/linux/generic/patches-3.10/850-glamo_headers.patch b/target/linux/generic/patches-3.10/850-glamo_headers.patch
deleted file mode 100644
index 508d883b9d..0000000000
--- a/target/linux/generic/patches-3.10/850-glamo_headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/include/uapi/linux/fb.h
-+++ b/include/uapi/linux/fb.h
-@@ -122,6 +122,7 @@
- #define FB_ACCEL_TRIDENT_BLADE3D 52 /* Trident Blade3D */
- #define FB_ACCEL_TRIDENT_BLADEXP 53 /* Trident BladeXP */
- #define FB_ACCEL_CIRRUS_ALPINE 53 /* Cirrus Logic 543x/544x/5480 */
-+#define FB_ACCEL_GLAMO 50 /* SMedia Glamo */
- #define FB_ACCEL_NEOMAGIC_NM2070 90 /* NeoMagic NM2070 */
- #define FB_ACCEL_NEOMAGIC_NM2090 91 /* NeoMagic NM2090 */
- #define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */
---- a/include/uapi/linux/Kbuild
-+++ b/include/uapi/linux/Kbuild
-@@ -132,6 +132,8 @@ header-y += gen_stats.h
- header-y += genetlink.h
- header-y += gfs2_ondisk.h
- header-y += gigaset_dev.h
-+header-y += glamofb.h
-+header-y += glamo-engine.h
- header-y += hdlc.h
- header-y += hdlcdrv.h
- header-y += hdreg.h
diff --git a/target/linux/generic/patches-3.3/850-glamo_headers.patch b/target/linux/generic/patches-3.3/850-glamo_headers.patch
deleted file mode 100644
index d6d49fdf50..0000000000
--- a/target/linux/generic/patches-3.3/850-glamo_headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -127,6 +127,7 @@
- #define FB_ACCEL_TRIDENT_BLADE3D 52 /* Trident Blade3D */
- #define FB_ACCEL_TRIDENT_BLADEXP 53 /* Trident BladeXP */
- #define FB_ACCEL_CIRRUS_ALPINE 53 /* Cirrus Logic 543x/544x/5480 */
-+#define FB_ACCEL_GLAMO 50 /* SMedia Glamo */
- #define FB_ACCEL_NEOMAGIC_NM2070 90 /* NeoMagic NM2070 */
- #define FB_ACCEL_NEOMAGIC_NM2090 91 /* NeoMagic NM2090 */
- #define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -145,6 +145,8 @@ header-y += generic_serial.h
- header-y += genetlink.h
- header-y += gfs2_ondisk.h
- header-y += gigaset_dev.h
-+header-y += glamofb.h
-+header-y += glamo-engine.h
- header-y += hdlc.h
- header-y += hdlcdrv.h
- header-y += hdreg.h
diff --git a/target/linux/generic/patches-3.6/850-glamo_headers.patch b/target/linux/generic/patches-3.6/850-glamo_headers.patch
deleted file mode 100644
index d6d49fdf50..0000000000
--- a/target/linux/generic/patches-3.6/850-glamo_headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -127,6 +127,7 @@
- #define FB_ACCEL_TRIDENT_BLADE3D 52 /* Trident Blade3D */
- #define FB_ACCEL_TRIDENT_BLADEXP 53 /* Trident BladeXP */
- #define FB_ACCEL_CIRRUS_ALPINE 53 /* Cirrus Logic 543x/544x/5480 */
-+#define FB_ACCEL_GLAMO 50 /* SMedia Glamo */
- #define FB_ACCEL_NEOMAGIC_NM2070 90 /* NeoMagic NM2070 */
- #define FB_ACCEL_NEOMAGIC_NM2090 91 /* NeoMagic NM2090 */
- #define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -145,6 +145,8 @@ header-y += generic_serial.h
- header-y += genetlink.h
- header-y += gfs2_ondisk.h
- header-y += gigaset_dev.h
-+header-y += glamofb.h
-+header-y += glamo-engine.h
- header-y += hdlc.h
- header-y += hdlcdrv.h
- header-y += hdreg.h
diff --git a/target/linux/generic/patches-3.8/850-glamo_headers.patch b/target/linux/generic/patches-3.8/850-glamo_headers.patch
deleted file mode 100644
index 689d14d62b..0000000000
--- a/target/linux/generic/patches-3.8/850-glamo_headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/include/uapi/linux/fb.h
-+++ b/include/uapi/linux/fb.h
-@@ -122,6 +122,7 @@
- #define FB_ACCEL_TRIDENT_BLADE3D 52 /* Trident Blade3D */
- #define FB_ACCEL_TRIDENT_BLADEXP 53 /* Trident BladeXP */
- #define FB_ACCEL_CIRRUS_ALPINE 53 /* Cirrus Logic 543x/544x/5480 */
-+#define FB_ACCEL_GLAMO 50 /* SMedia Glamo */
- #define FB_ACCEL_NEOMAGIC_NM2070 90 /* NeoMagic NM2070 */
- #define FB_ACCEL_NEOMAGIC_NM2090 91 /* NeoMagic NM2090 */
- #define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */
---- a/include/uapi/linux/Kbuild
-+++ b/include/uapi/linux/Kbuild
-@@ -131,6 +131,8 @@ header-y += gen_stats.h
- header-y += genetlink.h
- header-y += gfs2_ondisk.h
- header-y += gigaset_dev.h
-+header-y += glamofb.h
-+header-y += glamo-engine.h
- header-y += hdlc.h
- header-y += hdlcdrv.h
- header-y += hdreg.h
diff --git a/target/linux/generic/patches-3.9/850-glamo_headers.patch b/target/linux/generic/patches-3.9/850-glamo_headers.patch
deleted file mode 100644
index 508d883b9d..0000000000
--- a/target/linux/generic/patches-3.9/850-glamo_headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/include/uapi/linux/fb.h
-+++ b/include/uapi/linux/fb.h
-@@ -122,6 +122,7 @@
- #define FB_ACCEL_TRIDENT_BLADE3D 52 /* Trident Blade3D */
- #define FB_ACCEL_TRIDENT_BLADEXP 53 /* Trident BladeXP */
- #define FB_ACCEL_CIRRUS_ALPINE 53 /* Cirrus Logic 543x/544x/5480 */
-+#define FB_ACCEL_GLAMO 50 /* SMedia Glamo */
- #define FB_ACCEL_NEOMAGIC_NM2070 90 /* NeoMagic NM2070 */
- #define FB_ACCEL_NEOMAGIC_NM2090 91 /* NeoMagic NM2090 */
- #define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */
---- a/include/uapi/linux/Kbuild
-+++ b/include/uapi/linux/Kbuild
-@@ -132,6 +132,8 @@ header-y += gen_stats.h
- header-y += genetlink.h
- header-y += gfs2_ondisk.h
- header-y += gigaset_dev.h
-+header-y += glamofb.h
-+header-y += glamo-engine.h
- header-y += hdlc.h
- header-y += hdlcdrv.h
- header-y += hdreg.h
--
2.30.2