aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-07-12 16:16:38 -0400
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-07-15 04:23:14 -0400
commitc94afa132b6d7f8e412a12da44da6203d2cd23d4 (patch)
tree9c32e59b999cf8f9af56b4581597e4a375dcec84
parent3cf265662c4b3902787d5d1235140a942d7ffa5a (diff)
ARM: dts: at91: Fix ADC trigger nodes
The triggers don't need a reg property, remove it when prenset. Also remove the unit-address from their name. This solves: Warning (unit_address_vs_reg): Node /ahb/apb/adc@fc034000/trigger@0 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /ahb/apb/adc@fc034000/trigger@1 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /ahb/apb/adc@fc034000/trigger@2 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /ahb/apb/adc@fc034000/trigger@3 has a unit name, but no reg property Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
-rw-r--r--arch/arm/boot/dts/at91sam9260.dtsi12
-rw-r--r--arch/arm/boot/dts/at91sam9g45.dtsi12
-rw-r--r--arch/arm/boot/dts/at91sam9rl.dtsi12
-rw-r--r--arch/arm/boot/dts/at91sam9x5.dtsi12
-rw-r--r--arch/arm/boot/dts/sama5d3.dtsi12
-rw-r--r--arch/arm/boot/dts/sama5d4.dtsi8
6 files changed, 24 insertions, 44 deletions
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index af5ba315315f..49a02f5a4476 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -938,25 +938,21 @@
938 atmel,adc-res-names = "lowres", "highres"; 938 atmel,adc-res-names = "lowres", "highres";
939 atmel,adc-use-res = "highres"; 939 atmel,adc-use-res = "highres";
940 940
941 trigger@0 { 941 trigger0 {
942 reg = <0>;
943 trigger-name = "timer-counter-0"; 942 trigger-name = "timer-counter-0";
944 trigger-value = <0x1>; 943 trigger-value = <0x1>;
945 }; 944 };
946 trigger@1 { 945 trigger1 {
947 reg = <1>;
948 trigger-name = "timer-counter-1"; 946 trigger-name = "timer-counter-1";
949 trigger-value = <0x3>; 947 trigger-value = <0x3>;
950 }; 948 };
951 949
952 trigger@2 { 950 trigger2 {
953 reg = <2>;
954 trigger-name = "timer-counter-2"; 951 trigger-name = "timer-counter-2";
955 trigger-value = <0x5>; 952 trigger-value = <0x5>;
956 }; 953 };
957 954
958 trigger@3 { 955 trigger3 {
959 reg = <3>;
960 trigger-name = "external"; 956 trigger-name = "external";
961 trigger-value = <0xd>; 957 trigger-value = <0xd>;
962 trigger-external; 958 trigger-external;
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 8837b7e4292c..048a9815a9e5 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -1044,28 +1044,24 @@
1044 atmel,adc-res-names = "lowres", "highres"; 1044 atmel,adc-res-names = "lowres", "highres";
1045 atmel,adc-use-res = "highres"; 1045 atmel,adc-use-res = "highres";
1046 1046
1047 trigger@0 { 1047 trigger0 {
1048 reg = <0>;
1049 trigger-name = "external-rising"; 1048 trigger-name = "external-rising";
1050 trigger-value = <0x1>; 1049 trigger-value = <0x1>;
1051 trigger-external; 1050 trigger-external;
1052 }; 1051 };
1053 trigger@1 { 1052 trigger1 {
1054 reg = <1>;
1055 trigger-name = "external-falling"; 1053 trigger-name = "external-falling";
1056 trigger-value = <0x2>; 1054 trigger-value = <0x2>;
1057 trigger-external; 1055 trigger-external;
1058 }; 1056 };
1059 1057
1060 trigger@2 { 1058 trigger2 {
1061 reg = <2>;
1062 trigger-name = "external-any"; 1059 trigger-name = "external-any";
1063 trigger-value = <0x3>; 1060 trigger-value = <0x3>;
1064 trigger-external; 1061 trigger-external;
1065 }; 1062 };
1066 1063
1067 trigger@3 { 1064 trigger3 {
1068 reg = <3>;
1069 trigger-name = "continuous"; 1065 trigger-name = "continuous";
1070 trigger-value = <0x6>; 1066 trigger-value = <0x6>;
1071 }; 1067 };
diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index 6d829db4e887..201a3ca56874 100644
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -265,25 +265,21 @@
265 atmel,adc-res-names = "lowres", "highres"; 265 atmel,adc-res-names = "lowres", "highres";
266 atmel,adc-use-res = "highres"; 266 atmel,adc-use-res = "highres";
267 267
268 trigger@0 { 268 trigger0 {
269 reg = <0>;
270 trigger-name = "timer-counter-0"; 269 trigger-name = "timer-counter-0";
271 trigger-value = <0x1>; 270 trigger-value = <0x1>;
272 }; 271 };
273 trigger@1 { 272 trigger1 {
274 reg = <1>;
275 trigger-name = "timer-counter-1"; 273 trigger-name = "timer-counter-1";
276 trigger-value = <0x3>; 274 trigger-value = <0x3>;
277 }; 275 };
278 276
279 trigger@2 { 277 trigger2 {
280 reg = <2>;
281 trigger-name = "timer-counter-2"; 278 trigger-name = "timer-counter-2";
282 trigger-value = <0x5>; 279 trigger-value = <0x5>;
283 }; 280 };
284 281
285 trigger@3 { 282 trigger3 {
286 reg = <3>;
287 trigger-name = "external"; 283 trigger-name = "external";
288 trigger-value = <0x13>; 284 trigger-value = <0x13>;
289 trigger-external; 285 trigger-external;
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index cd0cd5fd09a3..075d5881770d 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -1048,29 +1048,25 @@
1048 atmel,adc-res-names = "lowres", "highres"; 1048 atmel,adc-res-names = "lowres", "highres";
1049 atmel,adc-use-res = "highres"; 1049 atmel,adc-use-res = "highres";
1050 1050
1051 trigger@0 { 1051 trigger0 {
1052 reg = <0>;
1053 trigger-name = "external-rising"; 1052 trigger-name = "external-rising";
1054 trigger-value = <0x1>; 1053 trigger-value = <0x1>;
1055 trigger-external; 1054 trigger-external;
1056 }; 1055 };
1057 1056
1058 trigger@1 { 1057 trigger1 {
1059 reg = <1>;
1060 trigger-name = "external-falling"; 1058 trigger-name = "external-falling";
1061 trigger-value = <0x2>; 1059 trigger-value = <0x2>;
1062 trigger-external; 1060 trigger-external;
1063 }; 1061 };
1064 1062
1065 trigger@2 { 1063 trigger2 {
1066 reg = <2>;
1067 trigger-name = "external-any"; 1064 trigger-name = "external-any";
1068 trigger-value = <0x3>; 1065 trigger-value = <0x3>;
1069 trigger-external; 1066 trigger-external;
1070 }; 1067 };
1071 1068
1072 trigger@3 { 1069 trigger3 {
1073 reg = <3>;
1074 trigger-name = "continuous"; 1070 trigger-name = "continuous";
1075 trigger-value = <0x6>; 1071 trigger-value = <0x6>;
1076 }; 1072 };
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 36301bd9a14a..a7c5cf4d4ea5 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -326,26 +326,22 @@
326 atmel,adc-res-names = "lowres", "highres"; 326 atmel,adc-res-names = "lowres", "highres";
327 status = "disabled"; 327 status = "disabled";
328 328
329 trigger@0 { 329 trigger0 {
330 reg = <0>;
331 trigger-name = "external-rising"; 330 trigger-name = "external-rising";
332 trigger-value = <0x1>; 331 trigger-value = <0x1>;
333 trigger-external; 332 trigger-external;
334 }; 333 };
335 trigger@1 { 334 trigger1 {
336 reg = <1>;
337 trigger-name = "external-falling"; 335 trigger-name = "external-falling";
338 trigger-value = <0x2>; 336 trigger-value = <0x2>;
339 trigger-external; 337 trigger-external;
340 }; 338 };
341 trigger@2 { 339 trigger2 {
342 reg = <2>;
343 trigger-name = "external-any"; 340 trigger-name = "external-any";
344 trigger-value = <0x3>; 341 trigger-value = <0x3>;
345 trigger-external; 342 trigger-external;
346 }; 343 };
347 trigger@3 { 344 trigger3 {
348 reg = <3>;
349 trigger-name = "continuous"; 345 trigger-name = "continuous";
350 trigger-value = <0x6>; 346 trigger-value = <0x6>;
351 }; 347 };
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 4e2cc30d6615..5a9f50fb8d65 100644
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -1226,22 +1226,22 @@
1226 atmel,adc-ts-pressure-threshold = <10000>; 1226 atmel,adc-ts-pressure-threshold = <10000>;
1227 status = "disabled"; 1227 status = "disabled";
1228 1228
1229 trigger@0 { 1229 trigger0 {
1230 trigger-name = "external-rising"; 1230 trigger-name = "external-rising";
1231 trigger-value = <0x1>; 1231 trigger-value = <0x1>;
1232 trigger-external; 1232 trigger-external;
1233 }; 1233 };
1234 trigger@1 { 1234 trigger1 {
1235 trigger-name = "external-falling"; 1235 trigger-name = "external-falling";
1236 trigger-value = <0x2>; 1236 trigger-value = <0x2>;
1237 trigger-external; 1237 trigger-external;
1238 }; 1238 };
1239 trigger@2 { 1239 trigger2 {
1240 trigger-name = "external-any"; 1240 trigger-name = "external-any";
1241 trigger-value = <0x3>; 1241 trigger-value = <0x3>;
1242 trigger-external; 1242 trigger-external;
1243 }; 1243 };
1244 trigger@3 { 1244 trigger3 {
1245 trigger-name = "continuous"; 1245 trigger-name = "continuous";
1246 trigger-value = <0x6>; 1246 trigger-value = <0x6>;
1247 }; 1247 };