linux-next: manual merge of the input tree with Linus' tree
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..
--- 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(>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);
pgp4_P1M38PQL.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the input tree with Linus' tree
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 Rothwells...@canb.auug.org.au
diff --cc arch/arm/boot/dts/am335x-evmsk.dts
index 03febf85fd2f,d7c2c0c58437..
--- 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";
};
+ {
+ status = "okay";
+ vmmc-supply = <_reg>;
+ bus-width = <4>;
+};
+
+ {
+ status = "okay";
+};
+
+ {
+ status = "okay";
+};
+
+ {
+ ti,no-reset-on-init;
+};
+
+ {
+ pinctrl-names = "default";
+ pinctrl-0 = <_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>;
+};
++
+ {
+ status = "okay";
+ tsc {
+ ti,wires = <4>;
+ ti,x-plate-resistance = <200>;
+ ti,coordinate-readouts = <5>;
+ ti,wire-config = <0x00 0x11 0x22 0x33>;
+ };
+ };
pgp92xmACtgQj.pgp
Description: PGP signature
linux-next: manual merge of the input tree with Linus' tree
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 Rothwells...@canb.auug.org.au
diff --cc arch/arm/boot/dts/am335x-evmsk.dts
index 03febf85fd2f,d7c2c0c58437..
--- 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;
+ };
+ };
pgp92xmACtgQj.pgp
Description: PGP signature
