Skip to content

Commit 559a834

Browse files
alexandrebelloniambarus
alexandrebelloni
authored and
ambarus
committed
ARM: dts: at91: remove deprecated ADC properties
atmel,adc-res, atmel,adc-res-names and the trigger nodes are not parsed by the driver anymore and the information is now defined in the driver data. Also remove the leftover #address-cells and #size-cells that were used when the trigger nodes had a unit-address. Finally, the default is already to use the highest resoution. Remove atmel,adc-use-res from the SoC dtsi. Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Reviewed-by: Ludovic Desroches <ludovic.desroches@microchip.com> Link: https://lore.kernel.org/r/20201128222818.1910764-11-alexandre.belloni@bootlin.com (cherry picked from commit 32b7cfb) Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
1 parent ce5bffb commit 559a834

6 files changed

Lines changed: 0 additions & 154 deletions

File tree

‎arch/arm/boot/dts/at91sam9260.dtsi‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -697,8 +697,6 @@
697697
};
698698

699699
adc0: adc@fffe0000 {
700-
#address-cells = <1>;
701-
#size-cells = <0>;
702700
compatible = "atmel,at91sam9260-adc";
703701
reg = <0xfffe0000 0x100>;
704702
interrupts = <5 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -708,29 +706,6 @@
708706
atmel,adc-channels-used = <0xf>;
709707
atmel,adc-vref = <3300>;
710708
atmel,adc-startup-time = <15>;
711-
atmel,adc-res = <8 10>;
712-
atmel,adc-res-names = "lowres", "highres";
713-
atmel,adc-use-res = "highres";
714-
715-
trigger0 {
716-
trigger-name = "timer-counter-0";
717-
trigger-value = <0x1>;
718-
};
719-
trigger1 {
720-
trigger-name = "timer-counter-1";
721-
trigger-value = <0x3>;
722-
};
723-
724-
trigger2 {
725-
trigger-name = "timer-counter-2";
726-
trigger-value = <0x5>;
727-
};
728-
729-
trigger3 {
730-
trigger-name = "external";
731-
trigger-value = <0xd>;
732-
trigger-external;
733-
};
734709
};
735710

736711
rtc@fffffd20 {

‎arch/arm/boot/dts/at91sam9g45.dtsi‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -812,8 +812,6 @@
812812
};
813813

814814
adc0: adc@fffb0000 {
815-
#address-cells = <1>;
816-
#size-cells = <0>;
817815
compatible = "atmel,at91sam9g45-adc";
818816
reg = <0xfffb0000 0x100>;
819817
interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -822,31 +820,6 @@
822820
atmel,adc-channels-used = <0xff>;
823821
atmel,adc-vref = <3300>;
824822
atmel,adc-startup-time = <40>;
825-
atmel,adc-res = <8 10>;
826-
atmel,adc-res-names = "lowres", "highres";
827-
atmel,adc-use-res = "highres";
828-
829-
trigger0 {
830-
trigger-name = "external-rising";
831-
trigger-value = <0x1>;
832-
trigger-external;
833-
};
834-
trigger1 {
835-
trigger-name = "external-falling";
836-
trigger-value = <0x2>;
837-
trigger-external;
838-
};
839-
840-
trigger2 {
841-
trigger-name = "external-any";
842-
trigger-value = <0x3>;
843-
trigger-external;
844-
};
845-
846-
trigger3 {
847-
trigger-name = "continuous";
848-
trigger-value = <0x6>;
849-
};
850823
};
851824

852825
isi@fffb4000 {

‎arch/arm/boot/dts/at91sam9rl.dtsi‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,6 @@
266266
};
267267

268268
adc0: adc@fffd0000 {
269-
#address-cells = <1>;
270-
#size-cells = <0>;
271269
compatible = "atmel,at91sam9rl-adc";
272270
reg = <0xfffd0000 0x100>;
273271
interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -277,32 +275,6 @@
277275
atmel,adc-channels-used = <0x3f>;
278276
atmel,adc-vref = <3300>;
279277
atmel,adc-startup-time = <40>;
280-
atmel,adc-res = <8 10>;
281-
atmel,adc-res-names = "lowres", "highres";
282-
atmel,adc-use-res = "highres";
283-
284-
trigger0 {
285-
trigger-name = "external-rising";
286-
trigger-value = <0x1>;
287-
trigger-external;
288-
};
289-
290-
trigger1 {
291-
trigger-name = "external-falling";
292-
trigger-value = <0x2>;
293-
trigger-external;
294-
};
295-
296-
trigger2 {
297-
trigger-name = "external-any";
298-
trigger-value = <0x3>;
299-
trigger-external;
300-
};
301-
302-
trigger3 {
303-
trigger-name = "continuous";
304-
trigger-value = <0x6>;
305-
};
306278
};
307279

