msm: trout: change name of pmdh_clk to mddi_clk

[~andy/linux] / 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 fde9d8f69f10b2c58bfdac3d26c05a9929610b61..b00a94b84f371919d3a71a2d789571e88b49f3d2 100644 (file)
--- a/arch/arm/mach-msm/devices-msm7x00.c
+++ b/arch/arm/mach-msm/devices-msm7x00.c
@@ -322,7 +322,8 @@ static struct platform_device *msm_sdcc_devices[] __initdata = {
        &msm_device_sdc4,
 };
 
-int __init msm_add_sdcc(unsigned int controller, struct mmc_platform_data *plat,
+int __init msm_add_sdcc(unsigned int controller,
+                       struct msm_mmc_platform_data *plat,
                        unsigned int stat_irq, unsigned long stat_irq_flags)
 {
        struct platform_device  *pdev;
@@ -363,7 +364,7 @@ struct clk msm_clocks_7x01a[] = {
        CLK_PCOM("mdp_clk",     MDP_CLK,        NULL, OFF),
        CLK_PCOM("pbus_clk",    PBUS_CLK,       NULL, 0),
        CLK_PCOM("pcm_clk",     PCM_CLK,        NULL, 0),
-       CLK_PCOM("pmdh_clk",    PMDH_CLK,       NULL, OFF ),
+       CLK_PCOM("mddi_clk",    PMDH_CLK,       NULL, OFF | CLK_MINMAX),
        CLK_PCOM("sdac_clk",    SDAC_CLK,       NULL, OFF),
        CLK_PCOM("sdc_clk",     SDC1_CLK,       &msm_device_sdc1.dev, OFF),
        CLK_PCOM("sdc_pclk",    SDC1_P_CLK,     &msm_device_sdc1.dev, OFF),