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

ARM: at91/dt: sama5d3: 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>

authored by

Alexandre Belloni and committed by
Nicolas Ferre
b3b84dec ce1e8d3d

+7 -7
+7 -6
arch/arm/boot/dts/sama5d3.dtsi
··· 239 239 }; 240 240 241 241 adc0: adc@f8018000 { 242 + #address-cells = <1>; 243 + #size-cells = <0>; 242 244 compatible = "atmel,at91sam9x5-adc"; 243 245 reg = <0xf8018000 0x100>; 244 246 interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>; ··· 263 261 clocks = <&adc_clk>, 264 262 <&adc_op_clk>; 265 263 clock-names = "adc_clk", "adc_op_clk"; 266 - atmel,adc-channel-base = <0x50>; 267 264 atmel,adc-channels-used = <0xfff>; 268 - atmel,adc-drdy-mask = <0x1000000>; 269 - atmel,adc-num-channels = <12>; 270 265 atmel,adc-startup-time = <40>; 271 - atmel,adc-status-register = <0x30>; 272 - atmel,adc-trigger-register = <0xc0>; 273 - atmel,adc-use-external; 266 + atmel,adc-use-external-triggers; 274 267 atmel,adc-vref = <3000>; 275 268 atmel,adc-res = <10 12>; 276 269 atmel,adc-res-names = "lowres", "highres"; 277 270 status = "disabled"; 278 271 279 272 trigger@0 { 273 + reg = <0>; 280 274 trigger-name = "external-rising"; 281 275 trigger-value = <0x1>; 282 276 trigger-external; 283 277 }; 284 278 trigger@1 { 279 + reg = <1>; 285 280 trigger-name = "external-falling"; 286 281 trigger-value = <0x2>; 287 282 trigger-external; 288 283 }; 289 284 trigger@2 { 285 + reg = <2>; 290 286 trigger-name = "external-any"; 291 287 trigger-value = <0x3>; 292 288 trigger-external; 293 289 }; 294 290 trigger@3 { 291 + reg = <3>; 295 292 trigger-name = "continuous"; 296 293 trigger-value = <0x6>; 297 294 };
-1
arch/arm/boot/dts/sama5d3xdm.dtsi
··· 23 23 }; 24 24 25 25 adc0: adc@f8018000 { 26 - atmel,adc-clock-rate = <1000000>; 27 26 atmel,adc-ts-wires = <4>; 28 27 atmel,adc-ts-pressure-threshold = <10000>; 29 28 status = "okay";