10 files changed, 350 insertions, 126 deletions

diff --git a/Documentation/ABI/testing/sysfs-class-devfreq-event b/Documentation/ABI/testing/sysfs-class-devfreq-event
new file mode 100644
index 000000000000..ceaf0f686d4a
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-devfreq-event
@@ -0,0 +1,25 @@
+What:           /sys/class/devfreq-event/event(x)/
+Date:           January 2017
+Contact:        Chanwoo Choi <cw00.choi@samsung.com>
+Description:
+                Provide a place in sysfs for the devfreq-event objects.
+                This allows accessing various devfreq-event specific variables.
+                The name of devfreq-event object denoted as 'event(x)' which
+                includes the unique number of 'x' for each devfreq-event object.
+
+What:           /sys/class/devfreq-event/event(x)/name
+Date:           January 2017
+Contact:        Chanwoo Choi <cw00.choi@samsung.com>
+Description:
+                The /sys/class/devfreq-event/event(x)/name attribute contains
+                the name of the devfreq-event object. This attribute is
+                read-only.
+
+What:           /sys/class/devfreq-event/event(x)/enable_count
+Date:           January 2017
+Contact:        Chanwoo Choi <cw00.choi@samsung.com>
+Description:
+                The /sys/class/devfreq-event/event(x)/enable_count attribute
+                contains the reference count to enable the devfreq-event
+                object. If the device is enabled, the value of attribute is
+                greater than zero.
diff --git a/Documentation/devicetree/bindings/devfreq/exynos-bus.txt b/Documentation/devicetree/bindings/devfreq/exynos-bus.txt
index d3ec8e676b6b..d085ef90d27c 100644
--- a/Documentation/devicetree/bindings/devfreq/exynos-bus.txt
+++ b/Documentation/devicetree/bindings/devfreq/exynos-bus.txt
@@ -123,6 +123,20 @@ Detailed correlation between sub-blocks and power line according to Exynos SoC:
                 |--- FSYS
                 |--- FSYS2
 
+- In case of Exynos5433, there is VDD_INT power line as following:
+        VDD_INT |--- G2D (parent device)
+                |--- MSCL
+                |--- GSCL
+                |--- JPEG
+                |--- MFC
+                |--- HEVC
+                |--- BUS0
+                |--- BUS1
+                |--- BUS2
+                |--- PERIS (Fixed clock rate)
+                |--- PERIC (Fixed clock rate)
+                |--- FSYS  (Fixed clock rate)
+
 Example1:
         Show the AXI buses of Exynos3250 SoC. Exynos3250 divides the buses to
         power line (regulator). The MIF (Memory Interface) AXI bus is used to
diff --git a/drivers/devfreq/devfreq-event.c b/drivers/devfreq/devfreq-event.c
index 9aea2c7ecbe6..8648b32ebc89 100644
--- a/drivers/devfreq/devfreq-event.c
+++ b/drivers/devfreq/devfreq-event.c
@@ -306,7 +306,7 @@ struct devfreq_event_dev *devfreq_event_add_edev(struct device *dev,
                                                 struct devfreq_event_desc *desc)
 {
         struct devfreq_event_dev *edev;
-        static atomic_t event_no = ATOMIC_INIT(0);
+        static atomic_t event_no = ATOMIC_INIT(-1);
         int ret;
 
         if (!dev || !desc)
@@ -329,7 +329,7 @@ struct devfreq_event_dev *devfreq_event_add_edev(struct device *dev,
         edev->dev.class = devfreq_event_class;
         edev->dev.release = devfreq_event_release_edev;
 
-        dev_set_name(&edev->dev, "event.%d", atomic_inc_return(&event_no) - 1);
+        dev_set_name(&edev->dev, "event%d", atomic_inc_return(&event_no));
         ret = device_register(&edev->dev);
         if (ret < 0) {
                 put_device(&edev->dev);
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 47206a21bb90..4aa72b5ed660 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -130,7 +130,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;
@@ -166,6 +166,7 @@ out:
         devfreq->last_stat_updated = cur_time;
         return ret;
 }
+EXPORT_SYMBOL(devfreq_update_status);
 
 /**
  * find_devfreq_governor() - find devfreq governor from name
@@ -474,11 +475,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);
@@ -500,19 +505,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.
@@ -527,6 +519,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) {
@@ -538,15 +531,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;
         }
@@ -569,18 +561,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) {