Commit db70e26e 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 

Pull input updates from Dmitry Torokhov:

 - a few drivers have been updated to use flexible-array syntax instead
   of GCC extension

 - ili210x touchscreen driver now supports the 2120 protocol flavor

 - a couple more of Synaptics devices have been switched over to RMI4

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: cyapa - replace zero-length array with flexible-array member
  Input: tca6416-keypad - replace zero-length array with flexible-array member
  Input: gpio_keys_polled - replace zero-length array with flexible-array member
  Input: synaptics - remove the LEN0049 dmi id from topbuttonpad list
  Input: synaptics - enable SMBus on ThinkPad L470
  Input: synaptics - switch T470s to RMI4 by default
  Input: gpio_keys - replace zero-length array with flexible-array member
  Input: goldfish_events - replace zero-length array with flexible-array member
  Input: psmouse - switch to using i2c_new_scanned_device()
  Input: ili210x - add ili2120 support
  Input: ili210x - fix return value of is_visible function
parents 54654e14 3dbae155

Documentation/devicetree/bindings/input/ilitek,ili2xxx.txt

+2 −1
Original line number Diff line number Diff line 
Ilitek ILI210x/ILI2117/ILI251x touchscreen controller

Ilitek ILI210x/ILI2117/ILI2120/ILI251x touchscreen controller



Required properties:

- compatible:

    ilitek,ili210x for ILI210x

    ilitek,ili2117 for ILI2117

    ilitek,ili2120 for ILI2120

    ilitek,ili251x for ILI251x



- reg: The I2C address of the device

drivers/input/keyboard/goldfish_events.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct event_dev { 
	struct input_dev *input;

	int irq;

	void __iomem *addr;

	char name[0];

	char name[];

};



static irqreturn_t events_interrupt(int irq, void *dev_id)

drivers/input/keyboard/gpio_keys.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct gpio_keys_drvdata { 
	struct input_dev *input;

	struct mutex disable_lock;

	unsigned short *keymap;

	struct gpio_button_data data[0];

	struct gpio_button_data data[];

};



/*

drivers/input/keyboard/gpio_keys_polled.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct gpio_keys_polled_dev { 
	const struct gpio_keys_platform_data *pdata;

	unsigned long rel_axis_seen[BITS_TO_LONGS(REL_CNT)];

	unsigned long abs_axis_seen[BITS_TO_LONGS(ABS_CNT)];

	struct gpio_keys_button_data data[0];

	struct gpio_keys_button_data data[];

};



static void gpio_keys_button_event(struct input_dev *input,

drivers/input/keyboard/tca6416-keypad.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ MODULE_DEVICE_TABLE(i2c, tca6416_id); 


struct tca6416_drv_data {

	struct input_dev *input;

	struct tca6416_button data[0];

	struct tca6416_button data[];

};



struct tca6416_keypad_chip {
@@ -48,7 +48,7 @@ struct tca6416_keypad_chip { 
	int irqnum;

	u16 pinmask;

	bool use_polling;

	struct tca6416_button buttons[0];

	struct tca6416_button buttons[];

};



static int tca6416_write_reg(struct tca6416_keypad_chip *chip, int reg, u16 val)

CRA Git | Maintained and supported by SUSTech CRA and CCSE