projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'powerpc-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
sama5d3xdm.dtsi
diff --git
a/arch/arm/boot/dts/sama5d3xdm.dtsi
b/arch/arm/boot/dts/sama5d3xdm.dtsi
index f9bdde542ced2f9e0a76aa6ae73a5a7478215ae6..035ab72b39903c474aeb60c80a44ee0f9207d489 100644
(file)
--- a/
arch/arm/boot/dts/sama5d3xdm.dtsi
+++ b/
arch/arm/boot/dts/sama5d3xdm.dtsi
@@
-23,10
+23,8
@@
};
adc0: adc@f8018000 {
- status = "disabled";
- };
-
- tsadcc: tsadcc@f8018000 {
+ atmel,adc-ts-wires = <4>;
+ atmel,adc-ts-pressure-threshold = <10000>;
status = "okay";
};