Commit 4a8fda69 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

fbdev: omapfb: remove unused board support 



A number of omap1 based board files got removed, so the corresponding
framebuffer drivers are no longer used. The remaining ones are for
ams_delta, osk and palmTE, which are still part of the mainline kernel.

Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Cc: linux-omap@vger.kernel.org
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Angelo Arrifano <miknix@gmail.com>
Cc: Imre Deak <imre.deak@intel.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent ab5043ef

drivers/video/fbdev/omap/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -40,15 +40,6 @@ config FB_OMAP_LCD_MIPID 
	  the Mobile Industry Processor Interface DBI-C/DCS

	  specification. (Supported LCDs: Philips LPH8923, Sharp LS041Y3)



config FB_OMAP_LCD_H3

	bool "TPS65010 LCD controller on OMAP-H3"

	depends on MACH_OMAP_H3 || COMPILE_TEST

	depends on TPS65010=y

	default y

	help

	  Say Y here if you want to have support for the LCD on the

	  H3 board.



config FB_OMAP_DMA_TUNE

	bool "Set DMA SDRAM access priority high"

	depends on FB_OMAP

drivers/video/fbdev/omap/Makefile

+0 −6
Original line number Diff line number Diff line
@@ -17,16 +17,10 @@ objs-y$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += sossi.o 
objs-y$(CONFIG_FB_OMAP_LCDC_HWA742) += hwa742.o



lcds-y$(CONFIG_MACH_AMS_DELTA) += lcd_ams_delta.o

lcds-y$(CONFIG_FB_OMAP_LCD_H3) += lcd_h3.o

lcds-y$(CONFIG_MACH_OMAP_PALMTE) += lcd_palmte.o

lcds-y$(CONFIG_MACH_OMAP_PALMTT) += lcd_palmtt.o

lcds-y$(CONFIG_MACH_OMAP_PALMZ71) += lcd_palmz71.o

