Skip to content

Commit f51d8fb

Browse files
committed
Merge remote-tracking branch 'remotes/origin/at91-4.14-trunk/dt' into linux-4.14-at91
2 parents f6970d9 + 4ac56da commit f51d8fb

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

arch/arm/boot/dts/sama5d2.dtsi

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
#include <dt-bindings/dma/at91.h>
4848
#include <dt-bindings/interrupt-controller/irq.h>
4949
#include <dt-bindings/clock/at91.h>
50+
#include <dt-bindings/iio/adc/at91-sama5d2_adc.h>
5051

5152
/ {
5253
model = "Atmel SAMA5D2 family SoC";
@@ -1475,6 +1476,17 @@
14751476
atmel,max-sample-rate-hz = <20000000>;
14761477
atmel,startup-time-ms = <4>;
14771478
atmel,trigger-edge-type = <IRQ_TYPE_EDGE_RISING>;
1479+
#io-channel-cells = <1>;
1480+
status = "disabled";
1481+
};
1482+
1483+
resistive_touch: resistive-touch {
1484+
compatible = "resistive-adc-touch";
1485+
io-channels = <&adc AT91_SAMA5D2_ADC_X_CHANNEL>,
1486+
<&adc AT91_SAMA5D2_ADC_Y_CHANNEL>,
1487+
<&adc AT91_SAMA5D2_ADC_P_CHANNEL>;
1488+
io-channel-names = "x", "y", "pressure";
1489+
touchscreen-min-pressure = <50000>;
14781490
status = "disabled";
14791491
};
14801492

0 commit comments

Comments
 (0)