Commit eb42d760 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle

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: default avatarPaul Burton <paul.burton@imgtec.com>
Acked-by: default avatarTomi 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent ec5218a2
...@@ -2183,7 +2183,7 @@ config FB_GOLDFISH ...@@ -2183,7 +2183,7 @@ config FB_GOLDFISH
config FB_COBALT config FB_COBALT
tristate "Cobalt server LCD frame buffer support" tristate "Cobalt server LCD frame buffer support"
depends on FB && (MIPS_COBALT || MIPS_SEAD3) depends on FB && MIPS_COBALT
config FB_SH7760 config FB_SH7760
bool "SH7760/SH7763/SH7720/SH7721 LCDC support" bool "SH7760/SH7763/SH7720/SH7721 LCDC support"
......
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
#define LCD_CUR_POS(x) ((x) & LCD_CUR_POS_MASK) #define LCD_CUR_POS(x) ((x) & LCD_CUR_POS_MASK)
#define LCD_TEXT_POS(x) ((x) | LCD_TEXT_MODE) #define LCD_TEXT_POS(x) ((x) | LCD_TEXT_MODE)
#ifdef CONFIG_MIPS_COBALT
static inline void lcd_write_control(struct fb_info *info, u8 control) static inline void lcd_write_control(struct fb_info *info, u8 control)
{ {
writel((u32)control << 24, info->screen_base); writel((u32)control << 24, info->screen_base);
...@@ -83,47 +82,6 @@ static inline u8 lcd_read_data(struct fb_info *info) ...@@ -83,47 +82,6 @@ static inline u8 lcd_read_data(struct fb_info *info)
{ {
return readl(info->screen_base + LCD_DATA_REG_OFFSET) >> 24; return readl(info->screen_base + LCD_DATA_REG_OFFSET) >> 24;
} }
#else
#define LCD_CTL 0x00
#define LCD_DATA 0x08
#define CPLD_STATUS 0x10
#define CPLD_DATA 0x18
static inline void cpld_wait(struct fb_info *info)
{
do {
} while (readl(info->screen_base + CPLD_STATUS) & 1);
}
static inline void lcd_write_control(struct fb_info *info, u8 control)
{
cpld_wait(info);
writel(control, info->screen_base + LCD_CTL);
}
static inline u8 lcd_read_control(struct fb_info *info)
{
cpld_wait(info);
readl(info->screen_base + LCD_CTL);
cpld_wait(info);
return readl(info->screen_base + CPLD_DATA) & 0xff;
}
static inline void lcd_write_data(struct fb_info *info, u8 data)
{
cpld_wait(info);
writel(data, info->screen_base + LCD_DATA);
}
static inline u8 lcd_read_data(struct fb_info *info)
{
cpld_wait(info);
readl(info->screen_base + LCD_DATA);
cpld_wait(info);
return readl(info->screen_base + CPLD_DATA) & 0xff;
}
#endif
static int lcd_busy_wait(struct fb_info *info) static int lcd_busy_wait(struct fb_info *info)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment