diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-07 10:55:12 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-07 10:55:12 -0500 |
| commit | 3589025867274ff28f689029ab8323301771c8ec (patch) | |
| tree | bc8f6b088d9b5ceec8e99602082f4d034800b8ef /drivers/clk/clk-uclass.c | |
| parent | 57dbc151437b36cc1105857d222df28b095236d7 (diff) | |
| parent | fdce9d35dc3671dfc6ce29b4c76e152cc5780869 (diff) | |
Merge branch '2018-12-06-master-imports'
- Various FAT fixes
- Hardware spinlock uclass
- DMA uclass
- Various am335x fixes
- DT resyncs for a number of TI platforms
- stm32 updates
Diffstat (limited to 'drivers/clk/clk-uclass.c')
| -rw-r--r-- | drivers/clk/clk-uclass.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index 04b369aa5a..6d7a514006 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -243,6 +243,10 @@ int clk_set_defaults(struct udevice *dev) { int ret; + /* 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)); ret = clk_set_default_parents(dev); |