Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux

[~andy/linux] / arch / arm / mach-davinci / devices-da8xx.c

diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index fcb30d3ae24eff4c5516ffffdd5292e6bc704892..fcdbe437409e3a5141b5b7231a143fecf7c933a4 100644 (file)
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -22,6 +22,7 @@
 #include <mach/time.h>
 #include <mach/da8xx.h>
 #include <mach/cpuidle.h>
+#include <mach/sram.h>
 
 #include "clock.h"
 #include "asp.h"
@@ -32,6 +33,7 @@
 #define DA8XX_WDOG_BASE                        0x01c21000 /* DA8XX_TIMER64P1_BASE */
 #define DA8XX_I2C0_BASE                        0x01c22000
 #define DA8XX_RTC_BASE                 0x01c23000
+#define DA8XX_PRUSS_MEM_BASE           0x01c30000
 #define DA8XX_MMCSD0_BASE              0x01c40000
 #define DA8XX_SPI0_BASE                        0x01c41000
 #define DA830_SPI1_BASE                        0x01e12000
@@ -518,6 +520,75 @@ void __init da8xx_register_mcasp(int id, struct snd_platform_data *pdata)
        }
 }
 
+static struct resource da8xx_pruss_resources[] = {
+       {
+               .start  = DA8XX_PRUSS_MEM_BASE,
+               .end    = DA8XX_PRUSS_MEM_BASE + 0xFFFF,
+               .flags  = IORESOURCE_MEM,
+       },
+       {
+               .start  = IRQ_DA8XX_EVTOUT0,
+               .end    = IRQ_DA8XX_EVTOUT0,
+               .flags  = IORESOURCE_IRQ,
+       },
+       {
+               .start  = IRQ_DA8XX_EVTOUT1,
+               .end    = IRQ_DA8XX_EVTOUT1,
+               .flags  = IORESOURCE_IRQ,
+       },
+       {
+               .start  = IRQ_DA8XX_EVTOUT2,
+               .end    = IRQ_DA8XX_EVTOUT2,
+               .flags  = IORESOURCE_IRQ,
+       },
+       {
+               .start  = IRQ_DA8XX_EVTOUT3,
+               .end    = IRQ_DA8XX_EVTOUT3,
+               .flags  = IORESOURCE_IRQ,
+       },
+       {
+               .start  = IRQ_DA8XX_EVTOUT4,
+               .end    = IRQ_DA8XX_EVTOUT4,
+               .flags  = IORESOURCE_IRQ,
+       },
+       {
+               .start  = IRQ_DA8XX_EVTOUT5,
+               .end    = IRQ_DA8XX_EVTOUT5,
+               .flags  = IORESOURCE_IRQ,
+       },
+       {
+               .start  = IRQ_DA8XX_EVTOUT6,
+               .end    = IRQ_DA8XX_EVTOUT6,
+               .flags  = IORESOURCE_IRQ,
+       },
+       {
+               .start  = IRQ_DA8XX_EVTOUT7,
+               .end    = IRQ_DA8XX_EVTOUT7,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct uio_pruss_pdata da8xx_uio_pruss_pdata = {
+       .pintc_base     = 0x4000,
+};
+
+static struct platform_device da8xx_uio_pruss_dev = {
+       .name           = "pruss_uio",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(da8xx_pruss_resources),
+       .resource       = da8xx_pruss_resources,
+       .dev            = {
+               .coherent_dma_mask      = DMA_BIT_MASK(32),
+               .platform_data          = &da8xx_uio_pruss_pdata,
+       }
+};
+
+int __init da8xx_register_uio_pruss(void)
+{
+       da8xx_uio_pruss_pdata.sram_pool = sram_get_gen_pool();
+       return platform_device_register(&da8xx_uio_pruss_dev);
+}
+
 static struct lcd_ctrl_config lcd_cfg = {
        .panel_shade            = COLOR_ACTIVE,
        .bpp                    = 16,
@@ -880,7 +951,7 @@ static int da850_sata_init(struct device *dev, void __iomem *addr)
        if (IS_ERR(da850_sata_clk))
                return PTR_ERR(da850_sata_clk);
 
-       ret = clk_enable(da850_sata_clk);
+       ret = clk_prepare_enable(da850_sata_clk);
        if (ret)
                goto err0;
 
@@ -911,7 +982,7 @@ static int da850_sata_init(struct device *dev, void __iomem *addr)
        return 0;
 
 err1:
-       clk_disable(da850_sata_clk);
+       clk_disable_unprepare(da850_sata_clk);
 err0:
        clk_put(da850_sata_clk);
        return ret;
@@ -919,7 +990,7 @@ err0:
 
 static void da850_sata_exit(struct device *dev)
 {
-       clk_disable(da850_sata_clk);
+       clk_disable_unprepare(da850_sata_clk);
        clk_put(da850_sata_clk);
 }