Merge tag 'Smack-for-5.11-io_uring-fix' of git://github.com/cschaufler/smack-next

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

diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index 36a42a9..730d118 100644 (file)
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -266,8 +266,6 @@
                        };
 
                        adc0: adc@fffd0000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                                compatible = "atmel,at91sam9rl-adc";
                                reg = <0xfffd0000 0x100>;
                                interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -277,32 +275,6 @@
                                atmel,adc-channels-used = <0x3f>;
                                atmel,adc-vref = <3300>;
                                atmel,adc-startup-time = <40>;
-                               atmel,adc-res = <8 10>;
-                               atmel,adc-res-names = "lowres", "highres";
-                               atmel,adc-use-res = "highres";
-
-                               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>;
-                               };
                        };
 
                        usb0: gadget@fffd4000 {