Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 81055
b: refs/heads/master
c: ec9686c
h: refs/heads/master
i:
  81053: 044e1e6
  81051: 8754b53
  81047: 7ffe747
  81039: ac1ff1c
  81023: 8ca99a4
v: v3
  • Loading branch information
Kumar Gala committed Dec 12, 2007
1 parent 92ee83e commit d00fd25
Show file tree
Hide file tree
Showing 22 changed files with 95 additions and 39 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1c1d1672b6b00c7061ea2468d740b4aaf34a763c
refs/heads/master: ec9686c4a57ea46c97126660936f66e8a5eb87eb
2 changes: 1 addition & 1 deletion trunk/arch/powerpc/boot/dts/kuroboxHD.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ XXXX add flash parts, rtc, ??
i2c@80003000 {
#address-cells = <1>;
#size-cells = <0>;
device_type = "i2c";
cell-index = <0>;
compatible = "fsl-i2c";
reg = <80003000 1000>;
interrupts = <5 2>;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/powerpc/boot/dts/kuroboxHG.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ XXXX add flash parts, rtc, ??
i2c@80003000 {
#address-cells = <1>;
#size-cells = <0>;
device_type = "i2c";
cell-index = <0>;
compatible = "fsl-i2c";
reg = <80003000 1000>;
interrupts = <5 2>;
Expand Down
6 changes: 4 additions & 2 deletions trunk/arch/powerpc/boot/dts/lite5200.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,8 @@
};

i2c@3d00 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
compatible = "mpc5200-i2c","fsl-i2c";
cell-index = <0>;
reg = <3d00 40>;
Expand All @@ -294,7 +295,8 @@
};

i2c@3d40 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
compatible = "mpc5200-i2c","fsl-i2c";
cell-index = <1>;
reg = <3d40 40>;
Expand Down
6 changes: 4 additions & 2 deletions trunk/arch/powerpc/boot/dts/lite5200b.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,8 @@
};

i2c@3d00 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c";
cell-index = <0>;
reg = <3d00 40>;
Expand All @@ -310,7 +311,8 @@
};

i2c@3d40 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c";
cell-index = <1>;
reg = <3d40 40>;
Expand Down
8 changes: 6 additions & 2 deletions trunk/arch/powerpc/boot/dts/mpc8313erdb.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@
};

i2c@3000 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <e 8>;
Expand All @@ -61,7 +63,9 @@
};

i2c@3100 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <1>;
compatible = "fsl-i2c";
reg = <3100 100>;
interrupts = <f 8>;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/powerpc/boot/dts/mpc832x_mds.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
i2c@3000 {
#address-cells = <1>;
#size-cells = <0>;
device_type = "i2c";
cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <e 8>;
Expand Down
4 changes: 3 additions & 1 deletion trunk/arch/powerpc/boot/dts/mpc832x_rdb.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@
};

i2c@3000 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <e 8>;
Expand Down
8 changes: 6 additions & 2 deletions trunk/arch/powerpc/boot/dts/mpc8349emitx.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@
};

i2c@3000 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <e 8>;
Expand All @@ -60,7 +62,9 @@
};

i2c@3100 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <1>;
compatible = "fsl-i2c";
reg = <3100 100>;
interrupts = <f 8>;
Expand Down
8 changes: 6 additions & 2 deletions trunk/arch/powerpc/boot/dts/mpc8349emitxgp.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@
};

i2c@3000 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <e 8>;
Expand All @@ -60,7 +62,9 @@
};

i2c@3100 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <1>;
compatible = "fsl-i2c";
reg = <3100 100>;
interrupts = <f 8>;
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/boot/dts/mpc834x_mds.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
i2c@3000 {
#address-cells = <1>;
#size-cells = <0>;
device_type = "i2c";
cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <e 8>;
Expand All @@ -75,7 +75,7 @@
i2c@3100 {
#address-cells = <1>;
#size-cells = <0>;
device_type = "i2c";
cell-index = <1>;
compatible = "fsl-i2c";
reg = <3100 100>;
interrupts = <f 8>;
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/boot/dts/mpc836x_mds.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
i2c@3000 {
#address-cells = <1>;
#size-cells = <0>;
device_type = "i2c";
cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <e 8>;
Expand All @@ -80,7 +80,7 @@
i2c@3100 {
#address-cells = <1>;
#size-cells = <0>;
device_type = "i2c";
cell-index = <1>;
compatible = "fsl-i2c";
reg = <3100 100>;
interrupts = <f 8>;
Expand Down
4 changes: 3 additions & 1 deletion trunk/arch/powerpc/boot/dts/mpc8540ads.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@
};

i2c@3000 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <2b 2>;
Expand Down
4 changes: 3 additions & 1 deletion trunk/arch/powerpc/boot/dts/mpc8541cds.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@
};

i2c@3000 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <2b 2>;
Expand Down
15 changes: 14 additions & 1 deletion trunk/arch/powerpc/boot/dts/mpc8544ds.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,27 @@
};

i2c@3000 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <2b 2>;
interrupt-parent = <&mpic>;
dfsrr;
};

