Merge branch 'parisc-4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[firefly-linux-kernel-4.4.55.git] / drivers / clk / qcom / gcc-msm8974.c

diff --git a/drivers/clk/qcom/gcc-msm8974.c b/drivers/clk/qcom/gcc-msm8974.c
index 2bcf87538f9d7e34700d1a2e21b366e1618d4a5e..28abb8f8f293d1c3ad373139796d4725bd040e77 100644 (file)
--- a/drivers/clk/qcom/gcc-msm8974.c
+++ b/drivers/clk/qcom/gcc-msm8974.c
@@ -31,6 +31,7 @@
 #include "clk-rcg.h"
 #include "clk-branch.h"
 #include "reset.h"
+#include "gdsc.h"
 
 enum {
        P_XO,
@@ -2432,6 +2433,14 @@ static struct clk_branch gcc_usb_hsic_system_clk = {
        },
 };
 
+static struct gdsc usb_hs_hsic_gdsc = {
+       .gdscr = 0x404,
+       .pd = {
+               .name = "usb_hs_hsic",
+       },
+       .pwrsts = PWRSTS_OFF_ON,
+};
+
 static struct clk_regmap *gcc_msm8974_clocks[] = {
        [GPLL0] = &gpll0.clkr,
        [GPLL0_VOTE] = &gpll0_vote,
@@ -2661,6 +2670,10 @@ static const struct qcom_reset_map gcc_msm8974_resets[] = {
        [GCC_VENUS_RESTART] = { 0x1740 },
 };
 
+static struct gdsc *gcc_msm8974_gdscs[] = {
+       [USB_HS_HSIC_GDSC] = &usb_hs_hsic_gdsc,
+};
+
 static const struct regmap_config gcc_msm8974_regmap_config = {
        .reg_bits       = 32,
        .reg_stride     = 4,
@@ -2675,6 +2688,8 @@ static const struct qcom_cc_desc gcc_msm8974_desc = {
        .num_clks = ARRAY_SIZE(gcc_msm8974_clocks),
        .resets = gcc_msm8974_resets,
        .num_resets = ARRAY_SIZE(gcc_msm8974_resets),
+       .gdscs = gcc_msm8974_gdscs,
+       .num_gdscs = ARRAY_SIZE(gcc_msm8974_gdscs),
 };
 
 static const struct of_device_id gcc_msm8974_match_table[] = {
@@ -2729,15 +2744,8 @@ static int gcc_msm8974_probe(struct platform_device *pdev)
        return qcom_cc_probe(pdev, &gcc_msm8974_desc);
 }
 
-static int gcc_msm8974_remove(struct platform_device *pdev)
-{
-       qcom_cc_remove(pdev);
-       return 0;
-}
-
 static struct platform_driver gcc_msm8974_driver = {
        .probe          = gcc_msm8974_probe,
-       .remove         = gcc_msm8974_remove,
        .driver         = {
                .name   = "gcc-msm8974",
                .of_match_table = gcc_msm8974_match_table,