diff mbox

clk: sunxi-ng: always select CCU_GATE

Message ID 20170427110239.2389266-1-arnd@arndb.de (mailing list archive)
State Accepted
Delegated to: Stephen Boyd
Headers show

Commit Message

Arnd Bergmann April 27, 2017, 11:02 a.m. UTC
When the base driver is enabled but all SoC specific drivers are turned
off, we now get a build error after code was added to always refer to the
clk gates:

drivers/clk/built-in.o: In function `ccu_pll_notifier_cb':
:(.text+0x154f8): undefined reference to `ccu_gate_helper_disable'
:(.text+0x15504): undefined reference to `ccu_gate_helper_enable'

This changes the Kconfig to always require the gate code to be built-in
when CONFIG_SUNXI_CCU is set.

Fixes: 02ae2bc6febd ("clk: sunxi-ng: Add clk notifier to gate then ungate PLL clocks")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/clk/sunxi-ng/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Maxime Ripard April 28, 2017, 7:35 a.m. UTC | #1
1;4601;0c
On Thu, Apr 27, 2017 at 01:02:31PM +0200, Arnd Bergmann wrote:
> When the base driver is enabled but all SoC specific drivers are turned
> off, we now get a build error after code was added to always refer to the
> clk gates:
> 
> drivers/clk/built-in.o: In function `ccu_pll_notifier_cb':
> :(.text+0x154f8): undefined reference to `ccu_gate_helper_disable'
> :(.text+0x15504): undefined reference to `ccu_gate_helper_enable'
> 
> This changes the Kconfig to always require the gate code to be built-in
> when CONFIG_SUNXI_CCU is set.
> 
> Fixes: 02ae2bc6febd ("clk: sunxi-ng: Add clk notifier to gate then ungate PLL clocks")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Stephen, Mike, can you apply this patch directly? This affects the
current (4.11) release, so we probably don't want to have the overhead
of a PR here :/

Thanks!
Maxime
Stephen Boyd April 28, 2017, 5:48 p.m. UTC | #2
On 04/28, Maxime Ripard wrote:
> 1;4601;0c
> On Thu, Apr 27, 2017 at 01:02:31PM +0200, Arnd Bergmann wrote:
> > When the base driver is enabled but all SoC specific drivers are turned
> > off, we now get a build error after code was added to always refer to the
> > clk gates:
> > 
> > drivers/clk/built-in.o: In function `ccu_pll_notifier_cb':
> > :(.text+0x154f8): undefined reference to `ccu_gate_helper_disable'
> > :(.text+0x15504): undefined reference to `ccu_gate_helper_enable'
> > 
> > This changes the Kconfig to always require the gate code to be built-in
> > when CONFIG_SUNXI_CCU is set.
> > 
> > Fixes: 02ae2bc6febd ("clk: sunxi-ng: Add clk notifier to gate then ungate PLL clocks")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> 
> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> 
> Stephen, Mike, can you apply this patch directly? This affects the
> current (4.11) release, so we probably don't want to have the overhead
> of a PR here :/
> 

Yep. Applied to fixes to be sent off today.
diff mbox

Patch

diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig
index 64088e599404..b0d551a8efe4 100644
--- a/drivers/clk/sunxi-ng/Kconfig
+++ b/drivers/clk/sunxi-ng/Kconfig
@@ -16,7 +16,7 @@  config SUNXI_CCU_FRAC
 	bool
 
 config SUNXI_CCU_GATE
-	bool
+	def_bool y
 
 config SUNXI_CCU_MUX
 	bool