Commit 9ff50bf2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull clk driver fixes from Stephen Boyd:

 - Make the regulator state match the GDSC power domain state at boot on
   Qualcomm SoCs so that the regulator isn't turned off inadvertently.

 - Fix earlycon on i.MX6Q SoCs

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: qcom: gdsc: Ensure regulator init state matches GDSC state
  clk: imx6q: fix uart earlycon unwork
parents 9085423f 9711759a

drivers/clk/imx/clk-imx6q.c

+1 −1
Original line number Diff line number Diff line
@@ -974,6 +974,6 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) 
			       hws[IMX6QDL_CLK_PLL3_USB_OTG]->clk);

	}



	imx_register_uart_clocks(1);

	imx_register_uart_clocks(2);

}

CLK_OF_DECLARE(imx6q, "fsl,imx6q-ccm", imx6q_clocks_init);

drivers/clk/qcom/gdsc.c

+36 −18
Original line number Diff line number Diff line
@@ -357,27 +357,43 @@ static int gdsc_init(struct gdsc *sc) 
	if (on < 0)

		return on;



	if (on) {

		/* The regulator must be on, sync the kernel state */

		if (sc->rsupply) {

			ret = regulator_enable(sc->rsupply);

			if (ret < 0)

				return ret;

		}



		/*

		 * Votable GDSCs can be ON due to Vote from other masters.

		 * If a Votable GDSC is ON, make sure we have a Vote.

		 */

	if ((sc->flags & VOTABLE) && on)

		gdsc_enable(&sc->pd);

		if (sc->flags & VOTABLE) {

			ret = regmap_update_bits(sc->regmap, sc->gdscr,

						 SW_COLLAPSE_MASK, val);

			if (ret)

				return ret;

		}



		/* Turn on HW trigger mode if supported */

		if (sc->flags & HW_CTRL) {

			ret = gdsc_hwctrl(sc, true);

			if (ret < 0)

				return ret;

		}



		/*

	 * Make sure the retain bit is set if the GDSC is already on, otherwise

	 * we end up turning off the GDSC and destroying all the register

	 * contents that we thought we were saving.

		 * Make sure the retain bit is set if the GDSC is already on,

		 * otherwise we end up turning off the GDSC and destroying all

		 * the register contents that we thought we were saving.

		 */

	if ((sc->flags & RETAIN_FF_ENABLE) && on)

		if (sc->flags & RETAIN_FF_ENABLE)

			gdsc_retain_ff_on(sc);



	} else if (sc->flags & ALWAYS_ON) {

		/* If ALWAYS_ON GDSCs are not ON, turn them ON */

	if (sc->flags & ALWAYS_ON) {

		if (!on)

		gdsc_enable(&sc->pd);

		on = true;

		sc->pd.flags |= GENPD_FLAG_ALWAYS_ON;

	}



	if (on || (sc->pwrsts & PWRSTS_RET))
@@ -385,6 +401,8 @@ static int gdsc_init(struct gdsc *sc) 
	else

		gdsc_clear_mem_on(sc);



	if (sc->flags & ALWAYS_ON)

		sc->pd.flags |= GENPD_FLAG_ALWAYS_ON;

	if (!sc->pd.power_off)

		sc->pd.power_off = gdsc_disable;

	if (!sc->pd.power_on)