Merge tag 'for-linus-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[linux-2.6-microblaze.git] / drivers / devfreq / exynos-bus.c

diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c
index 8fa8eb5..1e684a4 100644 (file)
--- a/drivers/devfreq/exynos-bus.c
+++ b/drivers/devfreq/exynos-bus.c
@@ -193,7 +193,7 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
         * Get the devfreq-event devices to get the current utilization of
         * buses. This raw data will be used in devfreq ondemand governor.
         */
-       count = devfreq_event_get_edev_count(dev);
+       count = devfreq_event_get_edev_count(dev, "devfreq-events");
        if (count < 0) {
                dev_err(dev, "failed to get the count of devfreq-event dev\n");
                ret = count;
@@ -209,7 +209,8 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
        }
 
        for (i = 0; i < count; i++) {
-               bus->edev[i] = devfreq_event_get_edev_by_phandle(dev, i);
+               bus->edev[i] = devfreq_event_get_edev_by_phandle(dev,
+                                                       "devfreq-events", i);
                if (IS_ERR(bus->edev[i])) {
                        ret = -EPROBE_DEFER;
                        goto err_regulator;
@@ -360,7 +361,7 @@ static int exynos_bus_profile_init_passive(struct exynos_bus *bus,
        profile->exit = exynos_bus_passive_exit;
 
        /* Get the instance of parent devfreq device */
-       parent_devfreq = devfreq_get_devfreq_by_phandle(dev, 0);
+       parent_devfreq = devfreq_get_devfreq_by_phandle(dev, "devfreq", 0);
        if (IS_ERR(parent_devfreq))
                return -EPROBE_DEFER;