308280
usb0: gadget@fffd4000 {

‎arch/arm/boot/dts/at91sam9x5.dtsi‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -795,8 +795,6 @@
795795
};
796796

797797
adc0: adc@f804c000 {
798-
#address-cells = <1>;
799-
#size-cells = <0>;
800798
compatible = "atmel,at91sam9x5-adc";
801799
reg = <0xf804c000 0x100>;
802800
interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -808,32 +806,6 @@
808806
atmel,adc-vref = <3300>;
809807
atmel,adc-startup-time = <40>;
810808
atmel,adc-sample-hold-time = <11>;
811-
atmel,adc-res = <8 10>;
812-
atmel,adc-res-names = "lowres", "highres";
813-
atmel,adc-use-res = "highres";
814-
815-
trigger0 {
816-
trigger-name = "external-rising";
817-
trigger-value = <0x1>;
818-
trigger-external;
819-
};
820-
821-
trigger1 {
822-
trigger-name = "external-falling";
823-
trigger-value = <0x2>;
824-
trigger-external;
825-
};
826-
827-
trigger2 {
828-
trigger-name = "external-any";
829-
trigger-value = <0x3>;
830-
trigger-external;
831-
};
832-
833-
trigger3 {
834-
trigger-name = "continuous";
835-
trigger-value = <0x6>;
836-
};
837809
};
838810

839811
spi0: spi@f0000000 {

‎arch/arm/boot/dts/sama5d3.dtsi‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,6 @@
305305
};
306306

307307
adc0: adc@f8018000 {
308-
#address-cells = <1>;
309-
#size-cells = <0>;
310308
compatible = "atmel,sama5d3-adc";
311309
reg = <0xf8018000 0x100>;
312310
interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>;
@@ -333,30 +331,8 @@
333331
atmel,adc-startup-time = <40>;
334332
atmel,adc-use-external-triggers;
335333
atmel,adc-vref = <3000>;
336-
atmel,adc-res = <10 12>;
337334
atmel,adc-sample-hold-time = <11>;
338-
atmel,adc-res-names = "lowres", "highres";
339335
status = "disabled";
340-
341-
trigger0 {
342-
trigger-name = "external-rising";
343-
trigger-value = <0x1>;
344-
trigger-external;
345-
};
346-
trigger1 {
347-
trigger-name = "external-falling";
348-
trigger-value = <0x2>;
349-
trigger-external;
350-
};
351-
trigger2 {
352-
trigger-name = "external-any";
353-
trigger-value = <0x3>;
354-
trigger-external;
355-
};
356-
trigger3 {
357-
trigger-name = "continuous";
358-
trigger-value = <0x6>;
359-
};
360336
};
361337

362338
i2c2: i2c@f801c000 {

‎arch/arm/boot/dts/sama5d4.dtsi‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -661,31 +661,9 @@
661661
atmel,adc-startup-time = <40>;
662662
atmel,adc-use-external-triggers;
663663
atmel,adc-vref = <3000>;
664-
atmel,adc-res = <8 10>;
665664
atmel,adc-sample-hold-time = <11>;
666-
atmel,adc-res-names = "lowres", "highres";
667665
atmel,adc-ts-pressure-threshold = <10000>;
668666
status = "disabled";
669-
670-
trigger0 {
671-
trigger-name = "external-rising";
672-
trigger-value = <0x1>;
673-
trigger-external;
674-
};
675-
trigger1 {
676-
trigger-name = "external-falling";
677-
trigger-value = <0x2>;
678-
trigger-external;
679-
};
680-
trigger2 {
681-
trigger-name = "external-any";
682-
trigger-value = <0x3>;
683-
trigger-external;
684-
};
685-
trigger3 {
686-
trigger-name = "continuous";
687-
trigger-value = <0x6>;
688-
};
689667
};
690668

691669
aes@fc044000 {

0 commit comments

Comments
 (0)