diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-03-10 15:17:21 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-03-12 14:11:28 -0400 |
commit | e568d6987555c90075a38f6c137a86ae65cb5cd5 (patch) | |
tree | 8e5f830ff8b18cafe84f418da6ed6da223c37756 | |
parent | e33b49c7d2f7edcf18c6356a3337aff15342cee2 (diff) |
ARM: at91/dt: at91sam9260: remove useless adc properties
Remove the properties that are not used anymore by the at91_adc driver.
Also, add #address-cells, #size-cells and a reg for each trigger to comply to
the ePAPR.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-rw-r--r-- | arch/arm/boot/dts/at91sam9260.dtsi | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi index 997901f7ed73..366fc2cbcd64 100644 --- a/arch/arm/boot/dts/at91sam9260.dtsi +++ b/arch/arm/boot/dts/at91sam9260.dtsi | |||
@@ -608,37 +608,38 @@ | |||
608 | }; | 608 | }; |
609 | 609 | ||
610 | adc0: adc@fffe0000 { | 610 | adc0: adc@fffe0000 { |
611 | #address-cells = <1>; | ||
612 | #size-cells = <0>; | ||
611 | compatible = "atmel,at91sam9260-adc"; | 613 | compatible = "atmel,at91sam9260-adc"; |
612 | reg = <0xfffe0000 0x100>; | 614 | reg = <0xfffe0000 0x100>; |
613 | interrupts = <5 IRQ_TYPE_LEVEL_HIGH 0>; | 615 | interrupts = <5 IRQ_TYPE_LEVEL_HIGH 0>; |
614 | atmel,adc-use-external-triggers; | 616 | atmel,adc-use-external-triggers; |
615 | atmel,adc-channels-used = <0xf>; | 617 | atmel,adc-channels-used = <0xf>; |
616 | atmel,adc-vref = <3300>; | 618 | atmel,adc-vref = <3300>; |
617 | atmel,adc-num-channels = <4>; | ||
618 | atmel,adc-startup-time = <15>; | 619 | atmel,adc-startup-time = <15>; |
619 | atmel,adc-channel-base = <0x30>; | ||
620 | atmel,adc-drdy-mask = <0x10000>; | ||
621 | atmel,adc-status-register = <0x1c>; | ||
622 | atmel,adc-trigger-register = <0x04>; | ||
623 | atmel,adc-res = <8 10>; | 620 | atmel,adc-res = <8 10>; |
624 | atmel,adc-res-names = "lowres", "highres"; | 621 | atmel,adc-res-names = "lowres", "highres"; |
625 | atmel,adc-use-res = "highres"; | 622 | atmel,adc-use-res = "highres"; |
626 | 623 | ||
627 | trigger@0 { | 624 | trigger@0 { |
625 | reg = <0>; | ||
628 | trigger-name = "timer-counter-0"; | 626 | trigger-name = "timer-counter-0"; |
629 | trigger-value = <0x1>; | 627 | trigger-value = <0x1>; |
630 | }; | 628 | }; |
631 | trigger@1 { | 629 | trigger@1 { |
630 | reg = <1>; | ||
632 | trigger-name = "timer-counter-1"; | 631 | trigger-name = "timer-counter-1"; |
633 | trigger-value = <0x3>; | 632 | trigger-value = <0x3>; |
634 | }; | 633 | }; |
635 | 634 | ||
636 | trigger@2 { | 635 | trigger@2 { |
636 | reg = <2>; | ||
637 | trigger-name = "timer-counter-2"; | 637 | trigger-name = "timer-counter-2"; |
638 | trigger-value = <0x5>; | 638 | trigger-value = <0x5>; |
639 | }; | 639 | }; |
640 | 640 | ||
641 | trigger@3 { | 641 | trigger@3 { |
642 | reg = <3>; | ||
642 | trigger-name = "external"; | 643 | trigger-name = "external"; |
643 | trigger-value = <0x13>; | 644 | trigger-value = <0x13>; |
644 | trigger-external; | 645 | trigger-external; |