diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2016-08-26 10:17:47 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2016-10-06 10:56:02 -0400 |
| commit | eb42d760db2ea8ab16f10e320a7a8bfff331307f (patch) | |
| tree | 0c4f10fd86380c5020266184bf05849a5071a0a5 /drivers/video/fbdev | |
| parent | ec5218a23c470aad28be13362d11fd7886445866 (diff) | |
FBDEV: cobalt_lcdfb: Drop SEAD3 support
The SEAD3 board no longer uses the cobalt_lcdfb driver, so remove the
SEAD3-specific code from it.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Ondrej Zary <linux@rainbow-software.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Maciej W. Rozycki <macro@linux-mips.org>
Cc: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Simon Horman <horms+renesas@verge.net.au>
Cc: linux-mips@linux-mips.org
Cc: linux-fbdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14060/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/video/fbdev/cobalt_lcdfb.c | 42 |
2 files changed, 1 insertions, 43 deletions
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 88b008fb8a4e..914bfb2f176b 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig | |||
| @@ -2183,7 +2183,7 @@ config FB_GOLDFISH | |||
| 2183 | 2183 | ||
| 2184 | config FB_COBALT | 2184 | config FB_COBALT |
| 2185 | tristate "Cobalt server LCD frame buffer support" | 2185 | tristate "Cobalt server LCD frame buffer support" |
| 2186 | depends on FB && (MIPS_COBALT || MIPS_SEAD3) | 2186 | depends on FB && MIPS_COBALT |
| 2187 | 2187 | ||
| 2188 | config FB_SH7760 | 2188 | config FB_SH7760 |
| 2189 | bool "SH7760/SH7763/SH7720/SH7721 LCDC support" | 2189 | bool "SH7760/SH7763/SH7720/SH7721 LCDC support" |
diff --git a/drivers/video/fbdev/cobalt_lcdfb.c b/drivers/video/fbdev/cobalt_lcdfb.c index 07675d6f323e..2d3b691f3fc4 100644 --- a/drivers/video/fbdev/cobalt_lcdfb.c +++ b/drivers/video/fbdev/cobalt_lcdfb.c | |||
| @@ -63,7 +63,6 @@ | |||
| 63 | #define LCD_CUR_POS(x) ((x) & LCD_CUR_POS_MASK) | 63 | #define LCD_CUR_POS(x) ((x) & LCD_CUR_POS_MASK) |
| 64 | #define LCD_TEXT_POS(x) ((x) | LCD_TEXT_MODE) | 64 | #define LCD_TEXT_POS(x) ((x) | LCD_TEXT_MODE) |
| 65 | 65 | ||
| 66 | #ifdef CONFIG_MIPS_COBALT | ||
| 67 | static inline void lcd_write_control(struct fb_info *info, u8 control) | 66 | static inline void lcd_write_control(struct fb_info *info, u8 control) |
| 68 | { | 67 | { |
| 69 | writel((u32)control << 24, info->screen_base); | 68 | writel((u32)control << 24, info->screen_base); |
| @@ -83,47 +82,6 @@ static inline u8 lcd_read_data(struct fb_info *info) | |||
| 83 | { | 82 | { |
| 84 | return readl(info->screen_base + LCD_DATA_REG_OFFSET) >> 24; | 83 | return readl(info->screen_base + LCD_DATA_REG_OFFSET) >> 24; |
| 85 | } | 84 | } |
| 86 | #else | ||
| 87 | |||
| 88 | #define LCD_CTL 0x00 | ||
| 89 | #define LCD_DATA 0x08 | ||
| 90 | #define CPLD_STATUS 0x10 | ||
| 91 | #define CPLD_DATA 0x18 | ||
| 92 | |||
| 93 | static inline void cpld_wait(struct fb_info *info) | ||
| 94 | { | ||
| 95 | do { | ||
| 96 | } while (readl(info->screen_base + CPLD_STATUS) & 1); | ||
| 97 | } | ||
| 98 | |||
| 99 | static inline void lcd_write_control(struct fb_info *info, u8 control) | ||
| 100 | { | ||
| 101 | cpld_wait(info); | ||
| 102 | writel(control, info->screen_base + LCD_CTL); | ||
| 103 | } | ||
| 104 | |||
| 105 | static inline u8 lcd_read_control(struct fb_info *info) | ||
| 106 | { | ||
| 107 | cpld_wait(info); | ||
| 108 | readl(info->screen_base + LCD_CTL); | ||
| 109 | cpld_wait(info); | ||
| 110 | return readl(info->screen_base + CPLD_DATA) & 0xff; | ||
| 111 | } | ||
| 112 | |||
| 113 | static inline void lcd_write_data(struct fb_info *info, u8 data) | ||
| 114 | { | ||
| 115 | cpld_wait(info); | ||
| 116 | writel(data, info->screen_base + LCD_DATA); | ||
| 117 | } | ||
| 118 | |||
| 119 | static inline u8 lcd_read_data(struct fb_info *info) | ||
| 120 | { | ||
| 121 | cpld_wait(info); | ||
| 122 | readl(info->screen_base + LCD_DATA); | ||
| 123 | cpld_wait(info); | ||
| 124 | return readl(info->screen_base + CPLD_DATA) & 0xff; | ||
| 125 | } | ||
| 126 | #endif | ||
| 127 | 85 | ||
| 128 | static int lcd_busy_wait(struct fb_info *info) | 86 | static int lcd_busy_wait(struct fb_info *info) |
| 129 | { | 87 | { |
