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

[POWERPC] FSL: I2C device tree cleanups

* Removed device_type = "i2c"
* Added missing second I2C controller on MPC8548 CDS, MPC8544 DS
* Added #address-cells, #size-cells, and cell-index where missing

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

Kumar Gala ec9686c4 1c1d1672

+94 -38
+1 -1
arch/powerpc/boot/dts/kuroboxHD.dts
··· 60 60 i2c@80003000 { 61 61 #address-cells = <1>; 62 62 #size-cells = <0>; 63 - device_type = "i2c"; 63 + cell-index = <0>; 64 64 compatible = "fsl-i2c"; 65 65 reg = <80003000 1000>; 66 66 interrupts = <5 2>;
+1 -1
arch/powerpc/boot/dts/kuroboxHG.dts
··· 60 60 i2c@80003000 { 61 61 #address-cells = <1>; 62 62 #size-cells = <0>; 63 - device_type = "i2c"; 63 + cell-index = <0>; 64 64 compatible = "fsl-i2c"; 65 65 reg = <80003000 1000>; 66 66 interrupts = <5 2>;
+4 -2
arch/powerpc/boot/dts/lite5200.dts
··· 284 284 }; 285 285 286 286 i2c@3d00 { 287 - device_type = "i2c"; 287 + #address-cells = <1>; 288 + #size-cells = <0>; 288 289 compatible = "mpc5200-i2c","fsl-i2c"; 289 290 cell-index = <0>; 290 291 reg = <3d00 40>; ··· 295 294 }; 296 295 297 296 i2c@3d40 { 298 - device_type = "i2c"; 297 + #address-cells = <1>; 298 + #size-cells = <0>; 299 299 compatible = "mpc5200-i2c","fsl-i2c"; 300 300 cell-index = <1>; 301 301 reg = <3d40 40>;
+4 -2
arch/powerpc/boot/dts/lite5200b.dts
··· 300 300 }; 301 301 302 302 i2c@3d00 { 303 - device_type = "i2c"; 303 + #address-cells = <1>; 304 + #size-cells = <0>; 304 305 compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c"; 305 306 cell-index = <0>; 306 307 reg = <3d00 40>; ··· 311 310 }; 312 311 313 312 i2c@3d40 { 314 - device_type = "i2c"; 313 + #address-cells = <1>; 314 + #size-cells = <0>; 315 315 compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c"; 316 316 cell-index = <1>; 317 317 reg = <3d40 40>;
+6 -2
arch/powerpc/boot/dts/mpc8313erdb.dts
··· 52 52 }; 53 53 54 54 i2c@3000 { 55 - device_type = "i2c"; 55 + #address-cells = <1>; 56 + #size-cells = <0>; 57 + cell-index = <0>; 56 58 compatible = "fsl-i2c"; 57 59 reg = <3000 100>; 58 60 interrupts = <e 8>; ··· 63 61 }; 64 62 65 63 i2c@3100 { 66 - device_type = "i2c"; 64 + #address-cells = <1>; 65 + #size-cells = <0>; 66 + cell-index = <1>; 67 67 compatible = "fsl-i2c"; 68 68 reg = <3100 100>; 69 69 interrupts = <f 8>;
+1 -1
arch/powerpc/boot/dts/mpc832x_mds.dts
··· 59 59 i2c@3000 { 60 60 #address-cells = <1>; 61 61 #size-cells = <0>; 62 - device_type = "i2c"; 62 + cell-index = <0>; 63 63 compatible = "fsl-i2c"; 64 64 reg = <3000 100>; 65 65 interrupts = <e 8>;
+3 -1
arch/powerpc/boot/dts/mpc832x_rdb.dts
··· 52 52 }; 53 53 54 54 i2c@3000 { 55 - device_type = "i2c"; 55 + #address-cells = <1>; 56 + #size-cells = <0>; 57 + cell-index = <0>; 56 58 compatible = "fsl-i2c"; 57 59 reg = <3000 100>; 58 60 interrupts = <e 8>;
+6 -2
arch/powerpc/boot/dts/mpc8349emitx.dts
··· 51 51 }; 52 52 53 53 i2c@3000 { 54 - device_type = "i2c"; 54 + #address-cells = <1>; 55 + #size-cells = <0>; 56 + cell-index = <0>; 55 57 compatible = "fsl-i2c"; 56 58 reg = <3000 100>; 57 59 interrupts = <e 8>; ··· 62 60 }; 63 61 64 62 i2c@3100 { 65 - device_type = "i2c"; 63 + #address-cells = <1>; 64 + #size-cells = <0>; 65 + cell-index = <1>; 66 66 compatible = "fsl-i2c"; 67 67 reg = <3100 100>; 68 68 interrupts = <f 8>;
+6 -2
arch/powerpc/boot/dts/mpc8349emitxgp.dts
··· 51 51 }; 52 52 53 53 i2c@3000 { 54 - device_type = "i2c"; 54 + #address-cells = <1>; 55 + #size-cells = <0>; 56 + cell-index = <0>; 55 57 compatible = "fsl-i2c"; 56 58 reg = <3000 100>; 57 59 interrupts = <e 8>; ··· 62 60 }; 63 61 64 62 i2c@3100 { 65 - device_type = "i2c"; 63 + #address-cells = <1>; 64 + #size-cells = <0>; 65 + cell-index = <1>; 66 66 compatible = "fsl-i2c"; 67 67 reg = <3100 100>; 68 68 interrupts = <f 8>;
+2 -2
arch/powerpc/boot/dts/mpc834x_mds.dts
··· 59 59 i2c@3000 { 60 60 #address-cells = <1>; 61 61 #size-cells = <0>; 62 - device_type = "i2c"; 62 + cell-index = <0>; 63 63 compatible = "fsl-i2c"; 64 64 reg = <3000 100>; 65 65 interrupts = <e 8>; ··· 75 75 i2c@3100 { 76 76 #address-cells = <1>; 77 77 #size-cells = <0>; 78 - device_type = "i2c"; 78 + cell-index = <1>; 79 79 compatible = "fsl-i2c"; 80 80 reg = <3100 100>; 81 81 interrupts = <f 8>;
+2 -2
arch/powerpc/boot/dts/mpc836x_mds.dts
··· 64 64 i2c@3000 { 65 65 #address-cells = <1>; 66 66 #size-cells = <0>; 67 - device_type = "i2c"; 67 + cell-index = <0>; 68 68 compatible = "fsl-i2c"; 69 69 reg = <3000 100>; 70 70 interrupts = <e 8>; ··· 80 80 i2c@3100 { 81 81 #address-cells = <1>; 82 82 #size-cells = <0>; 83 - device_type = "i2c"; 83 + cell-index = <1>; 84 84 compatible = "fsl-i2c"; 85 85 reg = <3100 100>; 86 86 interrupts = <f 8>;
+3 -1
arch/powerpc/boot/dts/mpc8540ads.dts
··· 63 63 }; 64 64 65 65 i2c@3000 { 66 - device_type = "i2c"; 66 + #address-cells = <1>; 67 + #size-cells = <0>; 68 + cell-index = <0>; 67 69 compatible = "fsl-i2c"; 68 70 reg = <3000 100>; 69 71 interrupts = <2b 2>;
+3 -1
arch/powerpc/boot/dts/mpc8541cds.dts
··· 63 63 }; 64 64 65 65 i2c@3000 { 66 - device_type = "i2c"; 66 + #address-cells = <1>; 67 + #size-cells = <0>; 68 + cell-index = <0>; 67 69 compatible = "fsl-i2c"; 68 70 reg = <3000 100>; 69 71 interrupts = <2b 2>;
+14 -1
arch/powerpc/boot/dts/mpc8544ds.dts
··· 64 64 }; 65 65 66 66 i2c@3000 { 67 - device_type = "i2c"; 67 + #address-cells = <1>; 68 + #size-cells = <0>; 69 + cell-index = <0>; 68 70 compatible = "fsl-i2c"; 69 71 reg = <3000 100>; 72 + interrupts = <2b 2>; 73 + interrupt-parent = <&mpic>; 74 + dfsrr; 75 + }; 76 + 77 + i2c@3100 { 78 + #address-cells = <1>; 79 + #size-cells = <0>; 80 + cell-index = <1>; 81 + compatible = "fsl-i2c"; 82 + reg = <3100 100>; 70 83 interrupts = <2b 2>; 71 84 interrupt-parent = <&mpic>; 72 85 dfsrr;
+14 -1
arch/powerpc/boot/dts/mpc8548cds.dts
··· 63 63 }; 64 64 65 65 i2c@3000 { 66 - device_type = "i2c"; 66 + #address-cells = <1>; 67 + #size-cells = <0>; 68 + cell-index = <0>; 67 69 compatible = "fsl-i2c"; 68 70 reg = <3000 100>; 71 + interrupts = <2b 2>; 72 + interrupt-parent = <&mpic>; 73 + dfsrr; 74 + }; 75 + 76 + i2c@3100 { 77 + #address-cells = <1>; 78 + #size-cells = <0>; 79 + cell-index = <1>; 80 + compatible = "fsl-i2c"; 81 + reg = <3100 100>; 69 82 interrupts = <2b 2>; 70 83 interrupt-parent = <&mpic>; 71 84 dfsrr;
+3 -1
arch/powerpc/boot/dts/mpc8555cds.dts
··· 63 63 }; 64 64 65 65 i2c@3000 { 66 - device_type = "i2c"; 66 + #address-cells = <1>; 67 + #size-cells = <0>; 68 + cell-index = <0>; 67 69 compatible = "fsl-i2c"; 68 70 reg = <3000 100>; 69 71 interrupts = <2b 2>;
+2 -2
arch/powerpc/boot/dts/mpc8568mds.dts
··· 74 74 i2c@3000 { 75 75 #address-cells = <1>; 76 76 #size-cells = <0>; 77 - device_type = "i2c"; 77 + cell-index = <0>; 78 78 compatible = "fsl-i2c"; 79 79 reg = <3000 100>; 80 80 interrupts = <2b 2>; ··· 90 90 i2c@3100 { 91 91 #address-cells = <1>; 92 92 #size-cells = <0>; 93 - device_type = "i2c"; 93 + cell-index = <1>; 94 94 compatible = "fsl-i2c"; 95 95 reg = <3100 100>; 96 96 interrupts = <2b 2>;
+6 -2
arch/powerpc/boot/dts/mpc8572ds.dts
··· 69 69 }; 70 70 71 71 i2c@3000 { 72 - device_type = "i2c"; 72 + #address-cells = <1>; 73 + #size-cells = <0>; 74 + cell-index = <0>; 73 75 compatible = "fsl-i2c"; 74 76 reg = <3000 100>; 75 77 interrupts = <2b 2>; ··· 80 78 }; 81 79 82 80 i2c@3100 { 83 - device_type = "i2c"; 81 + #address-cells = <1>; 82 + #size-cells = <0>; 83 + cell-index = <1>; 84 84 compatible = "fsl-i2c"; 85 85 reg = <3100 100>; 86 86 interrupts = <2b 2>;
+4 -4
arch/powerpc/boot/dts/mpc8610_hpcd.dts
··· 47 47 bus-frequency = <0>; 48 48 49 49 i2c@3000 { 50 - device_type = "i2c"; 51 - compatible = "fsl-i2c"; 52 50 #address-cells = <1>; 53 51 #size-cells = <0>; 52 + cell-index = <0>; 53 + compatible = "fsl-i2c"; 54 54 reg = <3000 100>; 55 55 interrupts = <2b 2>; 56 56 interrupt-parent = <&mpic>; ··· 58 58 }; 59 59 60 60 i2c@3100 { 61 - device_type = "i2c"; 62 - compatible = "fsl-i2c"; 63 61 #address-cells = <1>; 64 62 #size-cells = <0>; 63 + cell-index = <1>; 64 + compatible = "fsl-i2c"; 65 65 reg = <3100 100>; 66 66 interrupts = <2b 2>; 67 67 interrupt-parent = <&mpic>;
+6 -2
arch/powerpc/boot/dts/mpc8641_hpcn.dts
··· 69 69 bus-frequency = <0>; 70 70 71 71 i2c@3000 { 72 - device_type = "i2c"; 72 + #address-cells = <1>; 73 + #size-cells = <0>; 74 + cell-index = <0>; 73 75 compatible = "fsl-i2c"; 74 76 reg = <3000 100>; 75 77 interrupts = <2b 2>; ··· 80 78 }; 81 79 82 80 i2c@3100 { 83 - device_type = "i2c"; 81 + #address-cells = <1>; 82 + #size-cells = <0>; 83 + cell-index = <1>; 84 84 compatible = "fsl-i2c"; 85 85 reg = <3100 100>; 86 86 interrupts = <2b 2>;
+3 -5
arch/powerpc/sysdev/fsl_soc.c
··· 390 390 static int __init fsl_i2c_of_init(void) 391 391 { 392 392 struct device_node *np; 393 - unsigned int i; 393 + unsigned int i = 0; 394 394 struct platform_device *i2c_dev; 395 395 int ret; 396 396 397 - for (np = NULL, i = 0; 398 - (np = of_find_compatible_node(np, "i2c", "fsl-i2c")) != NULL; 399 - i++) { 397 + for_each_compatible_node(np, NULL, "fsl-i2c") { 400 398 struct resource r[2]; 401 399 struct fsl_i2c_platform_data i2c_data; 402 400 const unsigned char *flags = NULL; ··· 430 432 if (ret) 431 433 goto unreg; 432 434 433 - of_register_i2c_devices(np, i); 435 + of_register_i2c_devices(np, i++); 434 436 } 435 437 436 438 return 0;