aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2014-03-10 15:17:24 -0400
committerNicolas Ferre <nicolas.ferre@atmel.com>2014-03-12 14:11:29 -0400
commitb3b84dececf01842d75636f174e7d6432b0183e7 (patch)
tree7dee8a0250b0620cb83305b414e4ec4b4a435ee7
parentce1e8d3d918e235e2e66f400b80df1fb044c1de5 (diff)
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>
-rw-r--r--arch/arm/boot/dts/sama5d3.dtsi13
-rw-r--r--arch/arm/boot/dts/sama5d3xdm.dtsi1
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index b991e55e837d..eabcfdbb403a 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -239,6 +239,8 @@
239 }; 239 };
240 240
241 adc0: adc@f8018000 { 241 adc0: adc@f8018000 {
242 #address-cells = <1>;
243 #size-cells = <0>;
242 compatible = "atmel,at91sam9x5-adc"; 244 compatible = "atmel,at91sam9x5-adc";
243 reg = <0xf8018000 0x100>; 245 reg = <0xf8018000 0x100>;
244 interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>; 246 interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>;
@@ -261,35 +263,34 @@
261 clocks = <&adc_clk>, 263 clocks = <&adc_clk>,
262 <&adc_op_clk>; 264 <&adc_op_clk>;
263 clock-names = "adc_clk", "adc_op_clk"; 265 clock-names = "adc_clk", "adc_op_clk";
264 atmel,adc-channel-base = <0x50>;
265 atmel,adc-channels-used = <0xfff>; 266 atmel,adc-channels-used = <0xfff>;
266 atmel,adc-drdy-mask = <0x1000000>;
267 atmel,adc-num-channels = <12>;
268 atmel,adc-startup-time = <40>; 267 atmel,adc-startup-time = <40>;
269 atmel,adc-status-register = <0x30>; 268 atmel,adc-use-external-triggers;
270 atmel,adc-trigger-register = <0xc0>;
271 atmel,adc-use-external;
272 atmel,adc-vref = <3000>; 269 atmel,adc-vref = <3000>;
273 atmel,adc-res = <10 12>; 270 atmel,adc-res = <10 12>;
274 atmel,adc-res-names = "lowres", "highres"; 271 atmel,adc-res-names = "lowres", "highres";
275 status = "disabled"; 272 status = "disabled";
276 273
277 trigger@0 { 274 trigger@0 {
275 reg = <0>;
278 trigger-name = "external-rising"; 276 trigger-name = "external-rising";
279 trigger-value = <0x1>; 277 trigger-value = <0x1>;
280 trigger-external; 278 trigger-external;
281 }; 279 };
282 trigger@1 { 280 trigger@1 {
281 reg = <1>;
283 trigger-name = "external-falling"; 282 trigger-name = "external-falling";
284 trigger-value = <0x2>; 283 trigger-value = <0x2>;
285 trigger-external; 284 trigger-external;
286 }; 285 };
287 trigger@2 { 286 trigger@2 {
287 reg = <2>;
288 trigger-name = "external-any"; 288 trigger-name = "external-any";
289 trigger-value = <0x3>; 289 trigger-value = <0x3>;
290 trigger-external; 290 trigger-external;
291 }; 291 };
292 trigger@3 { 292 trigger@3 {
293 reg = <3>;
293 trigger-name = "continuous"; 294 trigger-name = "continuous";
294 trigger-value = <0x6>; 295 trigger-value = <0x6>;
295 }; 296 };
diff --git a/arch/arm/boot/dts/sama5d3xdm.dtsi b/arch/arm/boot/dts/sama5d3xdm.dtsi
index 0b8f5d106ff2..035ab72b3990 100644
--- a/arch/arm/boot/dts/sama5d3xdm.dtsi
+++ b/arch/arm/boot/dts/sama5d3xdm.dtsi
@@ -23,7 +23,6 @@
23 }; 23 };
24 24
25 adc0: adc@f8018000 { 25 adc0: adc@f8018000 {
26 atmel,adc-clock-rate = <1000000>;
27 atmel,adc-ts-wires = <4>; 26 atmel,adc-ts-wires = <4>;
28 atmel,adc-ts-pressure-threshold = <10000>; 27 atmel,adc-ts-pressure-threshold = <10000>;
29 status = "okay"; 28 status = "okay";