Merge branch 'clk-for-v4.3' into dt-for-v4.3

11 files changed, 213 insertions, 11 deletions

diff --git a/Documentation/devicetree/bindings/clock/renesas,r8a7778-cpg-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,r8a7778-cpg-clocks.txt
index 2f3747fdcf1c..e4cdaf1cb333 100644
--- a/Documentation/devicetree/bindings/clock/renesas,r8a7778-cpg-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,r8a7778-cpg-clocks.txt
@@ -1,7 +1,9 @@
 * Renesas R8A7778 Clock Pulse Generator (CPG)
 
 The CPG generates core clocks for the R8A7778. It includes two PLLs and
-several fixed ratio dividers
+several fixed ratio dividers.
+The CPG also provides a Clock Domain for SoC devices, in combination with the
+CPG Module Stop (MSTP) Clocks.
 
 Required Properties:
 
@@ -10,10 +12,18 @@ Required Properties:
   - #clock-cells: Must be 1
   - clock-output-names: The names of the clocks. Supported clocks are
     "plla", "pllb", "b", "out", "p", "s", and "s1".
+  - #power-domain-cells: Must be 0
 
+SoC devices that are part of the CPG/MSTP Clock Domain and can be power-managed
+through an MSTP clock should refer to the CPG device node in their
+"power-domains" property, as documented by the generic PM domain bindings in
+Documentation/devicetree/bindings/power/power_domain.txt.
 
-Example
--------
+
+Examples
+--------
+
+  - CPG device node:
 
         cpg_clocks: cpg_clocks@ffc80000 {
                 compatible = "renesas,r8a7778-cpg-clocks";
@@ -22,4 +32,17 @@ Example
                 clocks = <&extal_clk>;
                 clock-output-names = "plla", "pllb", "b",
                                      "out", "p", "s", "s1";
+                #power-domain-cells = <0>;
+        };
+
+
+  - CPG/MSTP Clock Domain member device node:
+
+        sdhi0: sd@ffe4c000 {
+                compatible = "renesas,sdhi-r8a7778";
+                reg = <0xffe4c000 0x100>;
+                interrupts = <0 87 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp3_clks R8A7778_CLK_SDHI0>;
+                power-domains = <&cpg_clocks>;
+                status = "disabled";
         };
diff --git a/Documentation/devicetree/bindings/clock/renesas,r8a7779-cpg-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,r8a7779-cpg-clocks.txt
index ed3c8cb12f4e..8c81547c29f5 100644
--- a/Documentation/devicetree/bindings/clock/renesas,r8a7779-cpg-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,r8a7779-cpg-clocks.txt
@@ -1,7 +1,9 @@
 * Renesas R8A7779 Clock Pulse Generator (CPG)
 
 The CPG generates core clocks for the R8A7779. It includes one PLL and
-several fixed ratio dividers
+several fixed ratio dividers.
+The CPG also provides a Clock Domain for SoC devices, in combination with the
+CPG Module Stop (MSTP) Clocks.
 
 Required Properties:
 
@@ -12,16 +14,36 @@ Required Properties:
   - #clock-cells: Must be 1
   - clock-output-names: The names of the clocks. Supported clocks are "plla",
     "z", "zs", "s", "s1", "p", "b", "out".
+  - #power-domain-cells: Must be 0
 
+SoC devices that are part of the CPG/MSTP Clock Domain and can be power-managed
+through an MSTP clock should refer to the CPG device node in their
+"power-domains" property, as documented by the generic PM domain bindings in
+Documentation/devicetree/bindings/power/power_domain.txt.
 
-Example
--------
+
+Examples
+--------
+
+  - CPG device node:
 
         cpg_clocks: cpg_clocks@ffc80000 {
                 compatible = "renesas,r8a7779-cpg-clocks";
-                reg = <0 0xffc80000 0 0x30>;
+                reg = <0xffc80000 0x30>;
                 clocks = <&extal_clk>;
                 #clock-cells = <1>;
                 clock-output-names = "plla", "z", "zs", "s", "s1", "p",
                                      "b", "out";
+                #power-domain-cells = <0>;
+        };
+
+
+  - CPG/MSTP Clock Domain member device node:
+
+        sata: sata@fc600000 {
+                compatible = "renesas,sata-r8a7779", "renesas,rcar-sata";
+                reg = <0xfc600000 0x2000>;
+                interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp1_clks R8A7779_CLK_SATA>;
+                power-domains = <&cpg_clocks>;
         };
