Merge tag 'drm-next-2020-12-24' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / arch / arm / boot / dts / sama5d4.dtsi

diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 04f24cf..05c5587 100644 (file)
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -661,31 +661,9 @@
                                atmel,adc-startup-time = <40>;
                                atmel,adc-use-external-triggers;
                                atmel,adc-vref = <3000>;
-                               atmel,adc-res = <8 10>;
                                atmel,adc-sample-hold-time = <11>;
-                               atmel,adc-res-names = "lowres", "highres";
                                atmel,adc-ts-pressure-threshold = <10000>;
                                status = "disabled";
-
-                               trigger0 {
-                                       trigger-name = "external-rising";
-                                       trigger-value = <0x1>;
-                                       trigger-external;
-                               };
-                               trigger1 {
-                                       trigger-name = "external-falling";
-                                       trigger-value = <0x2>;
-                                       trigger-external;
-                               };
-                               trigger2 {
-                                       trigger-name = "external-any";
-                                       trigger-value = <0x3>;
-                                       trigger-external;
-                               };
-                               trigger3 {
-                                       trigger-name = "continuous";
-                                       trigger-value = <0x6>;
-                               };
                        };
 
                        aes@fc044000 {