diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-03-10 15:17:23 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-03-12 14:11:29 -0400 |
commit | ce1e8d3d918e235e2e66f400b80df1fb044c1de5 (patch) | |
tree | e9f0906dd3b200adeeb087e935b8659c90bb631c /arch/arm/boot/dts/at91sam9x5.dtsi | |
parent | e1abeb72b9b629f2951fa974cc8f6ae0ac55ae69 (diff) |
ARM: at91/dt: at91sam9x5: remove useless adc properties
Remove the properties that are not used anymore by the at91_adc driver and fix
the atmel,adc-use-external-triggers property name.
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>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9x5.dtsi')
-rw-r--r-- | arch/arm/boot/dts/at91sam9x5.dtsi | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index 67e32067eb25..fc13c9240da8 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi | |||
@@ -621,41 +621,42 @@ | |||
621 | }; | 621 | }; |
622 | 622 | ||
623 | adc0: adc@f804c000 { | 623 | adc0: adc@f804c000 { |
624 | #address-cells = <1>; | ||
625 | #size-cells = <0>; | ||
624 | compatible = "atmel,at91sam9260-adc"; | 626 | compatible = "atmel,at91sam9260-adc"; |
625 | reg = <0xf804c000 0x100>; | 627 | reg = <0xf804c000 0x100>; |
626 | interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>; | 628 | interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>; |
627 | atmel,adc-use-external; | 629 | atmel,adc-use-external-triggers; |
628 | atmel,adc-channels-used = <0xffff>; | 630 | atmel,adc-channels-used = <0xffff>; |
629 | atmel,adc-vref = <3300>; | 631 | atmel,adc-vref = <3300>; |
630 | atmel,adc-num-channels = <12>; | ||
631 | atmel,adc-startup-time = <40>; | 632 | atmel,adc-startup-time = <40>; |
632 | atmel,adc-channel-base = <0x50>; | ||
633 | atmel,adc-drdy-mask = <0x1000000>; | ||
634 | atmel,adc-status-register = <0x30>; | ||
635 | atmel,adc-trigger-register = <0xc0>; | ||
636 | atmel,adc-res = <8 10>; | 633 | atmel,adc-res = <8 10>; |
637 | atmel,adc-res-names = "lowres", "highres"; | 634 | atmel,adc-res-names = "lowres", "highres"; |
638 | atmel,adc-use-res = "highres"; | 635 | atmel,adc-use-res = "highres"; |
639 | 636 | ||
640 | trigger@0 { | 637 | trigger@0 { |
638 | reg = <0>; | ||
641 | trigger-name = "external-rising"; | 639 | trigger-name = "external-rising"; |
642 | trigger-value = <0x1>; | 640 | trigger-value = <0x1>; |
643 | trigger-external; | 641 | trigger-external; |
644 | }; | 642 | }; |
645 | 643 | ||
646 | trigger@1 { | 644 | trigger@1 { |
645 | reg = <1>; | ||
647 | trigger-name = "external-falling"; | 646 | trigger-name = "external-falling"; |
648 | trigger-value = <0x2>; | 647 | trigger-value = <0x2>; |
649 | trigger-external; | 648 | trigger-external; |
650 | }; | 649 | }; |
651 | 650 | ||
652 | trigger@2 { | 651 | trigger@2 { |
652 | reg = <2>; | ||
653 | trigger-name = "external-any"; | 653 | trigger-name = "external-any"; |
654 | trigger-value = <0x3>; | 654 | trigger-value = <0x3>; |
655 | trigger-external; | 655 | trigger-external; |
656 | }; | 656 | }; |
657 | 657 | ||
658 | trigger@3 { | 658 | trigger@3 { |
659 | reg = <3>; | ||
659 | trigger-name = "continuous"; | 660 | trigger-name = "continuous"; |
660 | trigger-value = <0x6>; | 661 | trigger-value = <0x6>; |
661 | }; | 662 | }; |