i2c@3100 {
#address-cells = <1>;
#size-cells = <0>;
cell-index = <1>;
compatible = "fsl-i2c";
reg = <3100 100>;
interrupts = <2b 2>;
interrupt-parent = <&mpic>;
dfsrr;
};

mdio@24520 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down
15 changes: 14 additions & 1 deletion trunk/arch/powerpc/boot/dts/mpc8548cds.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,27 @@
};

i2c@3000 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <2b 2>;
interrupt-parent = <&mpic>;
dfsrr;
};

i2c@3100 {
#address-cells = <1>;
#size-cells = <0>;
cell-index = <1>;
compatible = "fsl-i2c";
reg = <3100 100>;
interrupts = <2b 2>;
interrupt-parent = <&mpic>;
dfsrr;
};

mdio@24520 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down
4 changes: 3 additions & 1 deletion trunk/arch/powerpc/boot/dts/mpc8555cds.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@
};

i2c@3000 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <2b 2>;
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/boot/dts/mpc8568mds.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
i2c@3000 {
#address-cells = <1>;
#size-cells = <0>;
device_type = "i2c";
cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <2b 2>;
Expand All @@ -90,7 +90,7 @@
i2c@3100 {
#address-cells = <1>;
#size-cells = <0>;
device_type = "i2c";
cell-index = <1>;
compatible = "fsl-i2c";
reg = <3100 100>;
interrupts = <2b 2>;
Expand Down
8 changes: 6 additions & 2 deletions trunk/arch/powerpc/boot/dts/mpc8572ds.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@
};

i2c@3000 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <2b 2>;
Expand All @@ -78,7 +80,9 @@
};

i2c@3100 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <1>;
compatible = "fsl-i2c";
reg = <3100 100>;
interrupts = <2b 2>;
Expand Down
8 changes: 4 additions & 4 deletions trunk/arch/powerpc/boot/dts/mpc8610_hpcd.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,21 @@
bus-frequency = <0>;

i2c@3000 {
device_type = "i2c";
compatible = "fsl-i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <2b 2>;
interrupt-parent = <&mpic>;
dfsrr;
};

i2c@3100 {
device_type = "i2c";
compatible = "fsl-i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <1>;
compatible = "fsl-i2c";
reg = <3100 100>;
interrupts = <2b 2>;
interrupt-parent = <&mpic>;
Expand Down
8 changes: 6 additions & 2 deletions trunk/arch/powerpc/boot/dts/mpc8641_hpcn.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@
bus-frequency = <0>;

i2c@3000 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <2b 2>;
Expand All @@ -78,7 +80,9 @@
};

i2c@3100 {
device_type = "i2c";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <1>;
compatible = "fsl-i2c";
reg = <3100 100>;
interrupts = <2b 2>;
Expand Down
8 changes: 3 additions & 5 deletions trunk/arch/powerpc/sysdev/fsl_soc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,13 +390,11 @@ static void __init of_register_i2c_devices(struct device_node *adap_node,
static int __init fsl_i2c_of_init(void)
{
struct device_node *np;
unsigned int i;
unsigned int i = 0;
struct platform_device *i2c_dev;
int ret;

for (np = NULL, i = 0;
(np = of_find_compatible_node(np, "i2c", "fsl-i2c")) != NULL;
i++) {
for_each_compatible_node(np, NULL, "fsl-i2c") {
struct resource r[2];
struct fsl_i2c_platform_data i2c_data;
const unsigned char *flags = NULL;
Expand Down Expand Up @@ -432,7 +430,7 @@ static int __init fsl_i2c_of_init(void)
if (ret)
goto unreg;

of_register_i2c_devices(np, i);
of_register_i2c_devices(np, i++);
}

return 0;
Expand Down

0 comments on commit d00fd25

Please sign in to comment.