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

ARM: dts: at91: rm9200: switch to new clock bindings

Switch at91rm9200 boards to the new PMC clock bindings.

Link: https://lore.kernel.org/r/20200324124154.368335-1-alexandre.belloni@bootlin.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

+23 -273
+23 -273
arch/arm/boot/dts/at91rm9200.dtsi
··· 101 101 compatible = "atmel,at91rm9200-pmc", "syscon"; 102 102 reg = <0xfffffc00 0x100>; 103 103 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; 104 - interrupt-controller; 105 - #address-cells = <1>; 106 - #size-cells = <0>; 107 - #interrupt-cells = <1>; 108 - 109 - main_osc: main_osc { 110 - compatible = "atmel,at91rm9200-clk-main-osc"; 111 - #clock-cells = <0>; 112 - interrupts-extended = <&pmc AT91_PMC_MOSCS>; 113 - clocks = <&main_xtal>; 114 - }; 115 - 116 - main: mainck { 117 - compatible = "atmel,at91rm9200-clk-main"; 118 - #clock-cells = <0>; 119 - clocks = <&main_osc>; 120 - }; 121 - 122 - plla: pllack { 123 - compatible = "atmel,at91rm9200-clk-pll"; 124 - #clock-cells = <0>; 125 - interrupts-extended = <&pmc AT91_PMC_LOCKA>; 126 - clocks = <&main>; 127 - reg = <0>; 128 - atmel,clk-input-range = <1000000 32000000>; 129 - #atmel,pll-clk-output-range-cells = <3>; 130 - atmel,pll-clk-output-ranges = <80000000 160000000 0>, 131 - <150000000 180000000 2>; 132 - }; 133 - 134 - pllb: pllbck { 135 - compatible = "atmel,at91rm9200-clk-pll"; 136 - #clock-cells = <0>; 137 - interrupts-extended = <&pmc AT91_PMC_LOCKB>; 138 - clocks = <&main>; 139 - reg = <1>; 140 - atmel,clk-input-range = <1000000 32000000>; 141 - #atmel,pll-clk-output-range-cells = <3>; 142 - atmel,pll-clk-output-ranges = <80000000 160000000 0>, 143 - <150000000 180000000 2>; 144 - }; 145 - 146 - mck: masterck { 147 - compatible = "atmel,at91rm9200-clk-master"; 148 - #clock-cells = <0>; 149 - interrupts-extended = <&pmc AT91_PMC_MCKRDY>; 150 - clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>; 151 - atmel,clk-output-range = <0 80000000>; 152 - atmel,clk-divisors = <1 2 3 4>; 153 - }; 154 - 155 - usb: usbck { 156 - compatible = "atmel,at91rm9200-clk-usb"; 157 - #clock-cells = <0>; 158 - atmel,clk-divisors = <1 2 0 0>; 159 - clocks = <&pllb>; 160 - }; 161 - 162 - prog: progck { 163 - compatible = "atmel,at91rm9200-clk-programmable"; 164 - #address-cells = <1>; 165 - #size-cells = <0>; 166 - interrupt-parent = <&pmc>; 167 - clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>; 168 - 169 - prog0: prog0 { 170 - #clock-cells = <0>; 171 - reg = <0>; 172 - interrupts = <AT91_PMC_PCKRDY(0)>; 173 - }; 174 - 175 - prog1: prog1 { 176 - #clock-cells = <0>; 177 - reg = <1>; 178 - interrupts = <AT91_PMC_PCKRDY(1)>; 179 - }; 180 - 181 - prog2: prog2 { 182 - #clock-cells = <0>; 183 - reg = <2>; 184 - interrupts = <AT91_PMC_PCKRDY(2)>; 185 - }; 186 - 187 - prog3: prog3 { 188 - #clock-cells = <0>; 189 - reg = <3>; 190 - interrupts = <AT91_PMC_PCKRDY(3)>; 191 - }; 192 - }; 193 - 194 - systemck { 195 - compatible = "atmel,at91rm9200-clk-system"; 196 - #address-cells = <1>; 197 - #size-cells = <0>; 198 - 199 - udpck: udpck { 200 - #clock-cells = <0>; 201 - reg = <2>; 202 - clocks = <&usb>; 203 - }; 204 - 205 - uhpck: uhpck { 206 - #clock-cells = <0>; 207 - reg = <4>; 208 - clocks = <&usb>; 209 - }; 210 - 211 - pck0: pck0 { 212 - #clock-cells = <0>; 213 - reg = <8>; 214 - clocks = <&prog0>; 215 - }; 216 - 217 - pck1: pck1 { 218 - #clock-cells = <0>; 219 - reg = <9>; 220 - clocks = <&prog1>; 221 - }; 222 - 223 - pck2: pck2 { 224 - #clock-cells = <0>; 225 - reg = <10>; 226 - clocks = <&prog2>; 227 - }; 228 - 229 - pck3: pck3 { 230 - #clock-cells = <0>; 231 - reg = <11>; 232 - clocks = <&prog3>; 233 - }; 234 - }; 235 - 236 - periphck { 237 - compatible = "atmel,at91rm9200-clk-peripheral"; 238 - #address-cells = <1>; 239 - #size-cells = <0>; 240 - clocks = <&mck>; 241 - 242 - pioA_clk: pioA_clk { 243 - #clock-cells = <0>; 244 - reg = <2>; 245 - }; 246 - 247 - pioB_clk: pioB_clk { 248 - #clock-cells = <0>; 249 - reg = <3>; 250 - }; 251 - 252 - pioC_clk: pioC_clk { 253 - #clock-cells = <0>; 254 - reg = <4>; 255 - }; 256 - 257 - pioD_clk: pioD_clk { 258 - #clock-cells = <0>; 259 - reg = <5>; 260 - }; 261 - 262 - usart0_clk: usart0_clk { 263 - #clock-cells = <0>; 264 - reg = <6>; 265 - }; 266 - 267 - usart1_clk: usart1_clk { 268 - #clock-cells = <0>; 269 - reg = <7>; 270 - }; 271 - 272 - usart2_clk: usart2_clk { 273 - #clock-cells = <0>; 274 - reg = <8>; 275 - }; 276 - 277 - usart3_clk: usart3_clk { 278 - #clock-cells = <0>; 279 - reg = <9>; 280 - }; 281 - 282 - mci0_clk: mci0_clk { 283 - #clock-cells = <0>; 284 - reg = <10>; 285 - }; 286 - 287 - udc_clk: udc_clk { 288 - #clock-cells = <0>; 289 - reg = <11>; 290 - }; 291 - 292 - twi0_clk: twi0_clk { 293 - reg = <12>; 294 - #clock-cells = <0>; 295 - }; 296 - 297 - spi0_clk: spi0_clk { 298 - #clock-cells = <0>; 299 - reg = <13>; 300 - }; 301 - 302 - ssc0_clk: ssc0_clk { 303 - #clock-cells = <0>; 304 - reg = <14>; 305 - }; 306 - 307 - ssc1_clk: ssc1_clk { 308 - #clock-cells = <0>; 309 - reg = <15>; 310 - }; 311 - 312 - ssc2_clk: ssc2_clk { 313 - #clock-cells = <0>; 314 - reg = <16>; 315 - }; 316 - 317 - tc0_clk: tc0_clk { 318 - #clock-cells = <0>; 319 - reg = <17>; 320 - }; 321 - 322 - tc1_clk: tc1_clk { 323 - #clock-cells = <0>; 324 - reg = <18>; 325 - }; 326 - 327 - tc2_clk: tc2_clk { 328 - #clock-cells = <0>; 329 - reg = <19>; 330 - }; 331 - 332 - tc3_clk: tc3_clk { 333 - #clock-cells = <0>; 334 - reg = <20>; 335 - }; 336 - 337 - tc4_clk: tc4_clk { 338 - #clock-cells = <0>; 339 - reg = <21>; 340 - }; 341 - 342 - tc5_clk: tc5_clk { 343 - #clock-cells = <0>; 344 - reg = <22>; 345 - }; 346 - 347 - ohci_clk: ohci_clk { 348 - #clock-cells = <0>; 349 - reg = <23>; 350 - }; 351 - 352 - macb0_clk: macb0_clk { 353 - #clock-cells = <0>; 354 - reg = <24>; 355 - }; 356 - }; 104 + #clock-cells = <2>; 105 + clocks = <&slow_xtal>, <&main_xtal>; 106 + clock-names = "slow_xtal", "main_xtal"; 357 107 }; 358 108 359 109 st: timer@fffffd00 { ··· 133 383 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0 134 384 18 IRQ_TYPE_LEVEL_HIGH 0 135 385 19 IRQ_TYPE_LEVEL_HIGH 0>; 136 - clocks = <&tc0_clk>, <&tc1_clk>, <&tc2_clk>, <&slow_xtal>; 386 + clocks = <&pmc PMC_TYPE_PERIPHERAL 17>, <&pmc PMC_TYPE_PERIPHERAL 18>, <&pmc PMC_TYPE_PERIPHERAL 19>, <&slow_xtal>; 137 387 clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk"; 138 388 }; 139 389 ··· 145 395 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0 146 396 21 IRQ_TYPE_LEVEL_HIGH 0 147 397 22 IRQ_TYPE_LEVEL_HIGH 0>; 148 - clocks = <&tc3_clk>, <&tc4_clk>, <&tc5_clk>, <&slow_xtal>; 398 + clocks = <&pmc PMC_TYPE_PERIPHERAL 20>, <&pmc PMC_TYPE_PERIPHERAL 21>, <&pmc PMC_TYPE_PERIPHERAL 22>, <&slow_xtal>; 149 399 clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk"; 150 400 }; 151 401 ··· 155 405 interrupts = <12 IRQ_TYPE_LEVEL_HIGH 6>; 156 406 pinctrl-names = "default"; 157 407 pinctrl-0 = <&pinctrl_twi>; 158 - clocks = <&twi0_clk>; 408 + clocks = <&pmc PMC_TYPE_PERIPHERAL 12>; 159 409 #address-cells = <1>; 160 410 #size-cells = <0>; 161 411 status = "disabled"; ··· 165 415 compatible = "atmel,hsmci"; 166 416 reg = <0xfffb4000 0x4000>; 167 417 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>; 168 - clocks = <&mci0_clk>; 418 + clocks = <&pmc PMC_TYPE_PERIPHERAL 10>; 169 419 clock-names = "mci_clk"; 170 420 #address-cells = <1>; 171 421 #size-cells = <0>; ··· 179 429 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>; 180 430 pinctrl-names = "default"; 181 431 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; 182 - clocks = <&ssc0_clk>; 432 + clocks = <&pmc PMC_TYPE_PERIPHERAL 14>; 183 433 clock-names = "pclk"; 184 434 status = "disabled"; 185 435 }; ··· 190 440 interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>; 191 441 pinctrl-names = "default"; 192 442 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>; 193 - clocks = <&ssc1_clk>; 443 + clocks = <&pmc PMC_TYPE_PERIPHERAL 15>; 194 444 clock-names = "pclk"; 195 445 status = "disabled"; 196 446 }; ··· 201 451 interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>; 202 452 pinctrl-names = "default"; 203 453 pinctrl-0 = <&pinctrl_ssc2_tx &pinctrl_ssc2_rx>; 204 - clocks = <&ssc2_clk>; 454 + clocks = <&pmc PMC_TYPE_PERIPHERAL 16>; 205 455 clock-names = "pclk"; 206 456 status = "disabled"; 207 457 }; ··· 213 463 phy-mode = "rmii"; 214 464 pinctrl-names = "default"; 215 465 pinctrl-0 = <&pinctrl_macb_rmii>; 216 - clocks = <&macb0_clk>; 466 + clocks = <&pmc PMC_TYPE_PERIPHERAL 24>; 217 467 clock-names = "ether_clk"; 218 468 status = "disabled"; 219 469 }; ··· 553 803 gpio-controller; 554 804 interrupt-controller; 555 805 #interrupt-cells = <2>; 556 - clocks = <&pioA_clk>; 806 + clocks = <&pmc PMC_TYPE_PERIPHERAL 2>; 557 807 }; 558 808 559 809 pioB: gpio@fffff600 { ··· 564 814 gpio-controller; 565 815 interrupt-controller; 566 816 #interrupt-cells = <2>; 567 - clocks = <&pioB_clk>; 817 + clocks = <&pmc PMC_TYPE_PERIPHERAL 3>; 568 818 }; 569 819 570 820 pioC: gpio@fffff800 { ··· 575 825 gpio-controller; 576 826 interrupt-controller; 577 827 #interrupt-cells = <2>; 578 - clocks = <&pioC_clk>; 828 + clocks = <&pmc PMC_TYPE_PERIPHERAL 4>; 579 829 }; 580 830 581 831 pioD: gpio@fffffa00 { ··· 586 836 gpio-controller; 587 837 interrupt-controller; 588 838 #interrupt-cells = <2>; 589 - clocks = <&pioD_clk>; 839 + clocks = <&pmc PMC_TYPE_PERIPHERAL 5>; 590 840 }; 591 841 }; 592 842 ··· 596 846 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; 597 847 pinctrl-names = "default"; 598 848 pinctrl-0 = <&pinctrl_dbgu>; 599 - clocks = <&mck>; 849 + clocks = <&pmc PMC_TYPE_CORE PMC_MCK>; 600 850 clock-names = "usart"; 601 851 status = "disabled"; 602 852 }; ··· 609 859 atmel,use-dma-tx; 610 860 pinctrl-names = "default"; 611 861 pinctrl-0 = <&pinctrl_uart0>; 612 - clocks = <&usart0_clk>; 862 + clocks = <&pmc PMC_TYPE_PERIPHERAL 6>; 613 863 clock-names = "usart"; 614 864 status = "disabled"; 615 865 }; ··· 622 872 atmel,use-dma-tx; 623 873 pinctrl-names = "default"; 624 874 pinctrl-0 = <&pinctrl_uart1>; 625 - clocks = <&usart1_clk>; 875 + clocks = <&pmc PMC_TYPE_PERIPHERAL 7>; 626 876 clock-names = "usart"; 627 877 status = "disabled"; 628 878 }; ··· 635 885 atmel,use-dma-tx; 636 886 pinctrl-names = "default"; 637 887 pinctrl-0 = <&pinctrl_uart2>; 638 - clocks = <&usart2_clk>; 888 + clocks = <&pmc PMC_TYPE_PERIPHERAL 8>; 639 889 clock-names = "usart"; 640 890 status = "disabled"; 641 891 }; ··· 648 898 atmel,use-dma-tx; 649 899 pinctrl-names = "default"; 650 900 pinctrl-0 = <&pinctrl_uart3>; 651 - clocks = <&usart3_clk>; 901 + clocks = <&pmc PMC_TYPE_PERIPHERAL 9>; 652 902 clock-names = "usart"; 653 903 status = "disabled"; 654 904 }; ··· 657 907 compatible = "atmel,at91rm9200-udc"; 658 908 reg = <0xfffb0000 0x4000>; 659 909 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>; 660 - clocks = <&udc_clk>, <&udpck>; 910 + clocks = <&pmc PMC_TYPE_PERIPHERAL 11>, <&pmc PMC_TYPE_SYSTEM 2>; 661 911 clock-names = "pclk", "hclk"; 662 912 status = "disabled"; 663 913 }; ··· 670 920 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>; 671 921 pinctrl-names = "default"; 672 922 pinctrl-0 = <&pinctrl_spi0>; 673 - clocks = <&spi0_clk>; 923 + clocks = <&pmc PMC_TYPE_PERIPHERAL 13>; 674 924 clock-names = "spi_clk"; 675 925 status = "disabled"; 676 926 }; ··· 697 947 compatible = "atmel,at91rm9200-ohci", "usb-ohci"; 698 948 reg = <0x00300000 0x100000>; 699 949 interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>; 700 - clocks = <&ohci_clk>, <&ohci_clk>, <&uhpck>; 950 + clocks = <&pmc PMC_TYPE_PERIPHERAL 23>, <&pmc PMC_TYPE_PERIPHERAL 23>, <&pmc PMC_TYPE_SYSTEM 4>; 701 951 clock-names = "ohci_clk", "hclk", "uhpck"; 702 952 status = "disabled"; 703 953 };