git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-grant' of git://arago-project.org/git/projects/linux-davinci into...
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
dm355.c
diff --git
a/arch/arm/mach-davinci/dm355.c
b/arch/arm/mach-davinci/dm355.c
index
9be261b
..
a5f8a80
100644
(file)
--- a/
arch/arm/mach-davinci/dm355.c
+++ b/
arch/arm/mach-davinci/dm355.c
@@
-359,8
+359,8
@@
static struct clk_lookup dm355_clks[] = {
CLK(NULL, "uart1", &uart1_clk),
CLK(NULL, "uart2", &uart2_clk),
CLK("i2c_davinci.1", NULL, &i2c_clk),
CLK(NULL, "uart1", &uart1_clk),
CLK(NULL, "uart2", &uart2_clk),
CLK("i2c_davinci.1", NULL, &i2c_clk),
- CLK("davinci-
a
sp.0", NULL, &asp0_clk),
- CLK("davinci-
a
sp.1", NULL, &asp1_clk),
+ CLK("davinci-
mcb
sp.0", NULL, &asp0_clk),
+ CLK("davinci-
mcb
sp.1", NULL, &asp1_clk),
CLK("davinci_mmc.0", NULL, &mmcsd0_clk),
CLK("davinci_mmc.1", NULL, &mmcsd1_clk),
CLK("spi_davinci.0", NULL, &spi0_clk),
CLK("davinci_mmc.0", NULL, &mmcsd0_clk),
CLK("davinci_mmc.1", NULL, &mmcsd1_clk),
CLK("spi_davinci.0", NULL, &spi0_clk),
@@
-412,12
+412,7
@@
static struct resource dm355_spi0_resources[] = {
static struct davinci_spi_platform_data dm355_spi0_pdata = {
.version = SPI_VERSION_1,
.num_chipselect = 2,
static struct davinci_spi_platform_data dm355_spi0_pdata = {
.version = SPI_VERSION_1,
.num_chipselect = 2,
- .clk_internal = 1,
- .cs_hold = 1,
- .intr_level = 0,
- .poll_mode = 1, /* 0 -> interrupt mode 1-> polling mode */
- .c2tdelay = 0,
- .t2cdelay = 0,
+ .cshold_bug = true,
};
static struct platform_device dm355_spi0_device = {
.name = "spi_davinci",
};
static struct platform_device dm355_spi0_device = {
.name = "spi_davinci",
@@
-664,7
+659,7
@@
static struct resource dm355_asp1_resources[] = {
};
static struct platform_device dm355_asp1_device = {
};
static struct platform_device dm355_asp1_device = {
- .name = "davinci-
a
sp",
+ .name = "davinci-
mcb
sp",
.id = 1,
.num_resources = ARRAY_SIZE(dm355_asp1_resources),
.resource = dm355_asp1_resources,
.id = 1,
.num_resources = ARRAY_SIZE(dm355_asp1_resources),
.resource = dm355_asp1_resources,