Commit ac819a86 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'features/imx-clk-prepare' of... 

Merge branch 'features/imx-clk-prepare' of git://git.pengutronix.de/git/imx/linux-2.6 into next/drivers

* 'features/imx-clk-prepare' of git://git.pengutronix.de/git/imx/linux-2.6:
  mmc: sdhci-esdhc-imx: add clk_prepare/clk_unprepare
  i2c: imx: add clk_prepare/clk_unprepare
  serial: imx: add clk_prepare/clk_unprepare
  ARM: mx31moboard: add clk_prepare/clk_unprepare
  ARM: pm-imx5: add clk_prepare/clk_unprepare
  ARM: mxc: audmux-v2: add clk_prepare/clk_unprepare
  ARM: mxc: arch_reset: add clk_prepare/clk_unprepare
  ARM: mxc: epit: add clk_prepare/clk_unprepare
  ARM: mxc: pwm: add clk_prepare/clk_unprepare
  ARM: mxc: ahci: add clk_prepare/clk_unprepare
  ARM: mxc: time: add clk_prepare/clk_unprepare
parents 0180a7d0 5ef97faa

arch/arm/mach-imx/mach-mx31moboard.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static void mx31moboard_poweroff(void) 
	struct clk *clk = clk_get_sys("imx2-wdt.0", NULL);



	if (!IS_ERR(clk))

		clk_enable(clk);

		clk_prepare_enable(clk);



	mxc_iomux_mode(MX31_PIN_WATCHDOG_RST__WATCHDOG_RST);

arch/arm/mach-imx/pm-imx5.c

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode) 


static int mx5_suspend_prepare(void)

{

	return clk_enable(gpc_dvfs_clk);

	return clk_prepare_enable(gpc_dvfs_clk);

}



static int mx5_suspend_enter(suspend_state_t state)
@@ -119,7 +119,7 @@ static int mx5_suspend_enter(suspend_state_t state) 


static void mx5_suspend_finish(void)

{

	clk_disable(gpc_dvfs_clk);

	clk_disable_unprepare(gpc_dvfs_clk);

}



static int mx5_pm_valid(suspend_state_t state)

arch/arm/plat-mxc/audmux-v2.c

+4 −4
Original line number Diff line number Diff line
@@ -73,13 +73,13 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf, 
		return -ENOMEM;



	if (audmux_clk)

		clk_enable(audmux_clk);

		clk_prepare_enable(audmux_clk);



	ptcr = readl(audmux_base + MXC_AUDMUX_V2_PTCR(port));

	pdcr = readl(audmux_base + MXC_AUDMUX_V2_PDCR(port));



	if (audmux_clk)

		clk_disable(audmux_clk);

		clk_disable_unprepare(audmux_clk);



	ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n",

		       pdcr, ptcr);
@@ -172,13 +172,13 @@ int mxc_audmux_v2_configure_port(unsigned int port, unsigned int ptcr, 
		return -ENOSYS;



	if (audmux_clk)

		clk_enable(audmux_clk);

		clk_prepare_enable(audmux_clk);



	writel(ptcr, audmux_base + MXC_AUDMUX_V2_PTCR(port));

	writel(pdcr, audmux_base + MXC_AUDMUX_V2_PDCR(port));



	if (audmux_clk)

		clk_disable(audmux_clk);

		clk_disable_unprepare(audmux_clk);



	return 0;

}

arch/arm/plat-mxc/devices/platform-ahci-imx.c

+8 −8
Original line number Diff line number Diff line
@@ -60,9 +60,9 @@ static int imx_sata_init(struct device *dev, void __iomem *addr) 
		dev_err(dev, "no sata clock.\n");

		return PTR_ERR(sata_clk);

	}

	ret = clk_enable(sata_clk);

	ret = clk_prepare_enable(sata_clk);

	if (ret) {

		dev_err(dev, "can't enable sata clock.\n");

		dev_err(dev, "can't prepare/enable sata clock.\n");

		goto put_sata_clk;

	}
@@ -73,9 +73,9 @@ static int imx_sata_init(struct device *dev, void __iomem *addr) 
		ret = PTR_ERR(sata_ref_clk);

		goto release_sata_clk;

	}

	ret = clk_enable(sata_ref_clk);

	ret = clk_prepare_enable(sata_ref_clk);

	if (ret) {

		dev_err(dev, "can't enable sata ref clock.\n");

		dev_err(dev, "can't prepare/enable sata ref clock.\n");

		goto put_sata_ref_clk;

	}
@@ -104,11 +104,11 @@ static int imx_sata_init(struct device *dev, void __iomem *addr) 
	return 0;



release_sata_ref_clk:

	clk_disable(sata_ref_clk);

	clk_disable_unprepare(sata_ref_clk);

put_sata_ref_clk:

	clk_put(sata_ref_clk);

release_sata_clk:

	clk_disable(sata_clk);

	clk_disable_unprepare(sata_clk);

put_sata_clk:

	clk_put(sata_clk);
@@ -117,10 +117,10 @@ put_sata_clk: 


static void imx_sata_exit(struct device *dev)

{

	clk_disable(sata_ref_clk);

	clk_disable_unprepare(sata_ref_clk);

	clk_put(sata_ref_clk);



	clk_disable(sata_clk);

	clk_disable_unprepare(sata_clk);

	clk_put(sata_clk);



}

arch/arm/plat-mxc/epit.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static int __init epit_clockevent_init(struct clk *timer_clk) 


void __init epit_timer_init(struct clk *timer_clk, void __iomem *base, int irq)

{

	clk_enable(timer_clk);

	clk_prepare_enable(timer_clk);



	timer_base = base;

CRA Git | Maintained and supported by SUSTech CRA and CCSE