Commit 5e2035b9 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-fixes' into clk-next 

* clk-fixes:
  clk: bcm: Fix unmet Kconfig dependencies for CLK_BCM_63XX
  clk: sunxi-ng: enable so-said LDOs for A33 SoC's pll-mipi clock
  clk: sunxi-ng: sun6i-a31: Enable PLL-MIPI LDOs when ungating it
parents f2a46926 b7d79eb4

drivers/clk/bcm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ config CLK_BCM_KONA 


config COMMON_CLK_IPROC

	bool "Broadcom iProc clock support"

	depends on ARCH_BCM_IPROC || COMPILE_TEST

	depends on ARCH_BCM_IPROC || ARCH_BCM_63XX || COMPILE_TEST

	depends on COMMON_CLK

	default ARCH_BCM_IPROC

	help

drivers/clk/sunxi-ng/ccu-sun6i-a31.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static SUNXI_CCU_NKM_WITH_MUX_GATE_LOCK(pll_mipi_clk, "pll-mipi", 
					4, 2,	/* K */

					0, 4,	/* M */

					21, 0,	/* mux */

					BIT(31),	/* gate */

					BIT(31) | BIT(23) | BIT(22), /* gate */

					BIT(28),	/* lock */

					CLK_SET_RATE_UNGATE);

drivers/clk/sunxi-ng/ccu-sun8i-a33.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static SUNXI_CCU_NKM_WITH_GATE_LOCK(pll_mipi_clk, "pll-mipi", 
				    8, 4,		/* N */

				    4, 2,		/* K */

				    0, 4,		/* M */

				    BIT(31),		/* gate */

				    BIT(31) | BIT(23) | BIT(22), /* gate */

				    BIT(28),		/* lock */

				    CLK_SET_RATE_UNGATE);