diff options
author | Joerg Roedel <jroedel@suse.de> | 2020-05-29 17:10:09 +0200 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2020-05-29 17:10:09 +0200 |
commit | 4c201d58cfee8631350888bad9e8bae33e628605 (patch) | |
tree | a49a020d48af561d030b7d4869d193148b5a8088 /drivers/clk/versatile/clk-impd1.c | |
parent | iommu/amd: Unify format of the printed messages (diff) | |
parent | Linux 5.7-rc7 (diff) | |
download | linux-4c201d58cfee8631350888bad9e8bae33e628605.tar.xz linux-4c201d58cfee8631350888bad9e8bae33e628605.zip |
Merge tag 'v5.7-rc7' into x86/amd
Linux 5.7-rc7
Diffstat (limited to 'drivers/clk/versatile/clk-impd1.c')
-rw-r--r-- | drivers/clk/versatile/clk-impd1.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/versatile/clk-impd1.c b/drivers/clk/versatile/clk-impd1.c index b05da8516d4c..f9f4babe3ca6 100644 --- a/drivers/clk/versatile/clk-impd1.c +++ b/drivers/clk/versatile/clk-impd1.c @@ -206,6 +206,7 @@ static int integrator_impd1_clk_spawn(struct device *dev, return -ENODEV; } + of_property_read_string(np, "clock-output-names", &name); parent_name = of_clk_get_parent_name(np, 0); clk = icst_clk_setup(NULL, desc, name, parent_name, map, ICST_INTEGRATOR_IM_PD1); |