mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Pull clk fixes from Stephen Boyd:
 "Two small fixes for MIPI PLLs on sunxi devices and a build fix for a
  Broadcom clk driver having unmet dependencies"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  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
This commit is contained in:
Linus Torvalds
2016-11-30 15:15:49 -08:00
parent e2b588ab60 b7d79eb461
commit f513581c35
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/clk/bcm/Kconfig
View File

@@ -20,7 +20,7 @@ config CLK_BCM_KONA
config COMMON_CLK_IPROC config COMMON_CLK_IPROC
bool "Broadcom iProc clock support" 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 depends on COMMON_CLK
default ARCH_BCM_IPROC default ARCH_BCM_IPROC
help help

2
drivers/clk/sunxi-ng/ccu-sun6i-a31.c
View File

@@ -143,7 +143,7 @@ static SUNXI_CCU_NKM_WITH_MUX_GATE_LOCK(pll_mipi_clk, "pll-mipi",
4, 2, /* K */ 4, 2, /* K */
0, 4, /* M */ 0, 4, /* M */
21, 0, /* mux */ 21, 0, /* mux */
BIT(31), /* gate */ BIT(31) | BIT(23) | BIT(22), /* gate */
BIT(28), /* lock */ BIT(28), /* lock */
CLK_SET_RATE_UNGATE); CLK_SET_RATE_UNGATE);

2
drivers/clk/sunxi-ng/ccu-sun8i-a33.c
View File

@@ -131,7 +131,7 @@ static SUNXI_CCU_NKM_WITH_GATE_LOCK(pll_mipi_clk, "pll-mipi",
8, 4, /* N */ 8, 4, /* N */
4, 2, /* K */ 4, 2, /* K */
0, 4, /* M */ 0, 4, /* M */
BIT(31), /* gate */ BIT(31) | BIT(23) | BIT(22), /* gate */
BIT(28), /* lock */ BIT(28), /* lock */
CLK_SET_RATE_UNGATE); CLK_SET_RATE_UNGATE);