lcds-$(CONFIG_ARCH_OMAP16XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1610.o

lcds-$(CONFIG_ARCH_OMAP15XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1510.o

lcds-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o



lcds-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o

lcds-y$(CONFIG_MACH_HERALD) += lcd_htcherald.o



omapfb-objs := $(objs-yy)

drivers/video/fbdev/omap/lcd_h3.c

deleted100644 → 0
+0 −82
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * LCD panel support for the TI OMAP H3 board

 *

 * Copyright (C) 2004 Nokia Corporation

 * Author: Imre Deak <imre.deak@nokia.com>

 */



#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/mfd/tps65010.h>

#include <linux/gpio.h>



#include "omapfb.h"



#define MODULE_NAME	"omapfb-lcd_h3"



static int h3_panel_enable(struct lcd_panel *panel)

{

	int r = 0;



	/* GPIO1 and GPIO2 of TPS65010 send LCD_ENBKL and LCD_ENVDD signals */

	r = tps65010_set_gpio_out_value(GPIO1, HIGH);

	if (!r)

		r = tps65010_set_gpio_out_value(GPIO2, HIGH);

	if (r)

		pr_err(MODULE_NAME ": Unable to turn on LCD panel\n");



	return r;

}



static void h3_panel_disable(struct lcd_panel *panel)

{

	int r = 0;



	/* GPIO1 and GPIO2 of TPS65010 send LCD_ENBKL and LCD_ENVDD signals */

	r = tps65010_set_gpio_out_value(GPIO1, LOW);

	if (!r)

		tps65010_set_gpio_out_value(GPIO2, LOW);

	if (r)

		pr_err(MODULE_NAME ": Unable to turn off LCD panel\n");

}



static struct lcd_panel h3_panel = {

	.name		= "h3",

	.config		= OMAP_LCDC_PANEL_TFT,



	.data_lines	= 16,

	.bpp		= 16,

	.x_res		= 240,

	.y_res		= 320,

	.pixel_clock	= 12000,

	.hsw		= 12,

	.hfp		= 14,

	.hbp		= 72 - 12,

	.vsw		= 1,

	.vfp		= 1,

	.vbp		= 0,

	.pcd		= 0,



	.enable		= h3_panel_enable,

	.disable	= h3_panel_disable,

};



static int h3_panel_probe(struct platform_device *pdev)

{

	omapfb_register_panel(&h3_panel);

	return 0;

}



static struct platform_driver h3_panel_driver = {

	.probe		= h3_panel_probe,

	.driver		= {

		.name	= "lcd_h3",

	},

};



module_platform_driver(h3_panel_driver);



MODULE_AUTHOR("Imre Deak");

MODULE_DESCRIPTION("LCD panel support for the TI OMAP H3 board");

MODULE_LICENSE("GPL");

drivers/video/fbdev/omap/lcd_htcherald.c

deleted100644 → 0
+0 −59
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * File: drivers/video/omap/lcd-htcherald.c

 *

 * LCD panel support for the HTC Herald

 *

 * Copyright (C) 2009 Cory Maccarrone <darkstar6262@gmail.com>

 * Copyright (C) 2009 Wing Linux

 *

 * Based on the lcd_htcwizard.c file from the linwizard project:

 * Copyright (C) linwizard.sourceforge.net

 * Author: Angelo Arrifano <miknix@gmail.com>

 * Based on lcd_h4 by Imre Deak <imre.deak@nokia.com>

 */



#include <linux/module.h>

#include <linux/platform_device.h>



#include "omapfb.h"



/* Found on WIZ200 (miknix) and some HERA110 models (darkstar62) */

static struct lcd_panel htcherald_panel_1 = {

	.name		= "lcd_herald",

	.config		= OMAP_LCDC_PANEL_TFT |

			  OMAP_LCDC_INV_HSYNC |

			  OMAP_LCDC_INV_VSYNC |

			  OMAP_LCDC_INV_PIX_CLOCK,

	.bpp		= 16,

	.data_lines	= 16,

	.x_res		= 240,

	.y_res		= 320,

	.pixel_clock	= 6093,

	.pcd		= 0, /* 15 */

	.hsw		= 10,

	.hfp		= 10,

	.hbp		= 20,

	.vsw		= 3,

	.vfp		= 2,

	.vbp		= 2,

};



static int htcherald_panel_probe(struct platform_device *pdev)

{

	omapfb_register_panel(&htcherald_panel_1);

	return 0;

}



static struct platform_driver htcherald_panel_driver = {

	.probe		= htcherald_panel_probe,

	.driver		= {

		.name	= "lcd_htcherald",

	},

};



module_platform_driver(htcherald_panel_driver);



MODULE_AUTHOR("Cory Maccarrone");

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("LCD panel support for the HTC Herald");

drivers/video/fbdev/omap/lcd_inn1510.c

deleted100644 → 0
+0 −69
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * LCD panel support for the TI OMAP1510 Innovator board

 *

 * Copyright (C) 2004 Nokia Corporation

 * Author: Imre Deak <imre.deak@nokia.com>

 */



#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/io.h>



#include <linux/soc/ti/omap1-soc.h>



#include "omapfb.h"



static void __iomem *omap1510_fpga_lcd_panel_control;



static int innovator1510_panel_enable(struct lcd_panel *panel)

{

	__raw_writeb(0x7, omap1510_fpga_lcd_panel_control);

	return 0;

}



static void innovator1510_panel_disable(struct lcd_panel *panel)

{

	__raw_writeb(0x0, omap1510_fpga_lcd_panel_control);

}



static struct lcd_panel innovator1510_panel = {

	.name		= "inn1510",

	.config		= OMAP_LCDC_PANEL_TFT,



	.bpp		= 16,

	.data_lines	= 16,

	.x_res		= 240,

	.y_res		= 320,

	.pixel_clock	= 12500,

	.hsw		= 40,

	.hfp		= 40,

	.hbp		= 72,

	.vsw		= 1,

	.vfp		= 1,

	.vbp		= 0,

	.pcd		= 12,



	.enable		= innovator1510_panel_enable,

	.disable	= innovator1510_panel_disable,

};



static int innovator1510_panel_probe(struct platform_device *pdev)

{

	omap1510_fpga_lcd_panel_control = (void __iomem *)pdev->dev.platform_data;

	omapfb_register_panel(&innovator1510_panel);

	return 0;

}



static struct platform_driver innovator1510_panel_driver = {

	.probe		= innovator1510_panel_probe,

	.driver		= {

		.name	= "lcd_inn1510",

	},

};



module_platform_driver(innovator1510_panel_driver);



MODULE_AUTHOR("Imre Deak");

MODULE_DESCRIPTION("LCD panel support for the TI OMAP1510 Innovator board");

MODULE_LICENSE("GPL");