Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

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

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index bba2a3f..7c97965 100644 (file)
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -305,8 +305,6 @@
                        };
 
                        adc0: adc@f8018000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                                compatible = "atmel,sama5d3-adc";
                                reg = <0xf8018000 0x100>;
                                interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>;
@@ -333,30 +331,8 @@
                                atmel,adc-startup-time = <40>;
                                atmel,adc-use-external-triggers;
                                atmel,adc-vref = <3000>;
-                               atmel,adc-res = <10 12>;
                                atmel,adc-sample-hold-time = <11>;
-                               atmel,adc-res-names = "lowres", "highres";
                                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>;
-                               };
                        };
 
                        i2c2: i2c@f801c000 {