Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91d94af5 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap: Remove support for omap2evm 



The board support has never been merged for it as noticed
by Russell King <linux@arm.linux.org.uk>. So let's remove the
related dead code.

Cc: linux-fbdev@vger.kernel.org
Cc: alsa-devel@alsa-project.org
Cc: Paul Mundt <lethal@linux-sh.org>
Acked-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Acked-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent bc593f5d

arch/arm/plat-omap/include/plat/uncompress.h

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ static inline void __arch_decomp_setup(unsigned long arch_id) 
		DEBUG_LL_OMAP1(3, sx1);



		/* omap2 based boards using UART1 */

		DEBUG_LL_OMAP2(1, omap2evm);

		DEBUG_LL_OMAP2(1, omap_2430sdp);

		DEBUG_LL_OMAP2(1, omap_apollon);

		DEBUG_LL_OMAP2(1, omap_h4);

drivers/video/omap/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o 
objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o

objs-y$(CONFIG_MACH_OMAP_3430SDP) += lcd_2430sdp.o

objs-y$(CONFIG_MACH_OMAP_LDP) += lcd_ldp.o

objs-y$(CONFIG_MACH_OMAP2EVM) += lcd_omap2evm.o

objs-y$(CONFIG_MACH_OMAP3EVM) += lcd_omap3evm.o

objs-y$(CONFIG_MACH_OMAP3_BEAGLE) += lcd_omap3beagle.o

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

drivers/video/omap/lcd_omap2evm.c

deleted100644 → 0
+0 −192
Original line number Diff line number Diff line 
/*

 * LCD panel support for the MISTRAL OMAP2EVM board

 *

 * Author: Arun C <arunedarath@mistralsolutions.com>

 *

 * Derived from drivers/video/omap/lcd_omap3evm.c

 * Derived from drivers/video/omap/lcd-apollon.c

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by the

 * Free Software Foundation; either version 2 of the License, or (at your

 * option) any later version.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */



#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>

#include <linux/i2c/twl.h>



#include <plat/mux.h>

#include <asm/mach-types.h>



#include "omapfb.h"



#define LCD_PANEL_ENABLE_GPIO	154

#define LCD_PANEL_LR		128

#define LCD_PANEL_UD		129

#define LCD_PANEL_INI		152

#define LCD_PANEL_QVGA		148

#define LCD_PANEL_RESB		153



#define TWL_LED_LEDEN		0x00

#define TWL_PWMA_PWMAON		0x00

#define TWL_PWMA_PWMAOFF	0x01



static unsigned int bklight_level;



static int omap2evm_panel_init(struct lcd_panel *panel,

				struct omapfb_device *fbdev)

{

	gpio_request(LCD_PANEL_ENABLE_GPIO, "LCD enable");

	gpio_request(LCD_PANEL_LR, "LCD lr");

	gpio_request(LCD_PANEL_UD, "LCD ud");

	gpio_request(LCD_PANEL_INI, "LCD ini");

	gpio_request(LCD_PANEL_QVGA, "LCD qvga");

	gpio_request(LCD_PANEL_RESB, "LCD resb");



	gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 1);

	gpio_direction_output(LCD_PANEL_RESB, 1);

	gpio_direction_output(LCD_PANEL_INI, 1);

	gpio_direction_output(LCD_PANEL_QVGA, 0);

	gpio_direction_output(LCD_PANEL_LR, 1);

	gpio_direction_output(LCD_PANEL_UD, 1);



	twl_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);

	twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);

	twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);

	bklight_level = 100;



	return 0;

}



static void omap2evm_panel_cleanup(struct lcd_panel *panel)

{

	gpio_free(LCD_PANEL_RESB);

	gpio_free(LCD_PANEL_QVGA);

	gpio_free(LCD_PANEL_INI);

	gpio_free(LCD_PANEL_UD);

	gpio_free(LCD_PANEL_LR);

	gpio_free(LCD_PANEL_ENABLE_GPIO);

}



static int omap2evm_panel_enable(struct lcd_panel *panel)

{

	gpio_set_value(LCD_PANEL_ENABLE_GPIO, 0);

	return 0;

}



