Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / arch / arm / mach-msm / devices-msm7x00.c

diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c
index b00a94b..fb548a8 100644 (file)
--- a/arch/arm/mach-msm/devices-msm7x00.c
+++ b/arch/arm/mach-msm/devices-msm7x00.c
@@ -347,6 +347,73 @@ int __init msm_add_sdcc(unsigned int controller,
        return platform_device_register(pdev);
 }
 
+static struct resource resources_mddi0[] = {
+       {
+               .start  = MSM_PMDH_PHYS,
+               .end    = MSM_PMDH_PHYS + MSM_PMDH_SIZE - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       {
+               .start  = INT_MDDI_PRI,
+               .end    = INT_MDDI_PRI,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct resource resources_mddi1[] = {
+       {
+               .start  = MSM_EMDH_PHYS,
+               .end    = MSM_EMDH_PHYS + MSM_EMDH_SIZE - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       {
+               .start  = INT_MDDI_EXT,
+               .end    = INT_MDDI_EXT,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+struct platform_device msm_device_mddi0 = {
+       .name = "msm_mddi",
+       .id = 0,
+       .num_resources = ARRAY_SIZE(resources_mddi0),
+       .resource = resources_mddi0,
+       .dev = {
+               .coherent_dma_mask      = 0xffffffff,
+       },
+};
+
+struct platform_device msm_device_mddi1 = {
+       .name = "msm_mddi",
+       .id = 1,
+       .num_resources = ARRAY_SIZE(resources_mddi1),
+       .resource = resources_mddi1,
+       .dev = {
+               .coherent_dma_mask      = 0xffffffff,
+       },
+};
+
+static struct resource resources_mdp[] = {
+       {
+               .start  = MSM_MDP_PHYS,
+               .end    = MSM_MDP_PHYS + MSM_MDP_SIZE - 1,
+               .name   = "mdp",
+               .flags  = IORESOURCE_MEM
+       },
+       {
+               .start  = INT_MDP,
+               .end    = INT_MDP,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+struct platform_device msm_device_mdp = {
+       .name = "msm_mdp",
+       .id = 0,
+       .num_resources = ARRAY_SIZE(resources_mdp),
+       .resource = resources_mdp,
+};
+
 struct clk msm_clocks_7x01a[] = {
        CLK_PCOM("adm_clk",     ADM_CLK,        NULL, 0),
        CLK_PCOM("adsp_clk",    ADSP_CLK,       NULL, 0),