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@xxxxxxxxxxxxxxxx
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:
pgpyPq92WVQLu.pgp
Description: PGP signature