diff --git a/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt
index 56f111bd3e45..2a9a8edc8f35 100644
--- a/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt
@@ -2,6 +2,8 @@
 
 The CPG generates core clocks for the R-Car Gen2 SoCs. It includes three PLLs
 and several fixed ratio dividers.
+The CPG also provides a Clock Domain for SoC devices, in combination with the
+CPG Module Stop (MSTP) Clocks.
 
 Required Properties:
 
@@ -20,10 +22,18 @@ Required Properties:
   - clock-output-names: The names of the clocks. Supported clocks are "main",
     "pll0", "pll1", "pll3", "lb", "qspi", "sdh", "sd0", "sd1", "z", "rcan", and
     "adsp"
+  - #power-domain-cells: Must be 0
 
+SoC devices that are part of the CPG/MSTP Clock Domain and can be power-managed
+through an MSTP clock should refer to the CPG device node in their
+"power-domains" property, as documented by the generic PM domain bindings in
+Documentation/devicetree/bindings/power/power_domain.txt.
 
-Example
--------
+
+Examples
+--------
+
+  - CPG device node:
 
         cpg_clocks: cpg_clocks@e6150000 {
                 compatible = "renesas,r8a7790-cpg-clocks",
@@ -34,4 +44,16 @@ Example
                 clock-output-names = "main", "pll0, "pll1", "pll3",
                                      "lb", "qspi", "sdh", "sd0", "sd1", "z",
                                      "rcan", "adsp";
+                #power-domain-cells = <0>;
+        };
+
+
+  - CPG/MSTP Clock Domain member device node:
+
+        thermal@e61f0000 {
+                compatible = "renesas,thermal-r8a7790", "renesas,rcar-thermal";
+                reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>;
+                interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp5_clks R8A7790_CLK_THERMAL>;
+                power-domains = <&cpg_clocks>;
         };
diff --git a/Documentation/devicetree/bindings/clock/renesas,rz-cpg-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,rz-cpg-clocks.txt
index b0f7ddb8cdb1..bb51a33a1fbf 100644
--- a/Documentation/devicetree/bindings/clock/renesas,rz-cpg-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,rz-cpg-clocks.txt
@@ -2,6 +2,8 @@
 
 The CPG generates core clocks for the RZ SoCs. It includes the PLL, variable
 CPU and GPU clocks, and several fixed ratio dividers.
+The CPG also provides a Clock Domain for SoC devices, in combination with the
+CPG Module Stop (MSTP) Clocks.
 
 Required Properties:
 
@@ -14,10 +16,18 @@ Required Properties:
   - #clock-cells: Must be 1
   - clock-output-names: The names of the clocks. Supported clocks are "pll",
     "i", and "g"
+  - #power-domain-cells: Must be 0
 
+SoC devices that are part of the CPG/MSTP Clock Domain and can be power-managed
+through an MSTP clock should refer to the CPG device node in their
+"power-domains" property, as documented by the generic PM domain bindings in
+Documentation/devicetree/bindings/power/power_domain.txt.
 
-Example
--------
+
+Examples
+--------
+
+  - CPG device node:
 
         cpg_clocks: cpg_clocks@fcfe0000 {
                 #clock-cells = <1>;
@@ -26,4 +36,19 @@ Example
                 reg = <0xfcfe0000 0x18>;
                 clocks = <&extal_clk>, <&usb_x1_clk>;
                 clock-output-names = "pll", "i", "g";
+                #power-domain-cells = <0>;
+        };
+
+
+  - CPG/MSTP Clock Domain member device node:
+
+        mtu2: timer@fcff0000 {
+                compatible = "renesas,mtu2-r7s72100", "renesas,mtu2";
+                reg = <0xfcff0000 0x400>;
+                interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-names = "tgi0a";
+                clocks = <&mstp3_clks R7S72100_CLK_MTU2>;
+                clock-names = "fck";
+                power-domains = <&cpg_clocks>;
+                status = "disabled";
         };
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 45006479d461..34eac88a9889 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -4,6 +4,7 @@ config ARCH_SHMOBILE
 
 config PM_RCAR
         bool
