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

ARM: sunxi: DT: Fix lines over 80 characters

A few lines in our DTSIs are over the 80 characters limit, making
checkpatch complain about that.

If possible (and relevant), wrap these lines to 80 characters.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

+91 -51
+8 -4
arch/arm/boot/dts/sun4i-a10.dtsi
··· 61 61 ranges; 62 62 63 63 framebuffer@0 { 64 - compatible = "allwinner,simple-framebuffer", "simple-framebuffer"; 64 + compatible = "allwinner,simple-framebuffer", 65 + "simple-framebuffer"; 65 66 allwinner,pipeline = "de_be0-lcd0-hdmi"; 66 67 clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>, 67 68 <&ahb_gates 44>; ··· 70 69 }; 71 70 72 71 framebuffer@1 { 73 - compatible = "allwinner,simple-framebuffer", "simple-framebuffer"; 72 + compatible = "allwinner,simple-framebuffer", 73 + "simple-framebuffer"; 74 74 allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi"; 75 75 clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>, 76 76 <&ahb_gates 44>, <&ahb_gates 46>; ··· 435 433 compatible = "allwinner,sun4i-a10-usb-clk"; 436 434 reg = <0x01c200cc 0x4>; 437 435 clocks = <&pll6 1>; 438 - clock-output-names = "usb_ohci0", "usb_ohci1", "usb_phy"; 436 + clock-output-names = "usb_ohci0", "usb_ohci1", 437 + "usb_phy"; 439 438 }; 440 439 441 440 spi3_clk: clk@01c200d4 { ··· 782 779 }; 783 780 784 781 mmc0_pins_a: mmc0@0 { 785 - allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5"; 782 + allwinner,pins = "PF0", "PF1", "PF2", 783 + "PF3", "PF4", "PF5"; 786 784 allwinner,function = "mmc0"; 787 785 allwinner,drive = <SUN4I_PINCTRL_30_MA>; 788 786 allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+18 -11
arch/arm/boot/dts/sun5i-a10s.dtsi
··· 62 62 ranges; 63 63 64 64 framebuffer@0 { 65 - compatible = "allwinner,simple-framebuffer", "simple-framebuffer"; 65 + compatible = "allwinner,simple-framebuffer", 66 + "simple-framebuffer"; 66 67 allwinner,pipeline = "de_be0-lcd0-hdmi"; 67 68 clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>, 68 69 <&ahb_gates 44>; ··· 85 84 compatible = "allwinner,sun5i-a10s-ahb-gates-clk"; 86 85 reg = <0x01c20060 0x8>; 87 86 clocks = <&ahb>; 88 - clock-output-names = "ahb_usbotg", "ahb_ehci", "ahb_ohci", 89 - "ahb_ss", "ahb_dma", "ahb_bist", "ahb_mmc0", 90 - "ahb_mmc1", "ahb_mmc2", "ahb_nand", "ahb_sdram", 91 - "ahb_emac", "ahb_ts", "ahb_spi0", "ahb_spi1", 92 - "ahb_spi2", "ahb_gps", "ahb_stimer", "ahb_ve", 93 - "ahb_tve", "ahb_lcd", "ahb_csi", "ahb_hdmi", 94 - "ahb_de_be", "ahb_de_fe", "ahb_iep", "ahb_mali400"; 87 + clock-output-names = "ahb_usbotg", "ahb_ehci", 88 + "ahb_ohci", "ahb_ss", "ahb_dma", 89 + "ahb_bist", "ahb_mmc0", "ahb_mmc1", 90 + "ahb_mmc2", "ahb_nand", 91 + "ahb_sdram", "ahb_emac", "ahb_ts", 92 + "ahb_spi0", "ahb_spi1", "ahb_spi2", 93 + "ahb_gps", "ahb_stimer", "ahb_ve", 94 + "ahb_tve", "ahb_lcd", "ahb_csi", 95 + "ahb_hdmi", "ahb_de_be", 96 + "ahb_de_fe", "ahb_iep", 97 + "ahb_mali400"; 95 98 }; 96 99 97 100 apb0_gates: clk@01c20068 { ··· 103 98 compatible = "allwinner,sun5i-a10s-apb0-gates-clk"; 104 99 reg = <0x01c20068 0x4>; 105 100 clocks = <&apb0>; 106 - clock-output-names = "apb0_codec", "apb0_iis", "apb0_pio", 107 - "apb0_ir", "apb0_keypad"; 101 + clock-output-names = "apb0_codec", "apb0_iis", 102 + "apb0_pio", "apb0_ir", 103 + "apb0_keypad"; 108 104 }; 109 105 110 106 apb1_gates: clk@01c2006c { ··· 194 188 }; 195 189 196 190 mmc1_pins_a: mmc1@0 { 197 - allwinner,pins = "PG3","PG4","PG5","PG6","PG7","PG8"; 191 + allwinner,pins = "PG3", "PG4", "PG5", 192 + "PG6", "PG7", "PG8"; 198 193 allwinner,function = "mmc1"; 199 194 allwinner,drive = <SUN4I_PINCTRL_30_MA>; 200 195 allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+12 -7
arch/arm/boot/dts/sun5i-a13.dtsi
··· 104 104 compatible = "allwinner,sun5i-a13-ahb-gates-clk"; 105 105 reg = <0x01c20060 0x8>; 106 106 clocks = <&ahb>; 107 - clock-output-names = "ahb_usbotg", "ahb_ehci", "ahb_ohci", 108 - "ahb_ss", "ahb_dma", "ahb_bist", "ahb_mmc0", 109 - "ahb_mmc1", "ahb_mmc2", "ahb_nand", "ahb_sdram", 110 - "ahb_spi0", "ahb_spi1", "ahb_spi2", "ahb_stimer", 111 - "ahb_ve", "ahb_lcd", "ahb_csi", "ahb_de_be", 112 - "ahb_de_fe", "ahb_iep", "ahb_mali400"; 107 + clock-output-names = "ahb_usbotg", "ahb_ehci", 108 + "ahb_ohci", "ahb_ss", "ahb_dma", 109 + "ahb_bist", "ahb_mmc0", "ahb_mmc1", 110 + "ahb_mmc2", "ahb_nand", 111 + "ahb_sdram", "ahb_spi0", 112 + "ahb_spi1", "ahb_spi2", 113 + "ahb_stimer", "ahb_ve", "ahb_lcd", 114 + "ahb_csi", "ahb_de_be", 115 + "ahb_de_fe", "ahb_iep", 116 + "ahb_mali400"; 113 117 }; 114 118 115 119 apb0_gates: clk@01c20068 { ··· 121 117 compatible = "allwinner,sun5i-a13-apb0-gates-clk"; 122 118 reg = <0x01c20068 0x4>; 123 119 clocks = <&apb0>; 124 - clock-output-names = "apb0_codec", "apb0_pio", "apb0_ir"; 120 + clock-output-names = "apb0_codec", "apb0_pio", 121 + "apb0_ir"; 125 122 }; 126 123 127 124 apb1_gates: clk@01c2006c {
+2 -1
arch/arm/boot/dts/sun5i.dtsi
··· 505 505 }; 506 506 507 507 mmc0_pins_a: mmc0@0 { 508 - allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5"; 508 + allwinner,pins = "PF0", "PF1", "PF2", "PF3", 509 + "PF4", "PF5"; 509 510 allwinner,function = "mmc0"; 510 511 allwinner,drive = <SUN4I_PINCTRL_30_MA>; 511 512 allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+19 -11
arch/arm/boot/dts/sun6i-a31.dtsi
··· 62 62 ranges; 63 63 64 64 framebuffer@0 { 65 - compatible = "allwinner,simple-framebuffer", "simple-framebuffer"; 65 + compatible = "allwinner,simple-framebuffer", 66 + "simple-framebuffer"; 66 67 allwinner,pipeline = "de_be0-lcd0-hdmi"; 67 68 clocks = <&pll6 0>; 68 69 status = "disabled"; ··· 300 299 reg = <0x01c2006c 0x4>; 301 300 clocks = <&apb2>; 302 301 clock-output-names = "apb2_i2c0", "apb2_i2c1", 303 - "apb2_i2c2", "apb2_i2c3", "apb2_uart0", 304 - "apb2_uart1", "apb2_uart2", "apb2_uart3", 305 - "apb2_uart4", "apb2_uart5"; 302 + "apb2_i2c2", "apb2_i2c3", 303 + "apb2_uart0", "apb2_uart1", 304 + "apb2_uart2", "apb2_uart3", 305 + "apb2_uart4", "apb2_uart5"; 306 306 }; 307 307 308 308 mmc0_clk: clk@01c20088 { ··· 390 388 }; 391 389 392 390 /* 393 - * The following two are dummy clocks, placeholders used in the gmac_tx 394 - * clock. The gmac driver will choose one parent depending on the PHY 395 - * interface mode, using clk_set_rate auto-reparenting. 396 - * The actual TX clock rate is not controlled by the gmac_tx clock. 391 + * The following two are dummy clocks, placeholders 392 + * used in the gmac_tx clock. The gmac driver will 393 + * choose one parent depending on the PHY interface 394 + * mode, using clk_set_rate auto-reparenting. 395 + * 396 + * The actual TX clock rate is not controlled by the 397 + * gmac_tx clock. 397 398 */ 398 399 mii_phy_tx_clk: clk@1 { 399 400 #clock-cells = <0>; ··· 632 627 }; 633 628 634 629 mmc0_pins_a: mmc0@0 { 635 - allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5"; 630 + allwinner,pins = "PF0", "PF1", "PF2", 631 + "PF3", "PF4", "PF5"; 636 632 allwinner,function = "mmc0"; 637 633 allwinner,drive = <SUN4I_PINCTRL_30_MA>; 638 634 allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; ··· 871 865 }; 872 866 873 867 timer@01c60000 { 874 - compatible = "allwinner,sun6i-a31-hstimer", "allwinner,sun7i-a20-hstimer"; 868 + compatible = "allwinner,sun6i-a31-hstimer", 869 + "allwinner,sun7i-a20-hstimer"; 875 870 reg = <0x01c60000 0x1000>; 876 871 interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>, 877 872 <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>, ··· 963 956 ar100: ar100_clk { 964 957 compatible = "allwinner,sun6i-a31-ar100-clk"; 965 958 #clock-cells = <0>; 966 - clocks = <&osc32k>, <&osc24M>, <&pll6 0>, <&pll6 0>; 959 + clocks = <&osc32k>, <&osc24M>, <&pll6 0>, 960 + <&pll6 0>; 967 961 clock-output-names = "ar100"; 968 962 }; 969 963
+27 -14
arch/arm/boot/dts/sun7i-a20.dtsi
··· 63 63 ranges; 64 64 65 65 framebuffer@0 { 66 - compatible = "allwinner,simple-framebuffer", "simple-framebuffer"; 66 + compatible = "allwinner,simple-framebuffer", 67 + "simple-framebuffer"; 67 68 allwinner,pipeline = "de_be0-lcd0-hdmi"; 68 69 clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>, 69 70 <&ahb_gates 44>; ··· 448 447 compatible = "allwinner,sun4i-a10-usb-clk"; 449 448 reg = <0x01c200cc 0x4>; 450 449 clocks = <&pll6 1>; 451 - clock-output-names = "usb_ohci0", "usb_ohci1", "usb_phy"; 450 + clock-output-names = "usb_ohci0", "usb_ohci1", 451 + "usb_phy"; 452 452 }; 453 453 454 454 spi3_clk: clk@01c200d4 { ··· 469 467 }; 470 468 471 469 /* 472 - * The following two are dummy clocks, placeholders used in the gmac_tx 473 - * clock. The gmac driver will choose one parent depending on the PHY 474 - * interface mode, using clk_set_rate auto-reparenting. 475 - * The actual TX clock rate is not controlled by the gmac_tx clock. 470 + * The following two are dummy clocks, placeholders 471 + * used in the gmac_tx clock. The gmac driver will 472 + * choose one parent depending on the PHY interface 473 + * mode, using clk_set_rate auto-reparenting. 474 + * 475 + * The actual TX clock rate is not controlled by the 476 + * gmac_tx clock. 476 477 */ 477 478 mii_phy_tx_clk: clk@2 { 478 479 #clock-cells = <0>; ··· 973 968 }; 974 969 975 970 mmc0_pins_a: mmc0@0 { 976 - allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5"; 971 + allwinner,pins = "PF0", "PF1", "PF2", 972 + "PF3", "PF4", "PF5"; 977 973 allwinner,function = "mmc0"; 978 974 allwinner,drive = <SUN4I_PINCTRL_30_MA>; 979 975 allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; ··· 988 982 }; 989 983 990 984 mmc2_pins_a: mmc2@0 { 991 - allwinner,pins = "PC6","PC7","PC8","PC9","PC10","PC11"; 985 + allwinner,pins = "PC6", "PC7", "PC8", 986 + "PC9", "PC10", "PC11"; 992 987 allwinner,function = "mmc2"; 993 988 allwinner,drive = <SUN4I_PINCTRL_30_MA>; 994 989 allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; 995 990 }; 996 991 997 992 mmc3_pins_a: mmc3@0 { 998 - allwinner,pins = "PI4","PI5","PI6","PI7","PI8","PI9"; 993 + allwinner,pins = "PI4", "PI5", "PI6", 994 + "PI7", "PI8", "PI9"; 999 995 allwinner,function = "mmc3"; 1000 996 allwinner,drive = <SUN4I_PINCTRL_30_MA>; 1001 997 allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; ··· 1195 1187 }; 1196 1188 1197 1189 i2c0: i2c@01c2ac00 { 1198 - compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c"; 1190 + compatible = "allwinner,sun7i-a20-i2c", 1191 + "allwinner,sun4i-a10-i2c"; 1199 1192 reg = <0x01c2ac00 0x400>; 1200 1193 interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; 1201 1194 clocks = <&apb1_gates 0>; ··· 1206 1197 }; 1207 1198 1208 1199 i2c1: i2c@01c2b000 { 1209 - compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c"; 1200 + compatible = "allwinner,sun7i-a20-i2c", 1201 + "allwinner,sun4i-a10-i2c"; 1210 1202 reg = <0x01c2b000 0x400>; 1211 1203 interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; 1212 1204 clocks = <&apb1_gates 1>; ··· 1217 1207 }; 1218 1208 1219 1209 i2c2: i2c@01c2b400 { 1220 - compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c"; 1210 + compatible = "allwinner,sun7i-a20-i2c", 1211 + "allwinner,sun4i-a10-i2c"; 1221 1212 reg = <0x01c2b400 0x400>; 1222 1213 interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; 1223 1214 clocks = <&apb1_gates 2>; ··· 1228 1217 }; 1229 1218 1230 1219 i2c3: i2c@01c2b800 { 1231 - compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c"; 1220 + compatible = "allwinner,sun7i-a20-i2c", 1221 + "allwinner,sun4i-a10-i2c"; 1232 1222 reg = <0x01c2b800 0x400>; 1233 1223 interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>; 1234 1224 clocks = <&apb1_gates 3>; ··· 1239 1227 }; 1240 1228 1241 1229 i2c4: i2c@01c2c000 { 1242 - compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c"; 1230 + compatible = "allwinner,sun7i-a20-i2c", 1231 + "allwinner,sun4i-a10-i2c"; 1243 1232 reg = <0x01c2c000 0x400>; 1244 1233 interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>; 1245 1234 clocks = <&apb1_gates 15>;
+4 -2
arch/arm/boot/dts/sun8i-a23.dtsi
··· 355 355 }; 356 356 357 357 mmc0_pins_a: mmc0@0 { 358 - allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5"; 358 + allwinner,pins = "PF0", "PF1", "PF2", 359 + "PF3", "PF4", "PF5"; 359 360 allwinner,function = "mmc0"; 360 361 allwinner,drive = <SUN4I_PINCTRL_30_MA>; 361 362 allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; 362 363 }; 363 364 364 365 mmc1_pins_a: mmc1@0 { 365 - allwinner,pins = "PG0","PG1","PG2","PG3","PG4","PG5"; 366 + allwinner,pins = "PG0", "PG1", "PG2", 367 + "PG3", "PG4", "PG5"; 366 368 allwinner,function = "mmc1"; 367 369 allwinner,drive = <SUN4I_PINCTRL_30_MA>; 368 370 allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+1 -1
arch/arm/boot/dts/sun9i-a80.dtsi
··· 284 284 "ahb0_ss", "ahb0_sd", "ahb0_nand1", 285 285 "ahb0_nand0", "ahb0_sdram", 286 286 "ahb0_mipi_hsi", "ahb0_sata", "ahb0_ts", 287 - "ahb0_spi0","ahb0_spi1", "ahb0_spi2", 287 + "ahb0_spi0", "ahb0_spi1", "ahb0_spi2", 288 288 "ahb0_spi3"; 289 289 }; 290 290