Merge tag 'u-boot-amlogic-20181207' of git://git.denx.de/u-boot-amlogic

[platform/kernel/u-boot.git] / drivers / clk / clk-uclass.c

diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c
index 53f418b..6d7a514 100644 (file)
--- a/drivers/clk/clk-uclass.c
+++ b/drivers/clk/clk-uclass.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
  * Copyright (c) 2016, NVIDIA CORPORATION.
  * Copyright (c) 2018, Theobroma Systems Design und Consulting GmbH
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -155,6 +154,10 @@ static int clk_set_default_parents(struct udevice *dev)
        for (index = 0; index < num_parents; index++) {
                ret = clk_get_by_indexed_prop(dev, "assigned-clock-parents",
                                              index, &parent_clk);
+               /* If -ENOENT, this is a no-op entry */
+               if (ret == -ENOENT)
+                       continue;
+
                if (ret) {
                        debug("%s: could not get parent clock %d for %s\n",
                              __func__, index, dev_read_name(dev));
@@ -211,6 +214,10 @@ static int clk_set_default_rates(struct udevice *dev)
                goto fail;
 
        for (index = 0; index < num_rates; index++) {
+               /* If 0 is passed, this is a no-op */
+               if (!rates[index])
+                       continue;
+
                ret = clk_get_by_indexed_prop(dev, "assigned-clocks",
                                              index, &clk);
                if (ret) {
@@ -236,8 +243,8 @@ int clk_set_defaults(struct udevice *dev)
 {
        int ret;
 
-       /* If this is running pre-reloc state, don't take any action. */
-       if (!(gd->flags & GD_FLG_RELOC))
+       /* If this not in SPL and pre-reloc state, don't take any action. */
+       if (!(IS_ENABLED(CONFIG_SPL_BUILD) || (gd->flags & GD_FLG_RELOC)))
                return 0;
 
        debug("%s(%s)\n", __func__, dev_read_name(dev));