linux-next: manual merge of the input tree with Linus' tree

linux-next: manual merge of the input tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1686 bytes --]

Hi all,

Today's linux-next merge of the input tree got a conflict in:

  Documentation/devicetree/bindings/input/cap11xx.txt

between commit:

  a8bc0707e134 ("dt-bindings: input: microchip,cap11xx: Convert txt bindings to yaml")

from Linus' tree and commit:

  322a552e1955 ("Input: cap11xx - add support for cap1206")

from the input tree.

I fixed it up (I remove the file and adde the following patch) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 4 Nov 2021 10:18:15 +1100
Subject: [PATCH] Input: cap11xx: fix for "dt-bindings: input:
 microchip,cap11xx: Convert txt bindings to yaml"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 Documentation/devicetree/bindings/input/microchip,cap11xx.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/input/microchip,cap11xx.yaml b/Documentation/devicetree/bindings/input/microchip,cap11xx.yaml
index fa0f37a90ac9..d5d6bced3148 100644
--- a/Documentation/devicetree/bindings/input/microchip,cap11xx.yaml
+++ b/Documentation/devicetree/bindings/input/microchip,cap11xx.yaml
@@ -19,6 +19,7 @@ properties:
       - microchip,cap1106
       - microchip,cap1126
       - microchip,cap1188
+      - microchip,cap1206
 
   reg:
     maxItems: 1
-- 
2.33.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the input tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

Hi all,

Today's linux-next merge of the input tree got a conflict in:

  drivers/input/misc/axp20x-pek.c

between commit:

  5ecc1e947822 ("Input: axp20x-pek - Use new soc_intel_is_cht() helper")

from Linus' tree and commit:

  8a78050ee257 ("Input: axp20x-pek - revert "always register interrupt handlers" change")