+        select PM_GENERIC_DOMAINS if PM
 
 config PM_RMOBILE
         bool
@@ -50,6 +51,7 @@ config ARCH_EMEV2
 
 config ARCH_R7S72100
         bool "RZ/A1H (R7S72100)"
+        select PM_GENERIC_DOMAINS if PM
         select SYS_SUPPORTS_SH_MTU2
 
 config ARCH_R8A73A4
diff --git a/drivers/clk/shmobile/clk-mstp.c b/drivers/clk/shmobile/clk-mstp.c
index 2d2fe773ac81..b1df7b2f1e97 100644
--- a/drivers/clk/shmobile/clk-mstp.c
+++ b/drivers/clk/shmobile/clk-mstp.c
@@ -2,6 +2,7 @@
  * R-Car MSTP clocks
  *
  * Copyright (C) 2013 Ideas On Board SPRL
+ * Copyright (C) 2015 Glider bvba
  *
  * Contact: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  *
@@ -10,11 +11,16 @@
  * the Free Software Foundation; version 2 of the License.
  */
 
+#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
+#include <linux/clk/shmobile.h>
+#include <linux/device.h>
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include <linux/pm_clock.h>
+#include <linux/pm_domain.h>
 #include <linux/spinlock.h>
 
 /*
@@ -236,3 +242,84 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
         of_clk_add_provider(np, of_clk_src_onecell_get, &group->data);
 }
 CLK_OF_DECLARE(cpg_mstp_clks, "renesas,cpg-mstp-clocks", cpg_mstp_clocks_init);
+
+
+#ifdef CONFIG_PM_GENERIC_DOMAINS_OF
+int cpg_mstp_attach_dev(struct generic_pm_domain *domain, struct device *dev)
+{
+        struct device_node *np = dev->of_node;
+        struct of_phandle_args clkspec;
+        struct clk *clk;
+        int i = 0;
+        int error;
+
+        while (!of_parse_phandle_with_args(np, "clocks", "#clock-cells", i,
+                                           &clkspec)) {
+                if (of_device_is_compatible(clkspec.np,
+                                            "renesas,cpg-mstp-clocks"))
+                        goto found;
+
+                of_node_put(clkspec.np);
+                i++;
+        }
+
+        return 0;
+
+found:
+        clk = of_clk_get_from_provider(&clkspec);
+        of_node_put(clkspec.np);
+
+        if (IS_ERR(clk))
+                return PTR_ERR(clk);
+
+        error = pm_clk_create(dev);
+        if (error) {
+                dev_err(dev, "pm_clk_create failed %d\n", error);
+                goto fail_put;
+        }
+
+        error = pm_clk_add_clk(dev, clk);
+        if (error) {
+                dev_err(dev, "pm_clk_add_clk %pC failed %d\n", clk, error);
+                goto fail_destroy;
+        }
+
+        return 0;
+
+fail_destroy:
+        pm_clk_destroy(dev);
+fail_put:
+        clk_put(clk);
+        return error;
+}
+
+void cpg_mstp_detach_dev(struct generic_pm_domain *domain, struct device *dev)
+{
+        if (!list_empty(&dev->power.subsys_data->clock_list))
+                pm_clk_destroy(dev);
+}
+
+void __init cpg_mstp_add_clk_domain(struct device_node *np)
+{
+        struct generic_pm_domain *pd;
+        u32 ncells;
+
+        if (of_property_read_u32(np, "#power-domain-cells", &ncells)) {
+                pr_warn("%s lacks #power-domain-cells\n", np->full_name);
+                return;
+        }
+
+        pd = kzalloc(sizeof(*pd), GFP_KERNEL);
+        if (!pd)
+                return;
+
+        pd->name = np->name;
+
+        pd->flags = GENPD_FLAG_PM_CLK;
+        pm_genpd_init(pd, &simple_qos_governor, false);
+        pd->attach_dev = cpg_mstp_attach_dev;
+        pd->detach_dev = cpg_mstp_detach_dev;
+
+        of_genpd_add_provider_simple(np, pd);
+}
+#endif /* !CONFIG_PM_GENERIC_DOMAINS_OF */
diff --git a/drivers/clk/shmobile/clk-r8a7778.c b/drivers/clk/shmobile/clk-r8a7778.c
index cb33b57274bf..fa45684e220c 100644
--- a/drivers/clk/shmobile/clk-r8a7778.c
+++ b/drivers/clk/shmobile/clk-r8a7778.c
@@ -124,6 +124,8 @@ static void __init r8a7778_cpg_clocks_init(struct device_node *np)
         }
 
         of_clk_add_provider(np, of_clk_src_onecell_get, &cpg->data);
