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

Commit 96974a24 authored by Mike Rapoport's avatar Mike Rapoport Committed by Tony Lindgren
Browse files

omap: consolidate touch screen initialization among different boards 



Add common-board-devices.c that will contain the code for peripheral
devices initializatoin shared between multiple boards.
Start small with touchscreen initialization.

Signed-off-by: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent d14f8174

arch/arm/mach-omap2/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -270,3 +270,5 @@ obj-$(CONFIG_ARCH_OMAP4) += hwspinlock.o 


disp-$(CONFIG_OMAP2_DSS)		:= display.o

obj-y					+= $(disp-m) $(disp-y)



obj-y					+= common-board-devices.o

arch/arm/mach-omap2/board-3430sdp.c

+6 −59
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/input.h>

#include <linux/input/matrix_keypad.h>

#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>

#include <linux/i2c/twl.h>

#include <linux/regulator/machine.h>

#include <linux/io.h>
@@ -48,6 +47,7 @@ 
#include "hsmmc.h"

#include "pm.h"

#include "control.h"

#include "common-board-devices.h"



#define CONFIG_DISABLE_HFCLK 1
@@ -123,58 +123,6 @@ static struct twl4030_keypad_data sdp3430_kp_data = { 
	.rep		= 1,

};



static int ts_gpio;	/* Needed for ads7846_get_pendown_state */



/**

 * @brief ads7846_dev_init : Requests & sets GPIO line for pen-irq

 *

 * @return - void. If request gpio fails then Flag KERN_ERR.

 */

static void ads7846_dev_init(void)

{

	if (gpio_request(ts_gpio, "ADS7846 pendown") < 0) {

		printk(KERN_ERR "can't get ads746 pen down GPIO\n");

		return;

	}



	gpio_direction_input(ts_gpio);

	gpio_set_debounce(ts_gpio, 310);

}



static int ads7846_get_pendown_state(void)

{

	return !gpio_get_value(ts_gpio);

}



static struct ads7846_platform_data tsc2046_config __initdata = {

	.get_pendown_state	= ads7846_get_pendown_state,

	.keep_vref_on		= 1,

	.wakeup				= true,

};





static struct omap2_mcspi_device_config tsc2046_mcspi_config = {

	.turbo_mode	= 0,

	.single_channel	= 1,	/* 0: slave, 1: master */

};



static struct spi_board_info sdp3430_spi_board_info[] __initdata = {

	[0] = {

		/*

		 * TSC2046 operates at a max freqency of 2MHz, so

		 * operate slightly below at 1.5MHz

		 */

		.modalias		= "ads7846",

		.bus_num		= 1,

		.chip_select		= 0,

		.max_speed_hz		= 1500000,

		.controller_data	= &tsc2046_mcspi_config,

		.irq			= 0,

		.platform_data		= &tsc2046_config,

	},

};





#define SDP3430_LCD_PANEL_BACKLIGHT_GPIO	8