from the input tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/input/misc/axp20x-pek.c
index e09b1fae42e1,c8f87df93a50..000000000000
--- a/drivers/input/misc/axp20x-pek.c
+++ b/drivers/input/misc/axp20x-pek.c
@@@ -293,19 -339,7 +323,7 @@@ static int axp20x_pek_probe(struct plat
  
  	axp20x_pek->axp20x = dev_get_drvdata(pdev->dev.parent);
  
- 	axp20x_pek->irq_dbr = platform_get_irq_byname(pdev, "PEK_DBR");
- 	if (axp20x_pek->irq_dbr < 0)
- 		return axp20x_pek->irq_dbr;
- 	axp20x_pek->irq_dbr = regmap_irq_get_virq(
- 			axp20x_pek->axp20x->regmap_irqc, axp20x_pek->irq_dbr);
- 
- 	axp20x_pek->irq_dbf = platform_get_irq_byname(pdev, "PEK_DBF");
- 	if (axp20x_pek->irq_dbf < 0)
- 		return axp20x_pek->irq_dbf;
- 	axp20x_pek->irq_dbf = regmap_irq_get_virq(
- 			axp20x_pek->axp20x->regmap_irqc, axp20x_pek->irq_dbf);
- 
 -	if (axp20x_pek_should_register_input(axp20x_pek, pdev)) {
 +	if (axp20x_pek_should_register_input(axp20x_pek)) {
  		error = axp20x_pek_probe_input_device(axp20x_pek, pdev);
  		if (error)
  			return error;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the input tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2109 bytes --]

Hi all,

Today's linux-next merge of the input tree got a conflict in:

  drivers/input/mouse/elan_i2c_core.c

between commit:

  966334dfc472 ("Input: elan_i2c - only increment wakeup count on touch")

from Linus' tree and commit:

  04d5ce620f79 ("Input: elan_i2c - add support for high resolution reports")

from the input tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/input/mouse/elan_i2c_core.c
index 6291fb5fa015,4b6e2dffc0ea..000000000000
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@@ -951,13 -997,12 +997,14 @@@ static void elan_report_absolute(struc
  	u8 hover_info = packet[ETP_HOVER_INFO_OFFSET];
  	bool contact_valid, hover_event;
  
 +	pm_wakeup_event(&data->client->dev, 0);
 +
- 	hover_event = hover_info & 0x40;
- 	for (i = 0; i < ETP_MAX_FINGERS; i++) {
- 		contact_valid = tp_info & (1U << (3 + i));
- 		elan_report_contact(data, i, contact_valid, finger_data);
+ 	hover_event = hover_info & BIT(6);
  
+ 	for (i = 0; i < ETP_MAX_FINGERS; i++) {
+ 		contact_valid = tp_info & BIT(3 + i);
+ 		elan_report_contact(data, i, contact_valid, high_precision,
+ 				    packet, finger_data);
  		if (contact_valid)
  			finger_data += ETP_FINGER_DATA_LEN;
  	}
@@@ -1019,9 -1063,14 +1066,12 @@@ static irqreturn_t elan_isr(int irq, vo
  	if (error)
  		goto out;
  
 -	pm_wakeup_event(dev, 0);
 -
  	switch (report[ETP_REPORT_ID_OFFSET]) {
  	case ETP_REPORT_ID:
- 		elan_report_absolute(data, report);
+ 		elan_report_absolute(data, report, false);
+ 		break;
+ 	case ETP_REPORT_ID2:
+ 		elan_report_absolute(data, report, true);
  		break;
  	case ETP_TP_REPORT_ID:
  		elan_report_trackpoint(data, report);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the input tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1492 bytes --]

Hi Dmitry,

Today's linux-next merge of the input tree got a conflict in
arch/arm/boot/dts/am335x-evmsk.dts between commit 55b4452b4b70 ("ARM:
dts: AM33XX: Add MMC support and documentation") (and others) from Linus'
tree and commit 2c027b7c48a8 ("arm: dts: am335x sk: add touchscreen
support") from the input tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/boot/dts/am335x-evmsk.dts
index 03febf85fd2f,d7c2c0c58437..000000000000
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@@ -452,36 -420,12 +452,46 @@@
  	phy-mode = "rgmii-txid";
  };
  
 +&mmc1 {
 +	status = "okay";
 +	vmmc-supply = <&vmmc_reg>;
 +	bus-width = <4>;
 +};
 +
 +&sham {
 +	status = "okay";
 +};
 +
 +&aes {
 +	status = "okay";
 +};
 +
 +&gpio0 {
 +	ti,no-reset-on-init;
 +};
 +
 +&mcasp1 {
 +		pinctrl-names = "default";
 +		pinctrl-0 = <&mcasp1_pins>;
 +
 +		status = "okay";
 +
 +		op-mode = <0>;          /* MCASP_IIS_MODE */
 +		tdm-slots = <2>;
 +		/* 4 serializers */
 +		serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
 +			0 0 1 2
 +		>;
 +		tx-num-evt = <1>;
 +		rx-num-evt = <1>;
 +};
++
+ &tscadc {
+ 	status = "okay";
+ 	tsc {
+ 		ti,wires = <4>;
+ 		ti,x-plate-resistance = <200>;
+ 		ti,coordinate-readouts = <5>;
+ 		ti,wire-config = <0x00 0x11 0x22 0x33>;
+ 	};
+ };

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the input tree with Linus' tree

[Dmitry Torokhov]

Hi Stephen,

On Tue, Mar 27, 2012 at 12:16:10PM +1100, Stephen Rothwell wrote:
> Hi Dmitry,
> 
> Today's linux-next merge of the input tree got a conflict in
> drivers/input/tablet/wacom_sys.c between commit 24e3e5ae1e4c ("Input:
> wacom - fix physical size calculation for 3rd-gen Bamboo") from Linus'
> tree and commit 16bf288c4be6 ("Input: wacom - create inputs when wireless
> connect") from the input tree.
> 
> The latter seems to incorporate the former, so I used that.

Thank you. I merged the branches and resolved conflict so you should not
see it anymore.

Thanks.

-- 
Dmitry

linux-next: manual merge of the input tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 461 bytes --]

Hi Dmitry,

Today's linux-next merge of the input tree got a conflict in
drivers/input/tablet/wacom_sys.c between commit 24e3e5ae1e4c ("Input:
wacom - fix physical size calculation for 3rd-gen Bamboo") from Linus'
tree and commit 16bf288c4be6 ("Input: wacom - create inputs when wireless
connect") from the input tree.

The latter seems to incorporate the former, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the input tree with Linus' tree

[Dmitry Torokhov]

On Tue, Dec 14, 2010 at 01:26:58PM +1100, Stephen Rothwell wrote:
> Hi Dmitry,
> 
> Today's linux-next merge of the input tree got a conflict in
> include/linux/input.h between commit
> 86b17f76f462db460d6d916e105a4c44cb353e36 ("Input: document struct
> input_absinfo") from Linus' tree and commit
> a528f721b7c0ba70433dbddf5947eea458c3e36a ("Input: document new trkid
> field in struct input_dev") from the input tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Hi Stephen,

The fix looks good and if you could carry it for a while that would be
great - I try to avoid cross-merging branches if possible...

Thanks.

-- 
Dmitry

linux-next: manual merge of the input tree with Linus' tree

[Stephen Rothwell]

Hi Dmitry,

Today's linux-next merge of the input tree got a conflict in
include/linux/input.h between commit
86b17f76f462db460d6d916e105a4c44cb353e36 ("Input: document struct
input_absinfo") from Linus' tree and commit
a528f721b7c0ba70433dbddf5947eea458c3e36a ("Input: document new trkid
field in struct input_dev") from the input tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/input.h
index 979d4bd,787aa7e..0000000
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@@ -1155,7 -1125,8 +1150,8 @@@ struct ff_effect 
   *	of tracked contacts
   * @mtsize: number of MT slots the device uses
   * @slot: MT slot currently being transmitted
+  * @trkid: stores MT tracking ID for the current contact
 - * @absinfo: array of &struct absinfo elements holding information
 + * @absinfo: array of &struct input_absinfo elements holding information
   *	about absolute axes (current value, min, max, flat, fuzz,
   *	resolution)
   * @key: reflects current state of device's keys/buttons