Merge branch 'pm-devfreq'

* pm-devfreq:
  PM / devfreq: Modify the device name as devfreq(X) for sysfs
  PM / devfreq: Simplify the sysfs name of devfreq-event device
  PM / devfreq: Remove unnecessary separate _remove_devfreq()
  PM / devfreq: Fix wrong trans_stat of passive devfreq device
  PM / devfreq: Fix available_governor sysfs
  PM / devfreq: exynos-ppmu: Show the registred device for ppmu device
  PM / devfreq: Fix the wrong description for userspace governor
  PM / devfreq: Fix the checkpatch warnings
  PM / devfreq: exynos-bus: Print the real clock rate of bus
  PM / devfreq: exynos-ppmu: Use the regmap interface to handle the registers
  PM / devfreq: exynos-bus: Add the detailed correlation for Exynos5433
  PM / devfreq: Don't delete sysfs group twice

1 files changed, 46 insertions, 28 deletions

diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 253525ea17af..551a271353d2 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -128,7 +128,7 @@ static void devfreq_set_freq_table(struct devfreq *devfreq)
  * @devfreq:    the devfreq instance
  * @freq:       the update target frequency
  */
-static int devfreq_update_status(struct devfreq *devfreq, unsigned long freq)
+int devfreq_update_status(struct devfreq *devfreq, unsigned long freq)
 {
         int lev, prev_lev, ret = 0;
         unsigned long cur_time;
@@ -164,6 +164,7 @@ out:
         devfreq->last_stat_updated = cur_time;
         return ret;
 }
+EXPORT_SYMBOL(devfreq_update_status);
 
 /**
  * find_devfreq_governor() - find devfreq governor from name
@@ -472,11 +473,15 @@ static int devfreq_notifier_call(struct notifier_block *nb, unsigned long type,
 }
 
 /**
- * _remove_devfreq() - Remove devfreq from the list and release its resources.
- * @devfreq:    the devfreq struct
+ * devfreq_dev_release() - Callback for struct device to release the device.
+ * @dev:        the devfreq device
+ *
+ * Remove devfreq from the list and release its resources.
  */
-static void _remove_devfreq(struct devfreq *devfreq)
+static void devfreq_dev_release(struct device *dev)
 {
+        struct devfreq *devfreq = to_devfreq(dev);
+
         mutex_lock(&devfreq_list_lock);
         if (IS_ERR(find_device_devfreq(devfreq->dev.parent))) {
                 mutex_unlock(&devfreq_list_lock);
@@ -498,19 +503,6 @@ static void _remove_devfreq(struct devfreq *devfreq)
 }
 
 /**
- * devfreq_dev_release() - Callback for struct device to release the device.
- * @dev:        the devfreq device
- *
- * This calls _remove_devfreq() if _remove_devfreq() is not called.
- */
-static void devfreq_dev_release(struct device *dev)
-{
-        struct devfreq *devfreq = to_devfreq(dev);
-
-        _remove_devfreq(devfreq);
-}
-
-/**
  * devfreq_add_device() - Add devfreq feature to the device
  * @dev:        the device to add devfreq feature.
  * @profile:    device-specific profile to run devfreq.
@@ -525,6 +517,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
 {
         struct devfreq *devfreq;
         struct devfreq_governor *governor;
+        static atomic_t devfreq_no = ATOMIC_INIT(-1);
         int err = 0;
 
         if (!dev || !profile || !governor_name) {
@@ -536,15 +529,14 @@ struct devfreq *devfreq_add_device(struct device *dev,
         devfreq = find_device_devfreq(dev);
         mutex_unlock(&devfreq_list_lock);
         if (!IS_ERR(devfreq)) {
-                dev_err(dev, "%s: Unable to create devfreq for the device. It already has one.\n", __func__);
+                dev_err(dev, "%s: Unable to create devfreq for the device.\n",
+                        __func__);
                 err = -EINVAL;
                 goto err_out;
         }
 
         devfreq = kzalloc(sizeof(struct devfreq), GFP_KERNEL);
         if (!devfreq) {
-                dev_err(dev, "%s: Unable to create devfreq for the device\n",
-                        __func__);
                 err = -ENOMEM;
                 goto err_out;
         }
@@ -567,18 +559,21 @@ struct devfreq *devfreq_add_device(struct device *dev,
                 mutex_lock(&devfreq->lock);
         }
 
-        dev_set_name(&devfreq->dev, "%s", dev_name(dev));
+        dev_set_name(&devfreq->dev, "devfreq%d",
+                                atomic_inc_return(&devfreq_no));
         err = device_register(&devfreq->dev);
         if (err) {
                 mutex_unlock(&devfreq->lock);
                 goto err_out;
         }
 
-        devfreq->trans_table =  devm_kzalloc(&devfreq->dev, sizeof(unsigned int) *
+        devfreq->trans_table =  devm_kzalloc(&devfreq->dev,
+                                                sizeof(unsigned int) *
                                                 devfreq->profile->max_state *
                                                 devfreq->profile->max_state,
                                                 GFP_KERNEL);
-        devfreq->time_in_state = devm_kzalloc(&devfreq->dev, sizeof(unsigned long) *
+        devfreq->time_in_state = devm_kzalloc(&devfreq->dev,
+                                                sizeof(unsigned long) *
                                                 devfreq->profile->max_state,
                                                 GFP_KERNEL);
         devfreq->last_stat_updated = jiffies;
@@ -937,6 +932,9 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr,
         if (df->governor == governor) {
                 ret = 0;
                 goto out;
+        } else if (df->governor->immutable || governor->immutable) {
+                ret = -EINVAL;
+                goto out;
         }
 
         if (df->governor) {
@@ -966,13 +964,33 @@ static ssize_t available_governors_show(struct device *d,
                                         struct device_attribute *attr,
                                         char *buf)
 {
-        struct devfreq_governor *tmp_governor;
+        struct devfreq *df = to_devfreq(d);
         ssize_t count = 0;
 
         mutex_lock(&devfreq_list_lock);
-        list_for_each_entry(tmp_governor, &devfreq_governor_list, node)
-                count += scnprintf(&buf[count], (PAGE_SIZE - count - 2),
-                                   "%s ", tmp_governor->name);
+
+        /*
+         * The devfreq with immutable governor (e.g., passive) shows
+         * only own governor.
+         */
+        if (df->governor->immutable) {
+                count = scnprintf(&buf[count], DEVFREQ_NAME_LEN,
+                                   "%s ", df->governor_name);
+        /*
+         * The devfreq device shows the registered governor except for
+         * immutable governors such as passive governor .
+         */
+        } else {
+                struct devfreq_governor *governor;
+
+                list_for_each_entry(governor, &devfreq_governor_list, node) {
+                        if (governor->immutable)
+                                continue;
+                        count += scnprintf(&buf[count], (PAGE_SIZE - count - 2),
+                                           "%s ", governor->name);
+                }
+        }
+
         mutex_unlock(&devfreq_list_lock);
 
         /* Truncate the trailing space */
@@ -993,7 +1011,7 @@ static ssize_t cur_freq_show(struct device *dev, struct device_attribute *attr,
 
         if (devfreq->profile->get_cur_freq &&
                 !devfreq->profile->get_cur_freq(devfreq->dev.parent, &freq))
-                        return sprintf(buf, "%lu\n", freq);
+                return sprintf(buf, "%lu\n", freq);
 
         return sprintf(buf, "%lu\n", devfreq->previous_freq);
 }