Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / arm / mach-davinci / da850.c

diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 9cb769c..68fe4c2 100644 (file)
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -359,6 +359,20 @@ static struct clk usb20_clk = {
        .gpsc           = 1,
 };
 
+static struct clk spi0_clk = {
+       .name           = "spi0",
+       .parent         = &pll0_sysclk2,
+       .lpsc           = DA8XX_LPSC0_SPI0,
+};
+
+static struct clk spi1_clk = {
+       .name           = "spi1",
+       .parent         = &pll0_sysclk2,
+       .lpsc           = DA8XX_LPSC1_SPI1,
+       .gpsc           = 1,
+       .flags          = DA850_CLK_ASYNC3,
+};
+
 static struct clk_lookup da850_clks[] = {
        CLK(NULL,               "ref",          &ref_clk),
        CLK(NULL,               "pll0",         &pll0_clk),
@@ -403,6 +417,8 @@ static struct clk_lookup da850_clks[] = {
        CLK(NULL,               "aemif",        &aemif_clk),
        CLK(NULL,               "usb11",        &usb11_clk),
        CLK(NULL,               "usb20",        &usb20_clk),
+       CLK("spi_davinci.0",    NULL,           &spi0_clk),
+       CLK("spi_davinci.1",    NULL,           &spi1_clk),
        CLK(NULL,               NULL,           NULL),
 };
 
@@ -572,21 +588,6 @@ static const struct mux_config da850_pins[] = {
 #endif
 };
 
-const short da850_uart0_pins[] __initdata = {
-       DA850_NUART0_CTS, DA850_NUART0_RTS, DA850_UART0_RXD, DA850_UART0_TXD,
-       -1
-};
-
-const short da850_uart1_pins[] __initdata = {
-       DA850_UART1_RXD, DA850_UART1_TXD,
-       -1
-};
-
-const short da850_uart2_pins[] __initdata = {
-       DA850_UART2_RXD, DA850_UART2_TXD,
-       -1
-};
-
 const short da850_i2c0_pins[] __initdata = {
        DA850_I2C0_SDA, DA850_I2C0_SCL,
        -1
@@ -606,13 +607,6 @@ const short da850_lcdcntl_pins[] __initdata = {
        -1
 };
 
-const short da850_mmcsd0_pins[] __initdata = {
-       DA850_MMCSD0_DAT_0, DA850_MMCSD0_DAT_1, DA850_MMCSD0_DAT_2,
-       DA850_MMCSD0_DAT_3, DA850_MMCSD0_CLK, DA850_MMCSD0_CMD,
-       DA850_GPIO4_0, DA850_GPIO4_1,
-       -1
-};
-
 /* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */
 static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = {
        [IRQ_DA8XX_COMMTX]              = 7,