6 files changed, 10 insertions, 8 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index ed42cb65a19b..66de4da2d244 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3086,6 +3086,7 @@ M:	Stephen Boyd <sboyd@codeaurora.org>
 L:      linux-clk@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
 S:      Maintained
+F:      Documentation/devicetree/bindings/clock/
 F:      drivers/clk/
 X:      drivers/clk/clkdev.c
 F:      include/linux/clk-pr*
diff --git a/arch/arm/mach-vexpress/spc.c b/arch/arm/mach-vexpress/spc.c
index 5766ce2be32b..8409cab3f760 100644
--- a/arch/arm/mach-vexpress/spc.c
+++ b/arch/arm/mach-vexpress/spc.c
@@ -547,7 +547,7 @@ static struct clk *ve_spc_clk_register(struct device *cpu_dev)
 
         init.name = dev_name(cpu_dev);
         init.ops = &clk_spc_ops;
-        init.flags = CLK_IS_ROOT | CLK_GET_RATE_NOCACHE;
+        init.flags = CLK_GET_RATE_NOCACHE;
         init.num_parents = 0;
 
         return devm_clk_register(cpu_dev, &spc->hw);
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(
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 53ddba26578c..98efbfcdb503 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -175,6 +175,7 @@ config COMMON_CLK_KEYSTONE
 config COMMON_CLK_NXP
         def_bool COMMON_CLK && (ARCH_LPC18XX || ARCH_LPC32XX)
         select REGMAP_MMIO if ARCH_LPC32XX
+        select MFD_SYSCON if ARCH_LPC18XX
         ---help---
           Support for clock providers on NXP platforms.
 
diff --git a/drivers/clk/microchip/clk-pic32mzda.c b/drivers/clk/microchip/clk-pic32mzda.c
index 020a29acc5b0..51f54380474b 100644
--- a/drivers/clk/microchip/clk-pic32mzda.c
+++ b/drivers/clk/microchip/clk-pic32mzda.c
@@ -180,15 +180,15 @@ static int pic32mzda_clk_probe(struct platform_device *pdev)
 
         /* register fixed rate clocks */
         clks[POSCCLK] = clk_register_fixed_rate(&pdev->dev, "posc_clk", NULL,
-                                                CLK_IS_ROOT, 24000000);
+                                                0, 24000000);
         clks[FRCCLK] =  clk_register_fixed_rate(&pdev->dev, "frc_clk", NULL,
-                                                CLK_IS_ROOT, 8000000);
+                                                0, 8000000);
         clks[BFRCCLK] = clk_register_fixed_rate(&pdev->dev, "bfrc_clk", NULL,
-                                                CLK_IS_ROOT, 8000000);
+                                                0, 8000000);
         clks[LPRCCLK] = clk_register_fixed_rate(&pdev->dev, "lprc_clk", NULL,
-                                                CLK_IS_ROOT, 32000);
+                                                0, 32000);
         clks[UPLLCLK] = clk_register_fixed_rate(&pdev->dev, "usbphy_clk", NULL,
-                                                CLK_IS_ROOT, 24000000);
+                                                0, 24000000);
         /* fixed rate (optional) clock */
         if (of_find_property(np, "microchip,pic32mzda-sosc", NULL)) {
                 pr_info("pic32-clk: dt requests SOSC.\n");
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 0c72204c75fc..fb39d5add173 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -25,7 +25,7 @@
 #define CLK_SET_PARENT_GATE     BIT(1) /* must be gated across re-parent */
 #define CLK_SET_RATE_PARENT     BIT(2) /* propagate rate change up one level */
 #define CLK_IGNORE_UNUSED       BIT(3) /* do not gate even if unused */
-#define CLK_IS_ROOT             BIT(4) /* Deprecated: Don't use */
+                                /* unused */
 #define CLK_IS_BASIC            BIT(5) /* Basic clk, can't do a to_clk_foo() */
 #define CLK_GET_RATE_NOCACHE    BIT(6) /* do not use the cached clk rate */
 #define CLK_SET_RATE_NO_REPARENT BIT(7) /* don't re-parent on rate change */