fbdev: omapfb: remove omap1 osk driver
Commit Message
From: Arnd Bergmann <arnd@arndb.de>
Commit 21a3e6eed423 ("ARM: omap1: remove osk-mistral add-on board
support") removed the platform_device definition for the "lcd_osk"
device, so this driver is now unused and can be removed as well.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/video/fbdev/omap/Makefile | 1 -
drivers/video/fbdev/omap/lcd_osk.c | 86 ------------------------------
2 files changed, 87 deletions(-)
delete mode 100644 drivers/video/fbdev/omap/lcd_osk.c
Comments
On 3/14/23 17:27, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> Commit 21a3e6eed423 ("ARM: omap1: remove osk-mistral add-on board
> support") removed the platform_device definition for the "lcd_osk"
> device, so this driver is now unused and can be removed as well.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
applied.
Thanks!
Helge
> ---
> drivers/video/fbdev/omap/Makefile | 1 -
> drivers/video/fbdev/omap/lcd_osk.c | 86 ------------------------------
> 2 files changed, 87 deletions(-)
> delete mode 100644 drivers/video/fbdev/omap/lcd_osk.c
>
> diff --git a/drivers/video/fbdev/omap/Makefile b/drivers/video/fbdev/omap/Makefile
> index 504edb9c09dd..6d5082c76919 100644
> --- a/drivers/video/fbdev/omap/Makefile
> +++ b/drivers/video/fbdev/omap/Makefile
> @@ -18,7 +18,6 @@ objs-y$(CONFIG_FB_OMAP_LCDC_HWA742) += hwa742.o
>
> lcds-y$(CONFIG_MACH_AMS_DELTA) += lcd_ams_delta.o
> lcds-y$(CONFIG_MACH_OMAP_PALMTE) += lcd_palmte.o
> -lcds-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o
>
> lcds-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o
>
> diff --git a/drivers/video/fbdev/omap/lcd_osk.c b/drivers/video/fbdev/omap/lcd_osk.c
> deleted file mode 100644
> index 8168ba0d47fd..000000000000
> --- a/drivers/video/fbdev/omap/lcd_osk.c
> +++ /dev/null
> @@ -1,86 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0-or-later
> -/*
> - * LCD panel support for the TI OMAP OSK board
> - *
> - * Copyright (C) 2004 Nokia Corporation
> - * Author: Imre Deak <imre.deak@nokia.com>
> - * Adapted for OSK by <dirk.behme@de.bosch.com>
> - */
> -
> -#include <linux/module.h>
> -#include <linux/platform_device.h>
> -#include <linux/gpio.h>
> -
> -#include <linux/soc/ti/omap1-io.h>
> -#include <linux/soc/ti/omap1-mux.h>
> -
> -#include "omapfb.h"
> -
> -static int osk_panel_enable(struct lcd_panel *panel)
> -{
> - /* configure PWL pin */
> - omap_cfg_reg(PWL);
> -
> - /* Enable PWL unit */
> - omap_writeb(0x01, OMAP_PWL_CLK_ENABLE);
> -
> - /* Set PWL level */
> - omap_writeb(0xFF, OMAP_PWL_ENABLE);
> -
> - /* set GPIO2 high (lcd power enabled) */
> - gpio_set_value(2, 1);
> -
> - return 0;
> -}
> -
> -static void osk_panel_disable(struct lcd_panel *panel)
> -{
> - /* Set PWL level to zero */
> - omap_writeb(0x00, OMAP_PWL_ENABLE);
> -
> - /* Disable PWL unit */
> - omap_writeb(0x00, OMAP_PWL_CLK_ENABLE);
> -
> - /* set GPIO2 low */
> - gpio_set_value(2, 0);
> -}
> -
> -static struct lcd_panel osk_panel = {
> - .name = "osk",
> - .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 = osk_panel_enable,
> - .disable = osk_panel_disable,
> -};
> -
> -static int osk_panel_probe(struct platform_device *pdev)
> -{
> - omapfb_register_panel(&osk_panel);
> - return 0;
> -}
> -
> -static struct platform_driver osk_panel_driver = {
> - .probe = osk_panel_probe,
> - .driver = {
> - .name = "lcd_osk",
> - },
> -};
> -
> -module_platform_driver(osk_panel_driver);
> -
> -MODULE_AUTHOR("Imre Deak");
> -MODULE_DESCRIPTION("LCD panel support for the TI OMAP OSK board");
> -MODULE_LICENSE("GPL");
@@ -18,7 +18,6 @@ objs-y$(CONFIG_FB_OMAP_LCDC_HWA742) += hwa742.o
lcds-y$(CONFIG_MACH_AMS_DELTA) += lcd_ams_delta.o
lcds-y$(CONFIG_MACH_OMAP_PALMTE) += lcd_palmte.o
-lcds-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o
lcds-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o
deleted file mode 100644
@@ -1,86 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * LCD panel support for the TI OMAP OSK board
- *
- * Copyright (C) 2004 Nokia Corporation
- * Author: Imre Deak <imre.deak@nokia.com>
- * Adapted for OSK by <dirk.behme@de.bosch.com>
- */
-
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-
-#include <linux/soc/ti/omap1-io.h>
-#include <linux/soc/ti/omap1-mux.h>
-
-#include "omapfb.h"
-
-static int osk_panel_enable(struct lcd_panel *panel)
-{
- /* configure PWL pin */
- omap_cfg_reg(PWL);
-
- /* Enable PWL unit */
- omap_writeb(0x01, OMAP_PWL_CLK_ENABLE);
-
- /* Set PWL level */
- omap_writeb(0xFF, OMAP_PWL_ENABLE);
-
- /* set GPIO2 high (lcd power enabled) */
- gpio_set_value(2, 1);
-
- return 0;
-}
-
-static void osk_panel_disable(struct lcd_panel *panel)
-{
- /* Set PWL level to zero */
- omap_writeb(0x00, OMAP_PWL_ENABLE);
-
- /* Disable PWL unit */
- omap_writeb(0x00, OMAP_PWL_CLK_ENABLE);
-
- /* set GPIO2 low */
- gpio_set_value(2, 0);
-}
-
-static struct lcd_panel osk_panel = {
- .name = "osk",
- .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 = osk_panel_enable,
- .disable = osk_panel_disable,
-};
-
-static int osk_panel_probe(struct platform_device *pdev)
-{
- omapfb_register_panel(&osk_panel);
- return 0;
-}
-
-static struct platform_driver osk_panel_driver = {
- .probe = osk_panel_probe,
- .driver = {
- .name = "lcd_osk",
- },
-};
-
-module_platform_driver(osk_panel_driver);
-
-MODULE_AUTHOR("Imre Deak");
-MODULE_DESCRIPTION("LCD panel support for the TI OMAP OSK board");
-MODULE_LICENSE("GPL");