#define SDP3430_LCD_PANEL_ENABLE_GPIO		5
@@ -880,6 +828,8 @@ static struct omap_musb_board_data musb_board_data = { 


static void __init omap_3430sdp_init(void)

{

	int gpio_pendown;



	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap_board_config = sdp3430_config;

	omap_board_config_size = ARRAY_SIZE(sdp3430_config);
@@ -887,13 +837,10 @@ static void __init omap_3430sdp_init(void) 
	omap3430_i2c_init();

	omap_display_init(&sdp3430_dss_data);

	if (omap_rev() > OMAP3430_REV_ES1_0)

		ts_gpio = SDP3430_TS_GPIO_IRQ_SDPV2;

		gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV2;

	else

		ts_gpio = SDP3430_TS_GPIO_IRQ_SDPV1;

	sdp3430_spi_board_info[0].irq = gpio_to_irq(ts_gpio);

	spi_register_board_info(sdp3430_spi_board_info,

				ARRAY_SIZE(sdp3430_spi_board_info));

	ads7846_dev_init();

		gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV1;

	omap_ads7846_init(1, gpio_pendown, 310, NULL);

	board_serial_init();

	usb_musb_init(&musb_board_data);

	board_smc91x_init();

arch/arm/mach-omap2/board-cm-t35.c

+2 −56
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#include "mux.h"

#include "sdram-micron-mt46h32m32lf-6.h"

#include "hsmmc.h"

#include "common-board-devices.h"



#define CM_T35_GPIO_PENDOWN	57
@@ -177,61 +178,6 @@ static void __init cm_t35_init_nand(void) 
static inline void cm_t35_init_nand(void) {}

#endif



#if defined(CONFIG_TOUCHSCREEN_ADS7846) || \

	defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)

#include <linux/spi/ads7846.h>



static struct omap2_mcspi_device_config ads7846_mcspi_config = {

	.turbo_mode	= 0,

	.single_channel	= 1,	/* 0: slave, 1: master */

};



static int ads7846_get_pendown_state(void)

{

	return !gpio_get_value(CM_T35_GPIO_PENDOWN);

}



static struct ads7846_platform_data ads7846_config = {

	.x_max			= 0x0fff,

	.y_max			= 0x0fff,

	.x_plate_ohms		= 180,

	.pressure_max		= 255,

	.debounce_max		= 10,

	.debounce_tol		= 3,

	.debounce_rep		= 1,

	.get_pendown_state	= ads7846_get_pendown_state,

	.keep_vref_on		= 1,

};



static struct spi_board_info cm_t35_spi_board_info[] __initdata = {

	{

		.modalias		= "ads7846",

		.bus_num		= 1,

		.chip_select		= 0,

		.max_speed_hz		= 1500000,

		.controller_data	= &ads7846_mcspi_config,

		.irq			= OMAP_GPIO_IRQ(CM_T35_GPIO_PENDOWN),

		.platform_data		= &ads7846_config,

	},

};



static void __init cm_t35_init_ads7846(void)

{

	if ((gpio_request(CM_T35_GPIO_PENDOWN, "ADS7846_PENDOWN") == 0) &&

	    (gpio_direction_input(CM_T35_GPIO_PENDOWN) == 0)) {

		gpio_export(CM_T35_GPIO_PENDOWN, 0);

	} else {

		pr_err("CM-T35: could not obtain gpio for ADS7846_PENDOWN\n");

		return;

	}



	spi_register_board_info(cm_t35_spi_board_info,

				ARRAY_SIZE(cm_t35_spi_board_info));

}

#else

static inline void cm_t35_init_ads7846(void) {}

#endif



#define CM_T35_LCD_EN_GPIO 157

#define CM_T35_LCD_BL_GPIO 58

#define CM_T35_DVI_EN_GPIO 54
@@ -734,7 +680,7 @@ static void __init cm_t35_init(void) 
	omap_serial_init();

	cm_t35_init_i2c();

	cm_t35_init_nand();

	cm_t35_init_ads7846();

	omap_ads7846_init(1, CM_T35_GPIO_PENDOWN, 0, NULL);

	cm_t35_init_ethernet();

	cm_t35_init_led();

	cm_t35_init_display();

arch/arm/mach-omap2/board-devkit8000.c

+2 −54
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
#include <plat/mcspi.h>

#include <linux/input/matrix_keypad.h>

#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>

#include <linux/dm9000.h>

#include <linux/interrupt.h>
@@ -60,6 +59,7 @@ 
#include "mux.h"

#include "hsmmc.h"

#include "timer-gp.h"

#include "common-board-devices.h"



#define NAND_BLOCK_SIZE		SZ_128K
@@ -463,56 +463,6 @@ static void __init devkit8000_init_irq(void) 
#endif

}



static void __init devkit8000_ads7846_init(void)

{

	int gpio = OMAP3_DEVKIT_TS_GPIO;

	int ret;



	ret = gpio_request(gpio, "ads7846_pen_down");

	if (ret < 0) {

		printk(KERN_ERR "Failed to request GPIO %d for "

				"ads7846 pen down IRQ\n", gpio);

		return;

	}



	gpio_direction_input(gpio);

}



static int ads7846_get_pendown_state(void)

{

	return !gpio_get_value(OMAP3_DEVKIT_TS_GPIO);

}



static struct ads7846_platform_data ads7846_config = {

	.x_max                  = 0x0fff,

	.y_max                  = 0x0fff,

	.x_plate_ohms           = 180,

	.pressure_max           = 255,

	.debounce_max           = 10,

	.debounce_tol           = 5,

	.debounce_rep           = 1,

