09 Jul, 2016
1 commit
-
When failing to lookup the assigned clock for setting its parents, we
were previously printing a misleading error message that lead to think
that it was the parent clock what couldn't be found.Change error message to make clear that it's the assigned clock what
couldn't be found in this case.Signed-off-by: Tomeu Vizoso
Signed-off-by: Michael Turquette
Link: lkml.kernel.org/r/1467962078-30405-1-git-send-email-tomeu.vizoso@collabora.com
08 Jul, 2016
2 commits
-
The MMC_PCLK is needed for the SD/eMMC driver, expose to DT (and comment
out in clk driver)Signed-off-by: Kevin Hilman
Signed-off-by: Michael Turquette
Link: lkml.kernel.org/r/20160707033837.20029-1-khilman@baylibre.com
07 Jul, 2016
9 commits
-
This is likely that checking 'clks[idx]' instead of 'clks[n]' is
expected here.Signed-off-by: Christophe JAILLET
Signed-off-by: Michael Turquette
Link: lkml.kernel.org/r/1467526003-13318-1-git-send-email-christophe.jaillet@wanadoo.fr -
This patch add the support to select the peripheral clock (PERIPH)
as a parent clock source using the "assigned-clock-parents"
parameter in the device tree.Signed-off-by: Sylvain Lemieux
Acked-by: Vladimir Zapolskiy
Signed-off-by: Michael Turquette
Link: lkml.kernel.org/r/1464982475-24738-1-git-send-email-slemieux.tyco@gmail.com -
We have the following file --> Kconfig mapping:
sunxi/clk-factors.c obj-y
sunxi/clk-sun6i-apb0-gates.c CONFIG_MFD_SUN6I_PRCM (bool)
sunxi/clk-sun6i-apb0.c CONFIG_MFD_SUN6I_PRCM
sunxi/clk-sun6i-ar100.c CONFIG_MFD_SUN6I_PRCM
sunxi/clk-sun8i-apb0.c CONFIG_MFD_SUN6I_PRCM
sunxi/clk-sun9i-mmc.c obj-yHence none of these are being built as a module by anyone.
Lets remove the modular code that is essentially orphaned, so that
when reading the drivers there is no doubt they are builtin-only. All
drivers get mostly the same changes, so they are handled in batch.Changes are (1) convert to builtin_platform_register, (2) use the
init.h header, (3) delete the MODULE_LICENCE/MODULE_AUTHOR and
associated tags, and (4) delete any ".remove" functions.There was a stray module.h in a file not using any init.h or
module.h stuff, so we simply removed that one.In two cases, we explicitly disallow a driver unbind, since that
doesn't have a sensible use case anyway, and it allows us to drop
the ".remove" code for non-modular drivers.Since module_platform_driver() uses the same init level priority as
builtin_platform_driver() the init ordering remains unchanged with
this commit.We delete the MODULE_LICENSE etc. tags since all that information
is already contained at the top of each file in the comments.Acked-by: Boris Brezillon
Cc: Chen-Yu Tsai
Cc: "Emilio López"
Cc: Stephen Boyd
Acked-by: Maxime Ripard
Cc: linux-clk@vger.kernel.org
Signed-off-by: Paul Gortmaker
Signed-off-by: Michael Turquette
Link: lkml.kernel.org/r/20160704211220.5685-9-paul.gortmaker@windriver.com -
The Kconfig currently controlling compilation of this code is:
drivers/clk/Kconfig:config COMMON_CLK_OXNAS
drivers/clk/Kconfig: bool "Clock driver for the OXNAS SoC Family"...meaning that it currently is not being built as a module by anyone.
Lets remove the modular code that is essentially orphaned, so that
when reading the driver there is no doubt it is builtin-only.We explicitly disallow a driver unbind, since that doesn't have a
sensible use case anyway, and it allows us to drop the ".remove"
code for non-modular drivers.Since module_platform_driver() uses the same init level priority as
builtin_platform_driver() the init ordering remains unchanged with
this commit.Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
Cc: Stephen Boyd
Acked-by: Neil Armstrong
Cc: linux-clk@vger.kernel.org
Signed-off-by: Paul Gortmaker
Signed-off-by: Michael Turquette
Link: lkml.kernel.org/r/20160704211220.5685-6-paul.gortmaker@windriver.com -
The RK808 and RK818 PMICs are using a similar register map.
We can reuse the clk driver for the RK818 PMIC. So let's add
the RK818 in the Kconfig description.Signed-off-by: Wadim Egorov
Acked-by: Stephen Boyd
Signed-off-by: Michael Turquette
Link: lkml.kernel.org/r/1464850228-17244-4-git-send-email-w.egorov@phytec.de -
In the bootloader of HiKey/96boards, syspll and media_syspll clk
was initialized to 1.19GHz. So, here changes it in kernel accordingly.1.19GHz was chosen over 1.2GHz because at 1.19GHz we get more precise
HDMI pixel clock (1.19G/16 = 74.4MHz) for 1280x720p@60Hz HDMI
(74.25MHz required by standards). Closer pixel clock means better
compatibility to HDMI monitors.Signed-off-by: Guodong Xu
Signed-off-by: Xinliang Liu
Signed-off-by: Michael Turquette
Link: lkml.kernel.org/r/1467189955-21694-1-git-send-email-guodong.xu@linaro.org -
The Kconfig currently controlling compilation of this code is:
drivers/clk/meson/Kconfig:config COMMON_CLK_GXBB
drivers/clk/meson/Kconfig: bool...meaning that it currently is not being built as a module by anyone.
Lets remove the modular code that is essentially orphaned, so that
when reading the driver there is no doubt it is builtin-only.Since module_init translates to device_initcall in the non-modular
case, the init ordering remains unchanged with this commit.Also note that MODULE_DEVICE_TABLE and ALIAS are no-op for non-modules.
We also delete the MODULE_LICENSE tag etc. since all that information
was (or is now) contained at the top of the file in the comments.Cc: Stephen Boyd
Cc: Carlo Caione
Cc: Kevin Hilman
Cc: linux-clk@vger.kernel.org
Cc: linux-amlogic@lists.infradead.org
Signed-off-by: Paul Gortmaker
Signed-off-by: Michael Turquette
Link: lkml.kernel.org/r/20160704211220.5685-3-paul.gortmaker@windriver.com -
The Kconfig currently controlling compilation of this code is:
drivers/clk/meson/Kconfig:config COMMON_CLK_MESON8B
drivers/clk/meson/Kconfig: bool...meaning that it currently is not being built as a module by anyone.
However a recent commit added a bunch of modular boilerplate to this
driver.Lets remove the modular code that is essentially orphaned, so that
when reading the driver there is no doubt it is builtin-only.Since module_init translates to device_initcall in the non-modular
case, the init ordering remains unchanged with this commit.Also note that MODULE DEVICE_TABLE/ALIAS are no-op when non-modular.
We also delete the MODULE_LICENSE tag etc. since all that information
was (or is now) contained at the top of the file in the comments.Cc: Stephen Boyd
Cc: Carlo Caione
Cc: Kevin Hilman
Cc: linux-clk@vger.kernel.org
Cc: linux-amlogic@lists.infradead.org
Signed-off-by: Paul Gortmaker
Signed-off-by: Michael Turquette
Link: lkml.kernel.org/r/20160704211220.5685-2-paul.gortmaker@windriver.com
02 Jul, 2016
12 commits
-
This adds the EBI2 2X and EBI2 clocks to the MSM8660/APQ8060
GCC. This is necessary to enable clocking of the external bus
interface so that peripherals on it can be mounted. These two
clocks are simple gated branch clocks.In the vendor tree clock-8x60, these clocks have some kind of
dependency, the EBI2 clock has .depends = &ebi2_2x_clk.c,
what this means is undocumented, it doesn't seem like there
is a parent/child relationship, so the solution I chose was to
just have the EBI2 driver get and enable both clocks.Cc: Stephen Boyd
Cc: Bjorn Andersson
Signed-off-by: Linus Walleij
Signed-off-by: Stephen Boyd -
Formerly clk core does not support imx7d clock type well that all
its clock operations requires the parent clock on.
Therefore we enabled all clocks by default in clock driver
initialization for other module clocks operate well.After patch 'clk: imx7d: using api with flag CLK_OPS_PARENT_ENABLE',
clk core can handle such clock type well, so we don't have to enable
them all by default anymore. Instead, we only enable a minimum required
set of clocks.Cc: Michael Turquette
Cc: Stephen Boyd
Cc: Shawn Guo
Signed-off-by: Dong Aisheng
Signed-off-by: Stephen Boyd -
i.MX7D requires all clocks operations including enable/disable,
rate change and re-parent with its parent clock on.
Changing to the correct APIs to tell clk core such requirement.Cc: Michael Turquette
Cc: Stephen Boyd
Cc: Shawn Guo
Signed-off-by: Dong Aisheng
Signed-off-by: Stephen Boyd -
IMX SoCs like i.MX7D requires using CLK_OPS_PARENT_ENABLE flags,
adding the corresponding clock APIs variants for easily to use.Cc: Michael Turquette
Cc: Stephen Boyd
Cc: Shawn Guo
Signed-off-by: Dong Aisheng
Signed-off-by: Stephen Boyd -
Re-order and concentrate the same type of clk api for better
code maintenance.Cc: Shawn Guo
Signed-off-by: Dong Aisheng
Signed-off-by: Stephen Boyd -
On Freescale i.MX7D platform, all clocks operations, including
enable/disable, rate change and re-parent, requires its parent clock on.
Current clock core can not support it well.
This patch adding flag CLK_OPS_PARENT_ENABLE to handle this special case in
clock core that enable its parent clock firstly for each operation and
disable it later after operation complete.The patch part 2 fixes set clock rate and set parent while its parent
is off. The most special case is for set_parent() operation which requires
all parents including both old and new one to be enabled at the same time
during the operation.Cc: Michael Turquette
Cc: Stephen Boyd
Cc: Shawn Guo
Signed-off-by: Dong Aisheng
[sboyd@codeaurora.org: Move set_rate tracepoint after prepare_enable]
Signed-off-by: Stephen Boyd -
On Freescale i.MX7D platform, all clocks operations, including
enable/disable, rate change and re-parent, requires its parent
clock enable. Current clock core can not support it well.
This patch introduce a new flag CLK_OPS_PARENT_ENABLE to handle this
special case in clock core that enable its parent clock firstly for
each operation and disable it later after operation complete.The patch part 1 fixes the possible disabling clocks while its parent
is off during kernel booting phase in clk_disable_unused_subtree().Before the completion of kernel booting, clock tree is still not built
completely, there may be a case that the child clock is on but its
parent is off which could be caused by either HW initial reset state
or bootloader initialization.Taking bootloader as an example, we may enable all clocks in HW by default.
And during kernel booting time, the parent clock could be disabled in its
driver probe due to calling clk_prepare_enable and clk_disable_unprepare.
Because it's child clock is only enabled in HW while its SW usecount
in clock tree is still 0, so clk_disable of parent clock will gate
the parent clock in both HW and SW usecount ultimately. Then there will
be a child clock is still on in HW but its parent is already off.Later in clk_disable_unused(), this clock disable accessing while its
parent off will cause system hang due to the limitation of HW which
must require its parent on.This patch simply enables the parent clock first before disabling
if flag CLK_OPS_PARENT_ENABLE is set in clk_disable_unused_subtree().
This is a simple solution and only affects booting time.After kernel booting up the clock tree is already created, there will
be no case that child is off but its parent is off.
So no need do this checking for normal clk_disable() later.Cc: Michael Turquette
Cc: Stephen Boyd
Cc: Shawn Guo
Signed-off-by: Dong Aisheng
Signed-off-by: Stephen Boyd -
No function level change, just moving code place.
clk_disable_unused function will need to call clk_core_prepare_enable/
clk_core_disable_unprepare when adding CLK_OPS_PARENT_ENABLE features.
So move it after clk_core_disable_unprepare to avoid adding forward
declared functions later.Cc: Michael Turquette
Cc: Stephen Boyd
Cc: Shawn Guo
Signed-off-by: Dong Aisheng
Signed-off-by: Stephen Boyd -
This can be useful when clock core wants to enable/disable clocks.
Then we don't have to convert the struct clk_core to struct clk to call
clk_enable/clk_disable which is a bit un-align with exist using.And after introduce clk_core_{enable|disable}_lock, we can refine
clk_enable and clk_disable a bit.As well as clk_core_{enable|disable}_lock, we also added
clk_core_{prepare|unprepare}_lock and clk_core_prepare_enable/
clk_core_unprepare_disable for clock core to easily use.Cc: Michael Turquette
Cc: Stephen Boyd
Cc: Shawn Guo
Signed-off-by: Dong Aisheng
Signed-off-by: Stephen Boyd -
…mmind/linux-rockchip into clk-next
Pull rockchip clk driver updates from Heiko Stuebner:
Placeholder for the rk3399 watchdog pclk, some newly exported
rk3228 clockids and a small fix for the not yet used spdif to
displayport clock on the rk3399.* tag 'v4.8-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
clk: rockchip: fix incorrect rk3399 spdif-DPTX divider bits
clk: rockchip: export rk3228 MAC clocks
clk: rockchip: rename rk3228 sclk_macphy_50m to sclk_mac_extclk
clk: rockchip: export rk3228 audio clocks
clk: rockchip: include rk3228 downstream muxes into fractional dividers
clk: rockchip: fix incorrect rk3228 clock registers
clk: rockchip: add clock-ids for rk3228 MAC clocks
clk: rockchip: add clock-ids for rk3228 audio clocks
clk: rockchip: add a dummy clock for the watchdog pclk on rk3399 -
…egra/linux into clk-next
Pull tegra clk driver updates from Thierry Reding:
Fixes and enhancements mostly for Tegra210 clocks that allow DSI and
HDMI to work on Tegra X1. There's also a refactoring, including fixes,
the USB PLL.* tag 'tegra-for-4.8-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
clk: tegra: Initialize UTMI PLL when enabling PLLU
clk: tegra: Micro-optimize Tegra210 clock setup
clk: tegra: Make sor_safe the parent of dpaux and dpaux1
clk: tegra: Mark timer clock as critical
clk: tegra: Enable sor1 and sor1_src on Tegra210
clk: tegra: Squash sor1 safe/brick/src into a single mux
clk: tegra: Disable spread spectrum on pll_d2
clk: tegra: Fixup post dividers on Tegra210 -
The only way for a fixed factor clock to change its rate would be to change
its parent rate.Since passing blindly CLK_SET_RATE_PARENT might break a lot of platforms
that were relying on the fact that the parent rate wouldn't change,
introduce a compatible-based whitelist that will allow clocks to opt-in
that flag.Signed-off-by: Maxime Ripard
Acked-by: Rob Herring
Signed-off-by: Stephen Boyd
01 Jul, 2016
16 commits
-
The CLKSEL_CON32 bit_0 is controlled for spdif_8ch, not spdif_rec_dptx,
it should be bit_8, let's fix it.Fixes: 115510053e5e ("clk: rockchip: add clock controller for the RK3399")
Reported-by: Chris Zhong
Tested-by: Chris Zhong
Signed-off-by: Xing Zheng
Cc: stable@vger.kernel.org
Signed-off-by: Heiko Stuebner -
This patch exports related MAC clocks for dts reference.
Signed-off-by: Xing Zheng
Signed-off-by: Heiko Stuebner -
The sclk_macphy_50m is confusing, the sclk_mac_extclk describes
a external clock clearly.Signed-off-by: Xing Zheng
Signed-off-by: Heiko Stuebner -
This patch exports related i2s/spdif clocks for dts reference.
Signed-off-by: Xing Zheng
Signed-off-by: Heiko Stuebner -
During the initial conversion to the newly introduced combined fractional
dividers+muxes the rk3228 clocks were left out, so convert them now.Signed-off-by: Xing Zheng
Signed-off-by: Heiko Stuebner -
…o/linux into clk-next
Pull i.MX clk driver updates from Shawn Guo:
- A few correction and improvements on pllv3 driver around AV pll clock
rate calculation, parent setting and power bit handling
- Correct i.MX6UL GPT2 clock names
- A couple of minor fixes on i.MX7D clock driver on DRAM clocks* tag 'imx-clk-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
clk: imx6ul: fix gpt2 clock names
clk: imx: refine the powerdown bit of clk-pllv3
clk: imx: clk-pllv3: fix incorrect handle of enet powerdown bit
clk: imx: fix pll clock parents
clk: imx7d: correct dram pll type
clk: imx7d: correct dram root clk parent select
clk: imx: correct AV PLL rate formula -
* clk-hw-unregister-fixed-rate:
clk: fixed-rate: add clk_hw_unregister_fixed_rate() -
This will be used to migrate to the clk_hw APIs.
Signed-off-by: Masahiro Yamada
Signed-off-by: Stephen Boyd -
1. Add driver remove path.
2. Fix some issues.
-Fix the ordering issue about clock provider being published.
-Add error checking upon registering clocks.Signed-off-by: Jiancheng Xue
Signed-off-by: Stephen Boyd -
Add hisi_clk_unregister_* functions.
Signed-off-by: Jiancheng Xue
Signed-off-by: Stephen Boyd -
Add error processing for hisi_clk_register_* functions.
Signed-off-by: Jiancheng Xue
Signed-off-by: Stephen Boyd -
Before, there was an ordering issue that the clock provider
had been published in hisi_clk_init before it could provide
valid clocks to consumers. hisi_clk_alloc is just used to
allocate memory space for struct hisi_clock_data. It makes
it possible to publish the provider after the clocks are ready.Signed-off-by: Jiancheng Xue
Signed-off-by: Stephen Boyd -
Change the input arguments type to struct platform_device pointer.
Signed-off-by: Jiancheng Xue
Signed-off-by: Stephen Boyd -
Now that we have clk_hw based provider APIs to register clks, we
can get rid of struct clk pointers while registering clks in
these drivers, allowing us to move closer to a clear split of
consumer and provider clk APIs.Signed-off-by: Stephen Boyd
Acked-by: Andi Shyti
Reviewed-by: Krzysztof Kozlowski
Signed-off-by: Stephen Boyd -
Now that we have clk_hw based provider APIs to register clks, we
can get rid of struct clk pointers while registering clks in
these drivers, allowing us to move closer to a clear split of
consumer and provider clk APIs.Cc: Daniel Thompson
Signed-off-by: Stephen Boyd
Signed-off-by: Stephen Boyd
