summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-06-07 16:24:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-06-07 16:24:44 -0700
commit2051877c4c8526abc0a1d514e76f95610b4ab8f3 (patch)
treec0d10967b4144d6ec4e427b547e3c5a4c4aadb04 /arch/powerpc
parent43c082e72745555952126848a40db3a06fc8a7a9 (diff)
parent72ad679aa7182d23d269cbe4d655f7e129d3b057 (diff)
downloadblackbird-op-linux-2051877c4c8526abc0a1d514e76f95610b4ab8f3.tar.gz
blackbird-op-linux-2051877c4c8526abc0a1d514e76f95610b4ab8f3.zip
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd: "This finally removes the CLK_IS_ROOT flag by picking up the last few stragglers that didn't get merged by anyone this time around. Better to do it now than wait for another one to pop up. There's also a minor maintainers update and a Kconfig fix" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: nxp: Select MFD_SYSCON for creg driver MAINTAINERS: Add file patterns for clock device tree bindings clk: Remove CLK_IS_ROOT flag clk: microchip: Remove CLK_IS_ROOT powerpc/512x: clk: Remove CLK_IS_ROOT vexpress/spc: Remove CLK_IS_ROOT
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/platforms/512x/clock-commonclk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/512x/clock-commonclk.c b/arch/powerpc/platforms/512x/clock-commonclk.c
index c50ea76ba66c..6081fbd75330 100644
--- a/arch/powerpc/platforms/512x/clock-commonclk.c
+++ b/arch/powerpc/platforms/512x/clock-commonclk.c
@@ -221,7 +221,7 @@ static bool soc_has_mclk_mux0_canin(void)
/* convenience wrappers around the common clk API */
static inline struct clk *mpc512x_clk_fixed(const char *name, int rate)
{
- return clk_register_fixed_rate(NULL, name, NULL, CLK_IS_ROOT, rate);
+ return clk_register_fixed_rate(NULL, name, NULL, 0, rate);
}
static inline struct clk *mpc512x_clk_factor(
OpenPOWER on IntegriCloud