+
+        cpg_mstp_add_clk_domain(np);
 }
 
 CLK_OF_DECLARE(r8a7778_cpg_clks, "renesas,r8a7778-cpg-clocks",
diff --git a/drivers/clk/shmobile/clk-r8a7779.c b/drivers/clk/shmobile/clk-r8a7779.c
index 652ecacb6daf..e42a63a2ad25 100644
--- a/drivers/clk/shmobile/clk-r8a7779.c
+++ b/drivers/clk/shmobile/clk-r8a7779.c
@@ -168,6 +168,8 @@ static void __init r8a7779_cpg_clocks_init(struct device_node *np)
         }
 
         of_clk_add_provider(np, of_clk_src_onecell_get, &cpg->data);
+
+        cpg_mstp_add_clk_domain(np);
 }
 CLK_OF_DECLARE(r8a7779_cpg_clks, "renesas,r8a7779-cpg-clocks",
                r8a7779_cpg_clocks_init);
diff --git a/drivers/clk/shmobile/clk-rcar-gen2.c b/drivers/clk/shmobile/clk-rcar-gen2.c
index acfb6d7dbd6b..f2c457f494eb 100644
--- a/drivers/clk/shmobile/clk-rcar-gen2.c
+++ b/drivers/clk/shmobile/clk-rcar-gen2.c
@@ -415,6 +415,8 @@ static void __init rcar_gen2_cpg_clocks_init(struct device_node *np)
         }
 
         of_clk_add_provider(np, of_clk_src_onecell_get, &cpg->data);
+
+        cpg_mstp_add_clk_domain(np);
 }
 CLK_OF_DECLARE(rcar_gen2_cpg_clks, "renesas,rcar-gen2-cpg-clocks",
                rcar_gen2_cpg_clocks_init);
diff --git a/drivers/clk/shmobile/clk-rz.c b/drivers/clk/shmobile/clk-rz.c
index 7e68e8630962..9766e3cb595f 100644
--- a/drivers/clk/shmobile/clk-rz.c
+++ b/drivers/clk/shmobile/clk-rz.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/clk-provider.h>
+#include <linux/clk/shmobile.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/of.h>
@@ -99,5 +100,7 @@ static void __init rz_cpg_clocks_init(struct device_node *np)
         }
 
         of_clk_add_provider(np, of_clk_src_onecell_get, &cpg->data);
+
+        cpg_mstp_add_clk_domain(np);
 }
 CLK_OF_DECLARE(rz_cpg_clks, "renesas,rz-cpg-clocks", rz_cpg_clocks_init);
diff --git a/include/linux/clk/shmobile.h b/include/linux/clk/shmobile.h
index 63a8159c4e64..cb19cc1865ca 100644
--- a/include/linux/clk/shmobile.h
+++ b/include/linux/clk/shmobile.h
@@ -16,8 +16,20 @@
 
 #include <linux/types.h>
 
+struct device;
+struct device_node;
+struct generic_pm_domain;
+
 void r8a7778_clocks_init(u32 mode);
 void r8a7779_clocks_init(u32 mode);
 void rcar_gen2_clocks_init(u32 mode);
 
+#ifdef CONFIG_PM_GENERIC_DOMAINS_OF
+void cpg_mstp_add_clk_domain(struct device_node *np);
+int cpg_mstp_attach_dev(struct generic_pm_domain *domain, struct device *dev);
+void cpg_mstp_detach_dev(struct generic_pm_domain *domain, struct device *dev);
+#else
+static inline void cpg_mstp_add_clk_domain(struct device_node *np) {}
+#endif
+
 #endif