	.get_pendown_state	= ads7846_get_pendown_state,

	.keep_vref_on		= 1,

	.settle_delay_usecs     = 150,

};



static struct omap2_mcspi_device_config ads7846_mcspi_config = {

	.turbo_mode	= 0,

	.single_channel	= 1,	/* 0: slave, 1: master */

};



static struct spi_board_info devkit8000_spi_board_info[] __initdata = {

	{

		.modalias		= "ads7846",

		.bus_num		= 2,

		.chip_select		= 0,

		.max_speed_hz		= 1500000,

		.controller_data	= &ads7846_mcspi_config,

		.irq			= OMAP_GPIO_IRQ(OMAP3_DEVKIT_TS_GPIO),

		.platform_data		= &ads7846_config,

	}

};



#define OMAP_DM9000_BASE	0x2c000000



static struct resource omap_dm9000_resources[] = {
@@ -795,10 +745,8 @@ static void __init devkit8000_init(void) 
			ARRAY_SIZE(devkit8000_devices));



	omap_display_init(&devkit8000_dss_data);

	spi_register_board_info(devkit8000_spi_board_info,

	ARRAY_SIZE(devkit8000_spi_board_info));



	devkit8000_ads7846_init();

	omap_ads7846_init(2, OMAP3_DEVKIT_TS_GPIO, 0, NULL);



	usb_musb_init(&musb_board_data);

	usbhs_init(&usbhs_bdata);

arch/arm/mach-omap2/board-ldp.c

+2 −55
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/err.h>

#include <linux/clk.h>

#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>

#include <linux/regulator/machine.h>

#include <linux/i2c/twl.h>

#include <linux/io.h>
@@ -49,6 +48,7 @@ 
#include "mux.h"

#include "hsmmc.h"

#include "control.h"

#include "common-board-devices.h"



#define LDP_SMSC911X_CS		1

#define LDP_SMSC911X_GPIO	152
@@ -168,55 +168,6 @@ static struct platform_device ldp_gpio_keys_device = { 
	},

};



static int ts_gpio;



/**

 * @brief ads7846_dev_init : Requests & sets GPIO line for pen-irq

 *

 * @return - void. If request gpio fails then Flag KERN_ERR.

 */

static void ads7846_dev_init(void)

{

	if (gpio_request(ts_gpio, "ads7846 irq") < 0) {

		printk(KERN_ERR "can't get ads746 pen down GPIO\n");

		return;

	}



	gpio_direction_input(ts_gpio);

	gpio_set_debounce(ts_gpio, 310);

}



static int ads7846_get_pendown_state(void)

{

	return !gpio_get_value(ts_gpio);

}



static struct ads7846_platform_data tsc2046_config __initdata = {

	.get_pendown_state	= ads7846_get_pendown_state,

	.keep_vref_on		= 1,

};



static struct omap2_mcspi_device_config tsc2046_mcspi_config = {

	.turbo_mode	= 0,

	.single_channel	= 1,	/* 0: slave, 1: master */

};



static struct spi_board_info ldp_spi_board_info[] __initdata = {

	[0] = {

		/*

		 * TSC2046 operates at a max freqency of 2MHz, so

		 * operate slightly below at 1.5MHz

		 */

		.modalias		= "ads7846",

		.bus_num		= 1,

		.chip_select		= 0,

		.max_speed_hz		= 1500000,

		.controller_data	= &tsc2046_mcspi_config,

		.irq			= 0,

		.platform_data		= &tsc2046_config,

	},

};



static struct omap_smsc911x_platform_data smsc911x_cfg = {

	.cs             = LDP_SMSC911X_CS,

	.gpio_irq       = LDP_SMSC911X_GPIO,
@@ -399,11 +350,7 @@ static void __init omap_ldp_init(void) 
	ldp_init_smsc911x();

	omap_i2c_init();

	platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices));

	ts_gpio = 54;

	ldp_spi_board_info[0].irq = gpio_to_irq(ts_gpio);

	spi_register_board_info(ldp_spi_board_info,

				ARRAY_SIZE(ldp_spi_board_info));

	ads7846_dev_init();

	omap_ads7846_init(1, 54, 310, NULL);

	omap_serial_init();

	usb_musb_init(&musb_board_data);

	board_nand_init(ldp_nand_partitions,