]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
clk: ti: fix linker error with !SOC_OMAP4
authorArnd Bergmann <arnd@arndb.de>
Wed, 19 Apr 2017 21:43:10 +0000 (23:43 +0200)
committerStephen Boyd <sboyd@codeaurora.org>
Sat, 22 Apr 2017 02:01:18 +0000 (19:01 -0700)
commit2158a09395b3751db99663b2efdcce0ae09ca133
treeb9138f96e13593c5484a6278b19278a5c97db7c4
parent34675d67032ae568331a2a230973c7b58ddcaf9d
clk: ti: fix linker error with !SOC_OMAP4

When none of the OMAP4-generation SoCs are enabled, we run into a link
error for am43xx/am43xx:

drivers/clk/ti/dpll.o: In function `of_ti_am3_dpll_x2_setup':
dpll.c:(.init.text+0xd8): undefined reference to `clkhwops_omap4_dpllmx'

This is easily fixed by adding another #ifdef.

While looking at the code, I also spotted another problem with the
assignment of hw_ops variable that is not used again later. I'm
changing this to setting clk_hw->ops instead, which I guess is what
was intended here.

Fixes: 473adbf4e028 ("clk: ti: dpll44xx: fix clksel register initialization")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Tero Kristo <t-kristo@ti.com>
[sboyd@codeaurora.org: Replaced fixes tag with correct one]
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
drivers/clk/ti/dpll.c