tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

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

Linus Torvalds f513581c e2b588ab

+3 -3
+1 -1
drivers/clk/bcm/Kconfig
··· 20 20 21 21 config COMMON_CLK_IPROC 22 22 bool "Broadcom iProc clock support" 23 - depends on ARCH_BCM_IPROC || COMPILE_TEST 23 + depends on ARCH_BCM_IPROC || ARCH_BCM_63XX || COMPILE_TEST 24 24 depends on COMMON_CLK 25 25 default ARCH_BCM_IPROC 26 26 help
+1 -1
drivers/clk/sunxi-ng/ccu-sun6i-a31.c
··· 143 143 4, 2, /* K */ 144 144 0, 4, /* M */ 145 145 21, 0, /* mux */ 146 - BIT(31), /* gate */ 146 + BIT(31) | BIT(23) | BIT(22), /* gate */ 147 147 BIT(28), /* lock */ 148 148 CLK_SET_RATE_UNGATE); 149 149
+1 -1
drivers/clk/sunxi-ng/ccu-sun8i-a33.c
··· 131 131 8, 4, /* N */ 132 132 4, 2, /* K */ 133 133 0, 4, /* M */ 134 - BIT(31), /* gate */ 134 + BIT(31) | BIT(23) | BIT(22), /* gate */ 135 135 BIT(28), /* lock */ 136 136 CLK_SET_RATE_UNGATE); 137 137