Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

-154
-25
arch/arm/boot/dts/at91sam9260.dtsi
··· 697 697 }; 698 698 699 699 adc0: adc@fffe0000 { 700 - #address-cells = <1>; 701 - #size-cells = <0>; 702 700 compatible = "atmel,at91sam9260-adc"; 703 701 reg = <0xfffe0000 0x100>; 704 702 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 0>; ··· 706 708 atmel,adc-channels-used = <0xf>; 707 709 atmel,adc-vref = <3300>; 708 710 atmel,adc-startup-time = <15>; 709 - atmel,adc-res = <8 10>; 710 - atmel,adc-res-names = "lowres", "highres"; 711 - atmel,adc-use-res = "highres"; 712 - 713 - trigger0 { 714 - trigger-name = "timer-counter-0"; 715 - trigger-value = <0x1>; 716 - }; 717 - trigger1 { 718 - trigger-name = "timer-counter-1"; 719 - trigger-value = <0x3>; 720 - }; 721 - 722 - trigger2 { 723 - trigger-name = "timer-counter-2"; 724 - trigger-value = <0x5>; 725 - }; 726 - 727 - trigger3 { 728 - trigger-name = "external"; 729 - trigger-value = <0xd>; 730 - trigger-external; 731 - }; 732 711 }; 733 712 734 713 rtc@fffffd20 {
-27
arch/arm/boot/dts/at91sam9g45.dtsi
··· 812 812 }; 813 813 814 814 adc0: adc@fffb0000 { 815 - #address-cells = <1>; 816 - #size-cells = <0>; 817 815 compatible = "atmel,at91sam9g45-adc"; 818 816 reg = <0xfffb0000 0x100>; 819 817 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>; ··· 820 822 atmel,adc-channels-used = <0xff>; 821 823 atmel,adc-vref = <3300>; 822 824 atmel,adc-startup-time = <40>; 823 - atmel,adc-res = <8 10>; 824 - atmel,adc-res-names = "lowres", "highres"; 825 - atmel,adc-use-res = "highres"; 826 - 827 - trigger0 { 828 - trigger-name = "external-rising"; 829 - trigger-value = <0x1>; 830 - trigger-external; 831 - }; 832 - trigger1 { 833 - trigger-name = "external-falling"; 834 - trigger-value = <0x2>; 835 - trigger-external; 836 - }; 837 - 838 - trigger2 { 839 - trigger-name = "external-any"; 840 - trigger-value = <0x3>; 841 - trigger-external; 842 - }; 843 - 844 - trigger3 { 845 - trigger-name = "continuous"; 846 - trigger-value = <0x6>; 847 - }; 848 825 }; 849 826 850 827 isi@fffb4000 {
-28
arch/arm/boot/dts/at91sam9rl.dtsi
··· 266 266 }; 267 267 268 268 adc0: adc@fffd0000 { 269 - #address-cells = <1>; 270 - #size-cells = <0>; 271 269 compatible = "atmel,at91sam9rl-adc"; 272 270 reg = <0xfffd0000 0x100>; 273 271 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>; ··· 275 277 atmel,adc-channels-used = <0x3f>; 276 278 atmel,adc-vref = <3300>; 277 279 atmel,adc-startup-time = <40>; 278 - atmel,adc-res = <8 10>; 279 - atmel,adc-res-names = "lowres", "highres"; 280 - atmel,adc-use-res = "highres"; 281 - 282 - trigger0 { 283 - trigger-name = "external-rising"; 284 - trigger-value = <0x1>; 285 - trigger-external; 286 - }; 287 - 288 - trigger1 { 289 - trigger-name = "external-falling"; 290 - trigger-value = <0x2>; 291 - trigger-external; 292 - }; 293 - 294 - trigger2 { 295 - trigger-name = "external-any"; 296 - trigger-value = <0x3>; 297 - trigger-external; 298 - }; 299 - 300 - trigger3 { 301 - trigger-name = "continuous"; 302 - trigger-value = <0x6>; 303 - }; 304 280 }; 305 281 306 282 usb0: gadget@fffd4000 {
-28
arch/arm/boot/dts/at91sam9x5.dtsi
··· 795 795 }; 796 796 797 797 adc0: adc@f804c000 { 798 - #address-cells = <1>; 799 - #size-cells = <0>; 800 798 compatible = "atmel,at91sam9x5-adc"; 801 799 reg = <0xf804c000 0x100>; 802 800 interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>; ··· 806 808 atmel,adc-vref = <3300>; 807 809 atmel,adc-startup-time = <40>; 808 810 atmel,adc-sample-hold-time = <11>; 809 - atmel,adc-res = <8 10>; 810 - atmel,adc-res-names = "lowres", "highres"; 811 - atmel,adc-use-res = "highres"; 812 - 813 - trigger0 { 814 - trigger-name = "external-rising"; 815 - trigger-value = <0x1>; 816 - trigger-external; 817 - }; 818 - 819 - trigger1 { 820 - trigger-name = "external-falling"; 821 - trigger-value = <0x2>; 822 - trigger-external; 823 - }; 824 - 825 - trigger2 { 826 - trigger-name = "external-any"; 827 - trigger-value = <0x3>; 828 - trigger-external; 829 - }; 830 - 831 - trigger3 { 832 - trigger-name = "continuous"; 833 - trigger-value = <0x6>; 834 - }; 835 811 }; 836 812 837 813 spi0: spi@f0000000 {
-24
arch/arm/boot/dts/sama5d3.dtsi
··· 305 305 }; 306 306 307 307 adc0: adc@f8018000 { 308 - #address-cells = <1>; 309 - #size-cells = <0>; 310 308 compatible = "atmel,sama5d3-adc"; 311 309 reg = <0xf8018000 0x100>; 312 310 interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>; ··· 331 333 atmel,adc-startup-time = <40>; 332 334 atmel,adc-use-external-triggers; 333 335 atmel,adc-vref = <3000>; 334 - atmel,adc-res = <10 12>; 335 336 atmel,adc-sample-hold-time = <11>; 336 - atmel,adc-res-names = "lowres", "highres"; 337 337 status = "disabled"; 338 - 339 - trigger0 { 340 - trigger-name = "external-rising"; 341 - trigger-value = <0x1>; 342 - trigger-external; 343 - }; 344 - trigger1 { 345 - trigger-name = "external-falling"; 346 - trigger-value = <0x2>; 347 - trigger-external; 348 - }; 349 - trigger2 { 350 - trigger-name = "external-any"; 351 - trigger-value = <0x3>; 352 - trigger-external; 353 - }; 354 - trigger3 { 355 - trigger-name = "continuous"; 356 - trigger-value = <0x6>; 357 - }; 358 338 }; 359 339 360 340 i2c2: i2c@f801c000 {
-22
arch/arm/boot/dts/sama5d4.dtsi
··· 661 661 atmel,adc-startup-time = <40>; 662 662 atmel,adc-use-external-triggers; 663 663 atmel,adc-vref = <3000>; 664 - atmel,adc-res = <8 10>; 665 664 atmel,adc-sample-hold-time = <11>; 666 - atmel,adc-res-names = "lowres", "highres"; 667 665 atmel,adc-ts-pressure-threshold = <10000>; 668 666 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 - }; 689 667 }; 690 668 691 669 aes@fc044000 {