Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

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

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 82c5d7f..019f1c3 100644 (file)
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -697,8 +697,6 @@
                        };
 
                        adc0: adc@fffe0000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                                compatible = "atmel,at91sam9260-adc";
                                reg = <0xfffe0000 0x100>;
                                interrupts = <5 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -708,29 +706,6 @@
                                atmel,adc-channels-used = <0xf>;
                                atmel,adc-vref = <3300>;
                                atmel,adc-startup-time = <15>;
-                               atmel,adc-res = <8 10>;
-                               atmel,adc-res-names = "lowres", "highres";
-                               atmel,adc-use-res = "highres";
-
-                               trigger0 {
-                                       trigger-name = "timer-counter-0";
-                                       trigger-value = <0x1>;
-                               };
-                               trigger1 {
-                                       trigger-name = "timer-counter-1";
-                                       trigger-value = <0x3>;
-                               };
-
-                               trigger2 {
-                                       trigger-name = "timer-counter-2";
-                                       trigger-value = <0x5>;
-                               };
-
-                               trigger3 {
-                                       trigger-name = "external";
-                                       trigger-value = <0xd>;
-                                       trigger-external;
-                               };
                        };
 
                        rtc@fffffd20 {