Commit fa395aae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (51 commits)
  Input: appletouch - give up maintainership
  Input: dm355evm_kbd - switch to using sparse keymap library
  Input: wistron_btns - switch to using sparse keymap library
  Input: add generic support for sparse keymaps
  Input: fix memory leak in force feedback core
  Input: wistron - remove identification strings from DMI table
  Input: psmouse - remove identification strings from DMI tables
  Input: atkbd - remove identification strings from DMI table
  Input: i8042 - remove identification strings from DMI tables
  DMI: allow omitting ident strings in DMI tables
  Input: psmouse - do not carry DMI data around
  Input: matrix-keypad - switch to using dev_pm_ops
  Input: keyboard - fix lack of locking when traversing handler->h_list
  Input: gpio_keys - scan gpio state at probe and resume time
  Input: keyboard - add locking around event handling
  Input: usbtouchscreen - add support for ET&T TC5UH touchscreen controller
  Input: xpad - add two new Xbox 360 devices
  Input: polled device - do not start polling if interval is zero
  Input: polled device - schedule first poll immediately
  Input: add S3C24XX touchscreen driver
  ...
parents 3e746831 1f26978a

Documentation/DocBook/device-drivers.tmpl

+13 −0
Original line number Diff line number Diff line
@@ -293,10 +293,23 @@ X!Idrivers/video/console/fonts.c 


  <chapter id="input_subsystem">

     <title>Input Subsystem</title>

     <sect1><title>Input core</title>

!Iinclude/linux/input.h

!Edrivers/input/input.c

!Edrivers/input/ff-core.c

!Edrivers/input/ff-memless.c

     </sect1>

     <sect1><title>Polled input devices</title>

!Iinclude/linux/input-polldev.h

!Edrivers/input/input-polldev.c

     </sect1>

     <sect1><title>Matrix keyboars/keypads</title>

!Iinclude/linux/input/matrix_keypad.h

     </sect1>

     <sect1><title>Sparse keymap support</title>

!Iinclude/linux/input/sparse-keymap.h

!Edrivers/input/sparse-keymap.c

     </sect1>

  </chapter>



  <chapter id="spi">

MAINTAINERS

+0 −7
Original line number Diff line number Diff line
@@ -486,13 +486,6 @@ S: Maintained 
F:	drivers/net/appletalk/

F:	net/appletalk/



APPLETOUCH TOUCHPAD DRIVER

M:	Johannes Berg <johannes@sipsolutions.net>

L:	linux-input@vger.kernel.org

S:	Maintained

F:	Documentation/input/appletouch.txt

F:	drivers/input/mouse/appletouch.c



ARC FRAMEBUFFER DRIVER

M:	Jaya Kumar <jayalk@intworks.biz>

S:	Maintained

arch/arm/mach-at91/at91sam9g45_devices.c

+51 −0
Original line number Diff line number Diff line
@@ -865,6 +865,57 @@ static void __init at91_add_device_rtc(void) {} 
#endif





/* --------------------------------------------------------------------

 *  Touchscreen

 * -------------------------------------------------------------------- */



#if defined(CONFIG_TOUCHSCREEN_ATMEL_TSADCC) || defined(CONFIG_TOUCHSCREEN_ATMEL_TSADCC_MODULE)

static u64 tsadcc_dmamask = DMA_BIT_MASK(32);

static struct at91_tsadcc_data tsadcc_data;



static struct resource tsadcc_resources[] = {

	[0] = {

		.start	= AT91SAM9G45_BASE_TSC,

		.end	= AT91SAM9G45_BASE_TSC + SZ_16K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= AT91SAM9G45_ID_TSC,

		.end	= AT91SAM9G45_ID_TSC,

		.flags	= IORESOURCE_IRQ,

	}

};



static struct platform_device at91sam9g45_tsadcc_device = {

	.name		= "atmel_tsadcc",

	.id		= -1,

	.dev		= {

				.dma_mask		= &tsadcc_dmamask,

				.coherent_dma_mask	= DMA_BIT_MASK(32),

				.platform_data		= &tsadcc_data,

	},

	.resource	= tsadcc_resources,

	.num_resources	= ARRAY_SIZE(tsadcc_resources),

};



void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data)

{

	if (!data)

		return;



	at91_set_gpio_input(AT91_PIN_PD20, 0);	/* AD0_XR */

	at91_set_gpio_input(AT91_PIN_PD21, 0);	/* AD1_XL */

	at91_set_gpio_input(AT91_PIN_PD22, 0);	/* AD2_YT */

	at91_set_gpio_input(AT91_PIN_PD23, 0);	/* AD3_TB */



	tsadcc_data = *data;

	platform_device_register(&at91sam9g45_tsadcc_device);

}

#else

void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data) {}

#endif





/* --------------------------------------------------------------------

 *  RTT

 * -------------------------------------------------------------------- */

arch/arm/mach-at91/at91sam9rl_devices.c

+8 −2
Original line number Diff line number Diff line
@@ -622,6 +622,7 @@ static void __init at91_add_device_tc(void) { } 


#if defined(CONFIG_TOUCHSCREEN_ATMEL_TSADCC) || defined(CONFIG_TOUCHSCREEN_ATMEL_TSADCC_MODULE)

static u64 tsadcc_dmamask = DMA_BIT_MASK(32);

static struct at91_tsadcc_data tsadcc_data;



static struct resource tsadcc_resources[] = {

	[0] = {
@@ -642,22 +643,27 @@ static struct platform_device at91sam9rl_tsadcc_device = { 
	.dev		= {

				.dma_mask		= &tsadcc_dmamask,

				.coherent_dma_mask	= DMA_BIT_MASK(32),

				.platform_data		= &tsadcc_data,

	},

	.resource	= tsadcc_resources,

	.num_resources	= ARRAY_SIZE(tsadcc_resources),

};



void __init at91_add_device_tsadcc(void)

void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data)

{

	if (!data)

		return;



	at91_set_A_periph(AT91_PIN_PA17, 0);	/* AD0_XR */

	at91_set_A_periph(AT91_PIN_PA18, 0);	/* AD1_XL */

	at91_set_A_periph(AT91_PIN_PA19, 0);	/* AD2_YT */

	at91_set_A_periph(AT91_PIN_PA20, 0);	/* AD3_TB */



	tsadcc_data = *data;

	platform_device_register(&at91sam9rl_tsadcc_device);

}

#else

void __init at91_add_device_tsadcc(void) {}

void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data) {}

#endif

arch/arm/mach-at91/board-sam9m10g45ek.c

+12 −0
Original line number Diff line number Diff line
@@ -228,6 +228,16 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data; 
#endif





/*

 * Touchscreen

 */

static struct at91_tsadcc_data ek_tsadcc_data = {

	.adc_clock		= 300000,

	.pendet_debounce	= 0x0d,

	.ts_sample_hold_time	= 0x0a,

};





/*

 * GPIO Buttons

 */
@@ -379,6 +389,8 @@ static void __init ek_board_init(void) 
	at91_add_device_i2c(0, NULL, 0);

	/* LCD Controller */

	at91_add_device_lcdc(&ek_lcdc_data);

	/* Touch Screen */

	at91_add_device_tsadcc(&ek_tsadcc_data);

	/* Push Buttons */

	ek_add_device_buttons();

	/* AC97 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE