git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'sound-fix-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
at91-sama5d4ek.dts
diff --git
a/arch/arm/boot/dts/at91-sama5d4ek.dts
b/arch/arm/boot/dts/at91-sama5d4ek.dts
index 7887a7160a54e5b3719b7fc618eb55844b1308b0..0702a2f2b336c1a2a7ecf7d5ed28e6b96eccd527 100644
(file)
--- a/
arch/arm/boot/dts/at91-sama5d4ek.dts
+++ b/
arch/arm/boot/dts/at91-sama5d4ek.dts
@@
-129,8
+129,8
@@
wakeup-source;
};
-
atmel_mxt_ts
@4c {
- compatible = "atmel,
atmel_mxt_ts
";
+
touchscreen
@4c {
+ compatible = "atmel,
maxtouch
";
reg = <0x4c>;
interrupt-parent = <&pioE>;
interrupts = <24 0x0>;