ARM: dts: exynos: use hyphens in Exynos4 node names

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

kernel os linux

Use hyphens instead of underscores in the Exynos4210 and Exynos4412 node
names which is expected by naming convention, multiple dtschema files
and pointed out by dtc W=2 builds. Use also generic "ppmu" node name
for PPMU nodes to match Devicetree specification.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20201105184506.215648-2-krzk@kernel.org

Krzysztof Kozlowski 5 years ago 1c6831b4 b357e6aa

+40 -40

3 changed files

expand all

arch

arm

boot

dts

exynos4.dtsi

exynos4210.dtsi

exynos4412.dtsi

+13 -13

arch/arm/boot/dts/exynos4.dtsi

··· 782 782 status = "disabled"; 783 783 }; 784 784 785 - ppmu_dmc0: ppmu_dmc0@106a0000 { 785 + ppmu_dmc0: ppmu@106a0000 { 786 786 compatible = "samsung,exynos-ppmu"; 787 787 reg = <0x106a0000 0x2000>; 788 788 clocks = <&clock CLK_PPMUDMC0>; ··· 790 790 status = "disabled"; 791 791 }; 792 792 793 - ppmu_dmc1: ppmu_dmc1@106b0000 { 793 + ppmu_dmc1: ppmu@106b0000 { 794 794 compatible = "samsung,exynos-ppmu"; 795 795 reg = <0x106b0000 0x2000>; 796 796 clocks = <&clock CLK_PPMUDMC1>; ··· 798 798 status = "disabled"; 799 799 }; 800 800 801 - ppmu_cpu: ppmu_cpu@106c0000 { 801 + ppmu_cpu: ppmu@106c0000 { 802 802 compatible = "samsung,exynos-ppmu"; 803 803 reg = <0x106c0000 0x2000>; 804 804 clocks = <&clock CLK_PPMUCPU>; ··· 806 806 status = "disabled"; 807 807 }; 808 808 809 - ppmu_rightbus: ppmu_rightbus@112a0000 { 809 + ppmu_rightbus: ppmu@112a0000 { 810 810 compatible = "samsung,exynos-ppmu"; 811 811 reg = <0x112a0000 0x2000>; 812 812 clocks = <&clock CLK_PPMURIGHT>; ··· 814 814 status = "disabled"; 815 815 }; 816 816 817 - ppmu_leftbus: ppmu_leftbus0@116a0000 { 817 + ppmu_leftbus: ppmu@116a0000 { 818 818 compatible = "samsung,exynos-ppmu"; 819 819 reg = <0x116a0000 0x2000>; 820 820 clocks = <&clock CLK_PPMULEFT>; ··· 822 822 status = "disabled"; 823 823 }; 824 824 825 - ppmu_camif: ppmu_camif@11ac0000 { 825 + ppmu_camif: ppmu@11ac0000 { 826 826 compatible = "samsung,exynos-ppmu"; 827 827 reg = <0x11ac0000 0x2000>; 828 828 clocks = <&clock CLK_PPMUCAMIF>; ··· 830 830 status = "disabled"; 831 831 }; 832 832 833 - ppmu_lcd0: ppmu_lcd0@11e40000 { 833 + ppmu_lcd0: ppmu@11e40000 { 834 834 compatible = "samsung,exynos-ppmu"; 835 835 reg = <0x11e40000 0x2000>; 836 836 clocks = <&clock CLK_PPMULCD0>; ··· 838 838 status = "disabled"; 839 839 }; 840 840 841 - ppmu_fsys: ppmu_g3d@12630000 { 841 + ppmu_fsys: ppmu@12630000 { 842 842 compatible = "samsung,exynos-ppmu"; 843 843 reg = <0x12630000 0x2000>; 844 844 status = "disabled"; 845 845 }; 846 846 847 - ppmu_image: ppmu_image@12aa0000 { 847 + ppmu_image: ppmu@12aa0000 { 848 848 compatible = "samsung,exynos-ppmu"; 849 849 reg = <0x12aa0000 0x2000>; 850 850 clocks = <&clock CLK_PPMUIMAGE>; ··· 852 852 status = "disabled"; 853 853 }; 854 854 855 - ppmu_tv: ppmu_tv@12e40000 { 855 + ppmu_tv: ppmu@12e40000 { 856 856 compatible = "samsung,exynos-ppmu"; 857 857 reg = <0x12e40000 0x2000>; 858 858 clocks = <&clock CLK_PPMUTV>; ··· 860 860 status = "disabled"; 861 861 }; 862 862 863 - ppmu_g3d: ppmu_g3d@13220000 { 863 + ppmu_g3d: ppmu@13220000 { 864 864 compatible = "samsung,exynos-ppmu"; 865 865 reg = <0x13220000 0x2000>; 866 866 clocks = <&clock CLK_PPMUG3D>; ··· 868 868 status = "disabled"; 869 869 }; 870 870 871 - ppmu_mfc_left: ppmu_mfc_left@13660000 { 871 + ppmu_mfc_left: ppmu@13660000 { 872 872 compatible = "samsung,exynos-ppmu"; 873 873 reg = <0x13660000 0x2000>; 874 874 clocks = <&clock CLK_PPMUMFC_L>; ··· 876 876 status = "disabled"; 877 877 }; 878 878 879 - ppmu_mfc_right: ppmu_mfc_right@13670000 { 879 + ppmu_mfc_right: ppmu@13670000 { 880 880 compatible = "samsung,exynos-ppmu"; 881 881 reg = <0x13670000 0x2000>; 882 882 clocks = <&clock CLK_PPMUMFC_R>;

+18 -18

arch/arm/boot/dts/exynos4210.dtsi

··· 168 168 iommus = <&sysmmu_g2d>; 169 169 }; 170 170 171 - ppmu_acp: ppmu_acp@10ae0000 { 171 + ppmu_acp: ppmu@10ae0000 { 172 172 compatible = "samsung,exynos-ppmu"; 173 173 reg = <0x10ae0000 0x2000>; 174 174 status = "disabled"; 175 175 }; 176 176 177 - ppmu_lcd1: ppmu_lcd1@12240000 { 177 + ppmu_lcd1: ppmu@12240000 { 178 178 compatible = "samsung,exynos-ppmu"; 179 179 reg = <0x12240000 0x2000>; 180 180 clocks = <&clock CLK_PPMULCD1>; ··· 204 204 #iommu-cells = <0>; 205 205 }; 206 206 207 - bus_dmc: bus_dmc { 207 + bus_dmc: bus-dmc { 208 208 compatible = "samsung,exynos-bus"; 209 209 clocks = <&clock CLK_DIV_DMC>; 210 210 clock-names = "bus"; ··· 212 212 status = "disabled"; 213 213 }; 214 214 215 - bus_acp: bus_acp { 215 + bus_acp: bus-acp { 216 216 compatible = "samsung,exynos-bus"; 217 217 clocks = <&clock CLK_DIV_ACP>; 218 218 clock-names = "bus"; ··· 220 220 status = "disabled"; 221 221 }; 222 222 223 - bus_peri: bus_peri { 223 + bus_peri: bus-peri { 224 224 compatible = "samsung,exynos-bus"; 225 225 clocks = <&clock CLK_ACLK100>; 226 226 clock-names = "bus"; ··· 228 228 status = "disabled"; 229 229 }; 230 230 231 - bus_fsys: bus_fsys { 231 + bus_fsys: bus-fsys { 232 232 compatible = "samsung,exynos-bus"; 233 233 clocks = <&clock CLK_ACLK133>; 234 234 clock-names = "bus"; ··· 236 236 status = "disabled"; 237 237 }; 238 238 239 - bus_display: bus_display { 239 + bus_display: bus-display { 240 240 compatible = "samsung,exynos-bus"; 241 241 clocks = <&clock CLK_ACLK160>; 242 242 clock-names = "bus"; ··· 244 244 status = "disabled"; 245 245 }; 246 246 247 - bus_lcd0: bus_lcd0 { 247 + bus_lcd0: bus-lcd0 { 248 248 compatible = "samsung,exynos-bus"; 249 249 clocks = <&clock CLK_ACLK200>; 250 250 clock-names = "bus"; ··· 252 252 status = "disabled"; 253 253 }; 254 254 255 - bus_leftbus: bus_leftbus { 255 + bus_leftbus: bus-leftbus { 256 256 compatible = "samsung,exynos-bus"; 257 257 clocks = <&clock CLK_DIV_GDL>; 258 258 clock-names = "bus"; ··· 260 260 status = "disabled"; 261 261 }; 262 262 263 - bus_rightbus: bus_rightbus { 263 + bus_rightbus: bus-rightbus { 264 264 compatible = "samsung,exynos-bus"; 265 265 clocks = <&clock CLK_DIV_GDR>; 266 266 clock-names = "bus"; ··· 268 268 status = "disabled"; 269 269 }; 270 270 271 - bus_mfc: bus_mfc { 271 + bus_mfc: bus-mfc { 272 272 compatible = "samsung,exynos-bus"; 273 273 clocks = <&clock CLK_SCLK_MFC>; 274 274 clock-names = "bus"; ··· 276 276 status = "disabled"; 277 277 }; 278 278 279 - bus_dmc_opp_table: opp_table1 { 279 + bus_dmc_opp_table: opp-table1 { 280 280 compatible = "operating-points-v2"; 281 281 opp-shared; 282 282 ··· 295 295 }; 296 296 }; 297 297 298 - bus_acp_opp_table: opp_table2 { 298 + bus_acp_opp_table: opp-table2 { 299 299 compatible = "operating-points-v2"; 300 300 opp-shared; 301 301 ··· 310 310 }; 311 311 }; 312 312 313 - bus_peri_opp_table: opp_table3 { 313 + bus_peri_opp_table: opp-table3 { 314 314 compatible = "operating-points-v2"; 315 315 opp-shared; 316 316 ··· 322 322 }; 323 323 }; 324 324 325 - bus_fsys_opp_table: opp_table4 { 325 + bus_fsys_opp_table: opp-table4 { 326 326 compatible = "operating-points-v2"; 327 327 opp-shared; 328 328 ··· 334 334 }; 335 335 }; 336 336 337 - bus_display_opp_table: opp_table5 { 337 + bus_display_opp_table: opp-table5 { 338 338 compatible = "operating-points-v2"; 339 339 opp-shared; 340 340 ··· 349 349 }; 350 350 }; 351 351 352 - bus_leftbus_opp_table: opp_table6 { 352 + bus_leftbus_opp_table: opp-table6 { 353 353 compatible = "operating-points-v2"; 354 354 opp-shared; 355 355 ··· 463 463 "ppmmu3"; 464 464 operating-points-v2 = <&gpu_opp_table>; 465 465 466 - gpu_opp_table: opp_table { 466 + gpu_opp_table: opp-table { 467 467 compatible = "operating-points-v2"; 468 468 469 469 opp-160000000 {

+9 -9

arch/arm/boot/dts/exynos4412.dtsi

··· 378 378 #iommu-cells = <0>; 379 379 }; 380 380 381 - bus_dmc: bus_dmc { 381 + bus_dmc: bus-dmc { 382 382 compatible = "samsung,exynos-bus"; 383 383 clocks = <&clock CLK_DIV_DMC>; 384 384 clock-names = "bus"; ··· 388 388 status = "disabled"; 389 389 }; 390 390 391 - bus_acp: bus_acp { 391 + bus_acp: bus-acp { 392 392 compatible = "samsung,exynos-bus"; 393 393 clocks = <&clock CLK_DIV_ACP>; 394 394 clock-names = "bus"; ··· 396 396 status = "disabled"; 397 397 }; 398 398 399 - bus_c2c: bus_c2c { 399 + bus_c2c: bus-c2c { 400 400 compatible = "samsung,exynos-bus"; 401 401 clocks = <&clock CLK_DIV_C2C>; 402 402 clock-names = "bus"; ··· 447 447 }; 448 448 }; 449 449 450 - bus_leftbus: bus_leftbus { 450 + bus_leftbus: bus-leftbus { 451 451 compatible = "samsung,exynos-bus"; 452 452 clocks = <&clock CLK_DIV_GDL>; 453 453 clock-names = "bus"; ··· 457 457 status = "disabled"; 458 458 }; 459 459 460 - bus_rightbus: bus_rightbus { 460 + bus_rightbus: bus-rightbus { 461 461 compatible = "samsung,exynos-bus"; 462 462 clocks = <&clock CLK_DIV_GDR>; 463 463 clock-names = "bus"; ··· 465 465 status = "disabled"; 466 466 }; 467 467 468 - bus_display: bus_display { 468 + bus_display: bus-display { 469 469 compatible = "samsung,exynos-bus"; 470 470 clocks = <&clock CLK_ACLK160>; 471 471 clock-names = "bus"; ··· 475 475 status = "disabled"; 476 476 }; 477 477 478 - bus_fsys: bus_fsys { 478 + bus_fsys: bus-fsys { 479 479 compatible = "samsung,exynos-bus"; 480 480 clocks = <&clock CLK_ACLK133>; 481 481 clock-names = "bus"; ··· 483 483 status = "disabled"; 484 484 }; 485 485 486 - bus_peri: bus_peri { 486 + bus_peri: bus-peri { 487 487 compatible = "samsung,exynos-bus"; 488 488 clocks = <&clock CLK_ACLK100>; 489 489 clock-names = "bus"; ··· 491 491 status = "disabled"; 492 492 }; 493 493 494 - bus_mfc: bus_mfc { 494 + bus_mfc: bus-mfc { 495 495 compatible = "samsung,exynos-bus"; 496 496 clocks = <&clock CLK_SCLK_MFC>; 497 497 clock-names = "bus";