Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 149339
b: refs/heads/master
c: f8f9d5e
h: refs/heads/master
i:
  149337: 1cfbeca
  149335: 4be9586
v: v3
  • Loading branch information
Philipp Zabel authored and Eric Miao committed Jun 5, 2009
1 parent 390ab3c commit c06e47d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3dbeef231e2247f91784f33555ed6f7da7a6f726
refs/heads/master: f8f9d5ecfff9b2d04db4decd7d2c86aba86e49e5
10 changes: 9 additions & 1 deletion trunk/arch/arm/mach-pxa/magician.c
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,14 @@ static struct platform_device strataflash = {
},
};

/*
* I2C
*/

static struct i2c_pxa_platform_data i2c_info = {
.fast_mode = 1,
};

/*
* Platform devices
*/
Expand Down Expand Up @@ -779,7 +787,7 @@ static void __init magician_init(void)
pxa_set_ficp_info(&magician_ficp_info);
}
pxa27x_set_i2c_power_info(NULL);
pxa_set_i2c_info(NULL);
pxa_set_i2c_info(&i2c_info);
pxa_set_mci_info(&magician_mci_info);
pxa_set_ohci_info(&magician_ohci_info);

Expand Down

0 comments on commit c06e47d

Please sign in to comment.