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

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 82c5d7fd9811fa094b55b41f59849daaa3bb65d9..019f1c3d4d30b80cc3c65c27224ed51e315996c5 100644 (file)
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -697,8 +697,6 @@
                        };
 
                        adc0: adc@fffe0000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                                compatible = "atmel,at91sam9260-adc";
                                reg = <0xfffe0000 0x100>;
                                interrupts = <5 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -708,29 +706,6 @@
                                atmel,adc-channels-used = <0xf>;
                                atmel,adc-vref = <3300>;
                                atmel,adc-startup-time = <15>;
-                               atmel,adc-res = <8 10>;
-                               atmel,adc-res-names = "lowres", "highres";
-                               atmel,adc-use-res = "highres";
-
-                               trigger0 {
-                                       trigger-name = "timer-counter-0";
-                                       trigger-value = <0x1>;
-                               };
-                               trigger1 {
-                                       trigger-name = "timer-counter-1";
-                                       trigger-value = <0x3>;
-                               };
-
-                               trigger2 {
-                                       trigger-name = "timer-counter-2";
-                                       trigger-value = <0x5>;
-                               };
-
-                               trigger3 {
-                                       trigger-name = "external";
-                                       trigger-value = <0xd>;
-                                       trigger-external;
-                               };
                        };
 
                        rtc@fffffd20 {

diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 19fc748a87c58849b0cf38414a599ceecfe3dd3a..2ab730fd64724ebdfe91300c866177fad1706c16 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -812,8 +812,6 @@
                        };
 
                        adc0: adc@fffb0000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                                compatible = "atmel,at91sam9g45-adc";
                                reg = <0xfffb0000 0x100>;
                                interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -822,31 +820,6 @@
                                atmel,adc-channels-used = <0xff>;
                                atmel,adc-vref = <3300>;
                                atmel,adc-startup-time = <40>;
-                               atmel,adc-res = <8 10>;
-                               atmel,adc-res-names = "lowres", "highres";
-                               atmel,adc-use-res = "highres";
-
-                               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>;
-                               };
                        };
 
                        isi@fffb4000 {

diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index 36a42a9fe1957600468596ac894bcb70d4c3a51b..730d1182c73e07e8037356cb67a67af0110756e4 100644 (file)
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -266,8 +266,6 @@
                        };
 
                        adc0: adc@fffd0000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                                compatible = "atmel,at91sam9rl-adc";
                                reg = <0xfffd0000 0x100>;
                                interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -277,32 +275,6 @@
                                atmel,adc-channels-used = <0x3f>;
                                atmel,adc-vref = <3300>;
                                atmel,adc-startup-time = <40>;
-                               atmel,adc-res = <8 10>;
-                               atmel,adc-res-names = "lowres", "highres";
-                               atmel,adc-use-res = "highres";
-
-                               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>;
-                               };
                        };
 
                        usb0: gadget@fffd4000 {

diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 4cdb05079cc73100ff2540735dc6c814ba92ec0c..395e883644cd86a18d154cd6bcae2ec96cedb0c6 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -795,8 +795,6 @@
                        };
 
                        adc0: adc@f804c000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                                compatible = "atmel,at91sam9x5-adc";
                                reg = <0xf804c000 0x100>;
                                interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -808,32 +806,6 @@
                                atmel,adc-vref = <3300>;
                                atmel,adc-startup-time = <40>;
                                atmel,adc-sample-hold-time = <11>;
-                               atmel,adc-res = <8 10>;
-                               atmel,adc-res-names = "lowres", "highres";
-                               atmel,adc-use-res = "highres";
-
-                               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>;
-                               };
                        };
 
                        spi0: spi@f0000000 {

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index bba2a3f41c42b6321c2ea4998a83f16b5ef6fe88..7c979652f330d2ed7733007058b77f8df70ebdf1 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 {

diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 04f24cf752d34935d53a03abb5f10e4998141ca4..05c55875835d54829015ea865fb75d5277261b02 100644 (file)
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -661,31 +661,9 @@
                                atmel,adc-startup-time = <40>;
                                atmel,adc-use-external-triggers;
                                atmel,adc-vref = <3000>;
-                               atmel,adc-res = <8 10>;
                                atmel,adc-sample-hold-time = <11>;
-                               atmel,adc-res-names = "lowres", "highres";
                                atmel,adc-ts-pressure-threshold = <10000>;
                                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>;
-                               };
                        };
 
                        aes@fc044000 {