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

Commit f5150155 authored by Michael Hennerich's avatar Michael Hennerich Committed by Bryan Wu
Browse files

Blackfin arch: update AD7879 platform resources in board file 



Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent b4f5c58f

arch/blackfin/mach-bf537/boards/stamp.c

+17 −8
Original line number Diff line number Diff line
@@ -577,11 +577,6 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = { 


#if defined(CONFIG_TOUCHSCREEN_AD7879) || defined(CONFIG_TOUCHSCREEN_AD7879_MODULE)

#include <linux/spi/ad7879.h>

static struct bfin5xx_spi_chip spi_ad7879_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 16,

};



static const struct ad7879_platform_data bfin_ad7879_ts_info = {

	.model			= 7879,	/* Model = AD7879 */

	.x_plate_ohms		= 620,	/* 620 Ohm from the touch datasheet */
@@ -597,6 +592,13 @@ static const struct ad7879_platform_data bfin_ad7879_ts_info = { 
};

#endif



#if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE)

static struct bfin5xx_spi_chip spi_ad7879_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 16,

};

#endif



#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)

static struct bfin5xx_spi_chip spidev_chip_info = {

	.enable_dma = 0,
@@ -750,7 +752,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.controller_data = &spi_ad7877_chip_info,

	},

#endif

#if defined(CONFIG_TOUCHSCREEN_AD7879) || defined(CONFIG_TOUCHSCREEN_AD7879_MODULE)

#if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE)

	{

		.modalias = "ad7879",

		.platform_data = &bfin_ad7879_ts_info,
@@ -935,7 +937,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { 
#if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE)

	{

		I2C_BOARD_INFO("ad7142_joystick", 0x2C),

		.irq = 55,

		.irq = IRQ_PF5,

	},

#endif

#if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE)
@@ -946,7 +948,14 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { 
#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)

	{

		I2C_BOARD_INFO("pcf8574_keypad", 0x27),

		.irq = 72,

		.irq = IRQ_PG6,

	},

#endif

#if defined(CONFIG_TOUCHSCREEN_AD7879_I2C) || defined(CONFIG_TOUCHSCREEN_AD7879_I2C_MODULE)

	{

		I2C_BOARD_INFO("ad7879", 0x2F),

		.irq = IRQ_PG5,

		.platform_data = (void *)&bfin_ad7879_ts_info,

	},

#endif

};