mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-01-02 10:45:10 -05:00
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
This commit is contained in:
@@ -697,8 +697,6 @@ spi1: spi@fffcc000 {
|
||||
};
|
||||
|
||||
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 @@ adc0: adc@fffe0000 {
|
||||
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 {
|
||||
|
||||
@@ -812,8 +812,6 @@ ac97: sound@fffac000 {
|
||||
};
|
||||
|
||||
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 @@ adc0: adc@fffb0000 {
|
||||
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 {
|
||||
|
||||
@@ -266,8 +266,6 @@ spi0: spi@fffcc000 {
|
||||
};
|
||||
|
||||
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 @@ adc0: adc@fffd0000 {
|
||||
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 {
|
||||
|
||||
@@ -795,8 +795,6 @@ uart1: serial@f8044000 {
|
||||
};
|
||||
|
||||
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 @@ adc0: adc@f804c000 {
|
||||
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 {
|
||||
|
||||
@@ -305,8 +305,6 @@ ssc1: ssc@f800c000 {
|
||||
};
|
||||
|
||||
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 @@ &pinctrl_adc0_ad11
|
||||
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 {
|
||||
|
||||
@@ -661,31 +661,9 @@ adc0: adc@fc034000 {
|
||||
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 {
|
||||
|
||||
Reference in New Issue
Block a user