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

ARM: dts: marvell: make dts use gpio-fan matrix instead of array

No functional changes.

Adjust to comply with dt-schema requirements
and make possible to validate values.

Acked-by: Simon Guinot <simon.guinot@sequanux.org>
Signed-off-by: David Heidelberg <david@ixit.cz>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

authored by

David Heidelberg and committed by
Gregory CLEMENT 62f34e3e 6e75ac5a

+121 -112
+1 -1
arch/arm/boot/dts/marvell/armada-370-rd.dts
··· 95 95 gpio-fan { 96 96 compatible = "gpio-fan"; 97 97 gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; 98 - gpio-fan,speed-map = <0 0 3000 1>; 98 + gpio-fan,speed-map = <0 0>, <3000 1>; 99 99 pinctrl-0 = <&fan_pins>; 100 100 pinctrl-names = "default"; 101 101 };
+4 -4
arch/arm/boot/dts/marvell/armada-370-seagate-nas-2bay.dts
··· 25 25 26 26 gpio-fan { 27 27 gpio-fan,speed-map = 28 - < 0 3 29 - 950 2 30 - 1400 1 31 - 1800 0>; 28 + < 0 3>, 29 + < 950 2>, 30 + <1400 1>, 31 + <1800 0>; 32 32 }; 33 33 };
+4 -4
arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
··· 106 106 107 107 gpio-fan { 108 108 gpio-fan,speed-map = 109 - < 0 3 110 - 800 2 111 - 1050 1 112 - 1300 0>; 109 + < 0 3>, 110 + < 800 2>, 111 + <1050 1>, 112 + <1300 0>; 113 113 }; 114 114 }; 115 115
+8 -8
arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
··· 113 113 &gpio2 0 GPIO_ACTIVE_HIGH 114 114 &gpio2 1 GPIO_ACTIVE_HIGH>; 115 115 alarm-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; 116 - gpio-fan,speed-map = < 0 0 117 - 1000 1 118 - 1150 2 119 - 1350 4 120 - 1500 3 121 - 1650 5 122 - 1750 6 123 - 1900 7 >; 116 + gpio-fan,speed-map = < 0 0>, 117 + <1000 1>, 118 + <1150 2>, 119 + <1350 4>, 120 + <1500 3>, 121 + <1650 5>, 122 + <1750 6>, 123 + <1900 7>; 124 124 }; 125 125 126 126 gpio-leds {
+8 -8
arch/arm/boot/dts/marvell/armada-385-synology-ds116.dts
··· 131 131 gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>, 132 132 <&gpio1 17 GPIO_ACTIVE_HIGH>, 133 133 <&gpio1 16 GPIO_ACTIVE_HIGH>; 134 - gpio-fan,speed-map = < 0 0 135 - 1500 1 136 - 2500 2 137 - 3000 3 138 - 3400 4 139 - 3700 5 140 - 3900 6 141 - 4000 7>; 134 + gpio-fan,speed-map = < 0 0>, 135 + <1500 1>, 136 + <2500 2>, 137 + <3000 3>, 138 + <3400 4>, 139 + <3700 5>, 140 + <3900 6>, 141 + <4000 7>; 142 142 #cooling-cells = <2>; 143 143 }; 144 144
+2 -2
arch/arm/boot/dts/marvell/armada-388-gp.dts
··· 237 237 gpio-fan { 238 238 compatible = "gpio-fan"; 239 239 gpios = <&expander1 3 GPIO_ACTIVE_HIGH>; 240 - gpio-fan,speed-map = < 0 0 241 - 3000 1>; 240 + gpio-fan,speed-map = < 0 0>, 241 + <3000 1>; 242 242 }; 243 243 }; 244 244
+3 -3
arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi
··· 38 38 pinctrl-names = "default"; 39 39 gpios = <&gpio1 14 GPIO_ACTIVE_HIGH 40 40 &gpio1 13 GPIO_ACTIVE_HIGH>; 41 - gpio-fan,speed-map = <0 0 42 - 3000 1 43 - 6000 2>; 41 + gpio-fan,speed-map = <0 0>, 42 + <3000 1>, 43 + <6000 2>; 44 44 }; 45 45 46 46 gpio_poweroff {
+5 -4
arch/arm/boot/dts/marvell/kirkwood-linkstation-6282.dtsi
··· 118 118 gpios = <&gpio0 17 GPIO_ACTIVE_LOW 119 119 &gpio0 16 GPIO_ACTIVE_LOW>; 120 120 121 - gpio-fan,speed-map = <0 3 122 - 1500 2 123 - 3250 1 124 - 5000 0>; 121 + gpio-fan,speed-map = 122 + < 0 3>, 123 + <1500 2>, 124 + <3250 1>, 125 + <5000 0>; 125 126 126 127 alarm-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; 127 128 };
+5 -4
arch/arm/boot/dts/marvell/kirkwood-linkstation-lswxl.dts
··· 69 69 gpios = <&gpio1 16 GPIO_ACTIVE_LOW 70 70 &gpio1 15 GPIO_ACTIVE_LOW>; 71 71 72 - gpio-fan,speed-map = <0 3 73 - 1500 2 74 - 3250 1 75 - 5000 0>; 72 + gpio-fan,speed-map = 73 + < 0 3>, 74 + <1500 2>, 75 + <3250 1>, 76 + <5000 0>; 76 77 77 78 alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; 78 79 };
+5 -4
arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi
··· 172 172 pinctrl-names = "default"; 173 173 gpios = <&gpio0 19 GPIO_ACTIVE_LOW 174 174 &gpio0 18 GPIO_ACTIVE_LOW>; 175 - gpio-fan,speed-map = <0 3 176 - 1500 2 177 - 3250 1 178 - 5000 0>; 175 + gpio-fan,speed-map = 176 + <0 3>, 177 + <1500 2>, 178 + <3250 1>, 179 + <5000 0>; 179 180 alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; 180 181 }; 181 182
+9 -9
arch/arm/boot/dts/marvell/kirkwood-ns2max.dts
··· 29 29 &gpio1 1 GPIO_ACTIVE_LOW 30 30 &gpio0 23 GPIO_ACTIVE_LOW>; 31 31 gpio-fan,speed-map = 32 - < 0 0 33 - 1500 15 34 - 1700 14 35 - 1800 13 36 - 2100 12 37 - 3100 11 38 - 3300 10 39 - 4300 9 40 - 5500 8>; 32 + < 0 0>, 33 + <1500 15>, 34 + <1700 14>, 35 + <1800 13>, 36 + <2100 12>, 37 + <3100 11>, 38 + <3300 10>, 39 + <4300 9>, 40 + <5500 8>; 41 41 alarm-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; 42 42 }; 43 43
+9 -9
arch/arm/boot/dts/marvell/kirkwood-ns2mini.dts
··· 30 30 &gpio1 1 GPIO_ACTIVE_LOW 31 31 &gpio0 23 GPIO_ACTIVE_LOW>; 32 32 gpio-fan,speed-map = 33 - < 0 0 34 - 3000 15 35 - 3180 14 36 - 4140 13 37 - 4570 12 38 - 6760 11 39 - 7140 10 40 - 7980 9 41 - 9200 8>; 33 + < 0 0>, 34 + <3000 15>, 35 + <3180 14>, 36 + <4140 13>, 37 + <4570 12>, 38 + <6760 11>, 39 + <7140 10>, 40 + <7980 9>, 41 + <9200 8>; 42 42 alarm-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; 43 43 }; 44 44
+54 -48
arch/arm/boot/dts/marvell/kirkwood-synology.dtsi
··· 286 286 gpios = <&gpio1 0 GPIO_ACTIVE_HIGH 287 287 &gpio1 1 GPIO_ACTIVE_HIGH 288 288 &gpio1 2 GPIO_ACTIVE_HIGH>; 289 - gpio-fan,speed-map = < 0 0 290 - 2200 1 291 - 2500 2 292 - 3000 4 293 - 3300 3 294 - 3700 5 295 - 3800 6 296 - 4200 7 >; 289 + gpio-fan,speed-map = 290 + < 0 0>, 291 + <2200 1>, 292 + <2500 2>, 293 + <3000 4>, 294 + <3300 3>, 295 + <3700 5>, 296 + <3800 6>, 297 + <4200 7>; 297 298 }; 298 299 299 300 gpio-fan-150-15-18 { ··· 307 306 &gpio0 16 GPIO_ACTIVE_HIGH 308 307 &gpio0 17 GPIO_ACTIVE_HIGH>; 309 308 alarm-gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>; 310 - gpio-fan,speed-map = < 0 0 311 - 2200 1 312 - 2500 2 313 - 3000 4 314 - 3300 3 315 - 3700 5 316 - 3800 6 317 - 4200 7 >; 309 + gpio-fan,speed-map = 310 + < 0 0>, 311 + <2200 1>, 312 + <2500 2>, 313 + <3000 4>, 314 + <3300 3>, 315 + <3700 5>, 316 + <3800 6>, 317 + <4200 7>; 318 318 }; 319 319 320 320 gpio-fan-100-32-35 { ··· 328 326 &gpio1 1 GPIO_ACTIVE_HIGH 329 327 &gpio1 2 GPIO_ACTIVE_HIGH>; 330 328 alarm-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; 331 - gpio-fan,speed-map = < 0 0 332 - 2500 1 333 - 3100 2 334 - 3800 3 335 - 4600 4 336 - 4800 5 337 - 4900 6 338 - 5000 7 >; 329 + gpio-fan,speed-map = 330 + < 0 0>, 331 + <2500 1>, 332 + <3100 2>, 333 + <3800 3>, 334 + <4600 4>, 335 + <4800 5>, 336 + <4900 6>, 337 + <5000 7>; 339 338 }; 340 339 341 340 gpio-fan-100-15-18 { ··· 349 346 &gpio0 16 GPIO_ACTIVE_HIGH 350 347 &gpio0 17 GPIO_ACTIVE_HIGH>; 351 348 alarm-gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>; 352 - gpio-fan,speed-map = < 0 0 353 - 2500 1 354 - 3100 2 355 - 3800 3 356 - 4600 4 357 - 4800 5 358 - 4900 6 359 - 5000 7 >; 349 + gpio-fan,speed-map = 350 + < 0 0>, 351 + <2500 1>, 352 + <3100 2>, 353 + <3800 3>, 354 + <4600 4>, 355 + <4800 5>, 356 + <4900 6>, 357 + <5000 7>; 360 358 }; 361 359 362 360 gpio-fan-100-15-35-1 { ··· 370 366 &gpio0 16 GPIO_ACTIVE_HIGH 371 367 &gpio0 17 GPIO_ACTIVE_HIGH>; 372 368 alarm-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; 373 - gpio-fan,speed-map = < 0 0 374 - 2500 1 375 - 3100 2 376 - 3800 3 377 - 4600 4 378 - 4800 5 379 - 4900 6 380 - 5000 7 >; 369 + gpio-fan,speed-map = 370 + < 0 0>, 371 + <2500 1>, 372 + <3100 2>, 373 + <3800 3>, 374 + <4600 4>, 375 + <4800 5>, 376 + <4900 6>, 377 + <5000 7>; 381 378 }; 382 379 383 380 gpio-fan-100-15-35-3 { ··· 393 388 alarm-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH 394 389 &gpio1 12 GPIO_ACTIVE_HIGH 395 390 &gpio1 13 GPIO_ACTIVE_HIGH>; 396 - gpio-fan,speed-map = < 0 0 397 - 2500 1 398 - 3100 2 399 - 3800 3 400 - 4600 4 401 - 4800 5 402 - 4900 6 403 - 5000 7 >; 391 + gpio-fan,speed-map = 392 + < 0 0>, 393 + <2500 1>, 394 + <3100 2>, 395 + <3800 3>, 396 + <4600 4>, 397 + <4800 5>, 398 + <4900 6>, 399 + <5000 7>; 404 400 }; 405 401 406 402 gpio-leds-alarm-12 {
+4 -4
arch/arm/boot/dts/marvell/mvebu-linkstation-fan.dtsi
··· 50 50 pinctrl-names = "default"; 51 51 52 52 gpio-fan,speed-map = 53 - <0 3 54 - 1500 2 55 - 3250 1 56 - 5000 0>; 53 + < 0 3>, 54 + <1500 2>, 55 + <3250 1>, 56 + <5000 0>; 57 57 }; 58 58 }; 59 59