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

Commit 57af8edf authored by Michael Hennerich's avatar Michael Hennerich Committed by Mike Frysinger
Browse files

Blackfin: bf537-stamp/bf548-ezkit: update ADXL34x resources 



Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 31ad0e27

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

+21 −4
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ static const struct ad7879_platform_data bfin_ad7879_ts_info = { 


#if defined(CONFIG_INPUT_ADXL34X) || defined(CONFIG_INPUT_ADXL34X_MODULE)

#include <linux/input.h>

#include <linux/spi/adxl34x.h>

#include <linux/input/adxl34x.h>

static const struct adxl34x_platform_data adxl34x_info = {

	.x_axis_offset = 0,

	.y_axis_offset = 0,
@@ -722,9 +722,7 @@ static const struct adxl34x_platform_data adxl34x_info = { 
	.ev_code_y = ABS_Y,		/* EV_REL */

	.ev_code_z = ABS_Z,		/* EV_REL */



	.ev_code_tap_x = BTN_TOUCH,		/* EV_KEY */

	.ev_code_tap_y = BTN_TOUCH,		/* EV_KEY */

	.ev_code_tap_z = BTN_TOUCH,		/* EV_KEY */

	.ev_code_tap = {BTN_TOUCH, BTN_TOUCH, BTN_TOUCH}, /* EV_KEY x,y,z */



/*	.ev_code_ff = KEY_F,*/		/* EV_KEY */

/*	.ev_code_act_inactivity = KEY_A,*/	/* EV_KEY */
@@ -795,6 +793,13 @@ static struct bfin5xx_spi_chip data_flash_chip_info = { 
};

#endif



#if defined(CONFIG_INPUT_ADXL34X_SPI) || defined(CONFIG_INPUT_ADXL34X_SPI_MODULE)

static struct bfin5xx_spi_chip spi_adxl34x_chip_info = {

	.enable_dma = 0,         /* use dma transfer with this chip*/

	.bits_per_word = 8,

};

#endif



static struct spi_board_info bfin_spi_board_info[] __initdata = {

#if defined(CONFIG_MTD_M25P80) \

	|| defined(CONFIG_MTD_M25P80_MODULE)
@@ -933,6 +938,18 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.mode = SPI_MODE_0,

	},

#endif

#if defined(CONFIG_INPUT_ADXL34X_SPI) || defined(CONFIG_INPUT_ADXL34X_SPI_MODULE)

	{

		.modalias	= "adxl34x",

		.platform_data	= &adxl34x_info,

		.irq		= IRQ_PF6,

		.max_speed_hz	= 5000000,    /* max spi clock (SCK) speed in HZ */

		.bus_num	= 0,

		.chip_select	= 2,

		.controller_data = &spi_adxl34x_chip_info,

		.mode = SPI_MODE_3,

	},

#endif

};



#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

arch/blackfin/mach-bf548/boards/ezkit.c

+2 −4
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static struct platform_device bfin_rotary_device = { 
#endif



#if defined(CONFIG_INPUT_ADXL34X) || defined(CONFIG_INPUT_ADXL34X_MODULE)

#include <linux/spi/adxl34x.h>

#include <linux/input/adxl34x.h>

static const struct adxl34x_platform_data adxl34x_info = {

	.x_axis_offset = 0,

	.y_axis_offset = 0,
@@ -210,9 +210,7 @@ static const struct adxl34x_platform_data adxl34x_info = { 
	.ev_code_y = ABS_Y,		/* EV_REL */

	.ev_code_z = ABS_Z,		/* EV_REL */



	.ev_code_tap_x = BTN_TOUCH,		/* EV_KEY */

	.ev_code_tap_y = BTN_TOUCH,		/* EV_KEY */

	.ev_code_tap_z = BTN_TOUCH,		/* EV_KEY */

	.ev_code_tap = {BTN_TOUCH, BTN_TOUCH, BTN_TOUCH}, /* EV_KEY x,y,z */



/*	.ev_code_ff = KEY_F,*/		/* EV_KEY */

/*	.ev_code_act_inactivity = KEY_A,*/	/* EV_KEY */