static void omap2evm_panel_disable(struct lcd_panel *panel)

{

	gpio_set_value(LCD_PANEL_ENABLE_GPIO, 1);

}



static unsigned long omap2evm_panel_get_caps(struct lcd_panel *panel)

{

	return 0;

}



static int omap2evm_bklight_setlevel(struct lcd_panel *panel,

						unsigned int level)

{

	u8 c;

	if ((level >= 0) && (level <= 100)) {

		c = (125 * (100 - level)) / 100 + 2;

		twl_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);

		bklight_level = level;

	}

	return 0;

}



static unsigned int omap2evm_bklight_getlevel(struct lcd_panel *panel)

{

	return bklight_level;

}



static unsigned int omap2evm_bklight_getmaxlevel(struct lcd_panel *panel)

{

	return 100;

}



struct lcd_panel omap2evm_panel = {

	.name		= "omap2evm",

	.config		= OMAP_LCDC_PANEL_TFT | OMAP_LCDC_INV_VSYNC |

			  OMAP_LCDC_INV_HSYNC,



	.bpp		= 16,

	.data_lines	= 18,

	.x_res		= 480,

	.y_res		= 640,

	.hsw		= 3,

	.hfp		= 0,

	.hbp		= 28,

	.vsw		= 2,

	.vfp		= 1,

	.vbp		= 0,



	.pixel_clock	= 20000,



	.init		= omap2evm_panel_init,

	.cleanup	= omap2evm_panel_cleanup,

	.enable		= omap2evm_panel_enable,

	.disable	= omap2evm_panel_disable,

	.get_caps	= omap2evm_panel_get_caps,

	.set_bklight_level      = omap2evm_bklight_setlevel,

	.get_bklight_level      = omap2evm_bklight_getlevel,

	.get_bklight_max        = omap2evm_bklight_getmaxlevel,

};



static int omap2evm_panel_probe(struct platform_device *pdev)

{

	omapfb_register_panel(&omap2evm_panel);

	return 0;

}



static int omap2evm_panel_remove(struct platform_device *pdev)

{

	return 0;

}



static int omap2evm_panel_suspend(struct platform_device *pdev,

				   pm_message_t mesg)

{

	return 0;

}



static int omap2evm_panel_resume(struct platform_device *pdev)

{

	return 0;

}



struct platform_driver omap2evm_panel_driver = {

	.probe		= omap2evm_panel_probe,

	.remove		= omap2evm_panel_remove,

	.suspend	= omap2evm_panel_suspend,

	.resume		= omap2evm_panel_resume,

	.driver		= {

		.name	= "omap2evm_lcd",

		.owner	= THIS_MODULE,

	},

};



static int __init omap2evm_panel_drv_init(void)

{

	return platform_driver_register(&omap2evm_panel_driver);

}



static void __exit omap2evm_panel_drv_exit(void)

{

	platform_driver_unregister(&omap2evm_panel_driver);

}



module_init(omap2evm_panel_drv_init);

module_exit(omap2evm_panel_drv_exit);

sound/soc/omap/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -65,14 +65,6 @@ config SND_OMAP_SOC_OVERO 
	  Say Y if you want to add support for SoC audio on the

	  Gumstix Overo or CompuLab CM-T35



config SND_OMAP_SOC_OMAP2EVM

	tristate "SoC Audio support for OMAP2EVM board"

	depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP2EVM

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_TWL4030

	help

	  Say Y if you want to add support for SoC audio on the omap2evm board.



config SND_OMAP_SOC_OMAP3EVM

	tristate "SoC Audio support for OMAP3EVM board"

	depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3EVM

sound/soc/omap/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ snd-soc-rx51-objs := rx51.o 
snd-soc-ams-delta-objs := ams-delta.o

snd-soc-osk5912-objs := osk5912.o

snd-soc-overo-objs := overo.o

snd-soc-omap2evm-objs := omap2evm.o

snd-soc-omap3evm-objs := omap3evm.o

snd-soc-am3517evm-objs := am3517evm.o

snd-soc-sdp3430-objs := sdp3430.o