Merge remote-tracking branch 'clk/clk-next'

[deliverable/linux.git] / drivers / clk / qcom / gcc-msm8996.c

diff --git a/drivers/clk/qcom/gcc-msm8996.c b/drivers/clk/qcom/gcc-msm8996.c
index bbf732bbc3fdc37dd79fd6475461356e64b85538..ebe5d187fa1b80cdf1b4804c53201451fc789fae 100644 (file)
--- a/drivers/clk/qcom/gcc-msm8996.c
+++ b/drivers/clk/qcom/gcc-msm8996.c
@@ -2592,9 +2592,9 @@ static struct clk_branch gcc_pcie_2_aux_clk = {
 };
 
 static struct clk_branch gcc_pcie_2_pipe_clk = {
-       .halt_reg = 0x6e108,
+       .halt_reg = 0x6e018,
        .clkr = {
-               .enable_reg = 0x6e108,
+               .enable_reg = 0x6e018,
                .enable_mask = BIT(0),
                .hw.init = &(struct clk_init_data){
                        .name = "gcc_pcie_2_pipe_clk",
@@ -3404,6 +3404,8 @@ static const struct qcom_reset_map gcc_msm8996_resets[] = {
        [GCC_PCIE_2_BCR] = { 0x6e000 },
        [GCC_PCIE_2_PHY_BCR] = { 0x6e038 },
        [GCC_PCIE_PHY_BCR] = { 0x6f000 },
+       [GCC_PCIE_PHY_COM_BCR] = { 0x6f014 },
+       [GCC_PCIE_PHY_COM_NOCSR_BCR] = { 0x6f00c },
        [GCC_DCD_BCR] = { 0x70000 },
        [GCC_OBT_ODT_BCR] = { 0x73000 },
        [GCC_UFS_BCR] = { 0x75000 },
@@ -3447,9 +3449,8 @@ MODULE_DEVICE_TABLE(of, gcc_msm8996_match_table);
 
 static int gcc_msm8996_probe(struct platform_device *pdev)
 {
-       struct clk *clk;
        struct device *dev = &pdev->dev;
-       int i;
+       int i, ret;
        struct regmap *regmap;
 
        regmap = qcom_cc_map(pdev, &gcc_msm8996_desc);
@@ -3463,9 +3464,9 @@ static int gcc_msm8996_probe(struct platform_device *pdev)
        regmap_update_bits(regmap, 0x52008, BIT(21), BIT(21));
 
        for (i = 0; i < ARRAY_SIZE(gcc_msm8996_hws); i++) {
-               clk = devm_clk_register(dev, gcc_msm8996_hws[i]);
-               if (IS_ERR(clk))
-                       return PTR_ERR(clk);
+               ret = devm_clk_hw_register(dev, gcc_msm8996_hws[i]);
+               if (ret)
+                       return ret;
        }
 
        return qcom_cc_really_probe(pdev, &gcc_msm8996_desc, regmap);