power: avs: cpr: fix with new reg_sequence structures

BugLink: http://bugs.launchpad.net/bugs/1763040
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
(cherry picked from commit 9c916989b35efff5e578786accee3ef1c7de032b
http://git.linaro.org/landing-teams/working/qualcomm/kernel.git release/qcomlt-4.14)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/drivers/power/avs/qcom-cpr.c b/drivers/power/avs/qcom-cpr.c
index 1e3bfa2b5ac8558f53faa27b98e78b644fe92889..46bba451410138fcd7bea51658cecbe61ab34c5b 100644 (file)
--- a/drivers/power/avs/qcom-cpr.c
+++ b/drivers/power/avs/qcom-cpr.c
@@ -270,8 +270,8 @@ struct acc_desc {
        unsigned int    enable_reg;
        u32             enable_mask;
 
-       struct reg_default      *settings;
-       struct reg_default      *override_settings;
+       struct reg_sequence     *settings;
+       struct reg_sequence     *override_settings;
        int                     num_regs_per_fuse;
 
        struct qfprom_offset    override;
@@ -284,7 +284,7 @@ struct fuse_corner {
        int uV;
        int quot;
        int step_quot;
-       const struct reg_default *accs;
+       const struct reg_sequence *accs;
        int num_accs;
        int vdd_mx_req;
        unsigned long max_freq;
@@ -1102,7 +1102,7 @@ static void cpr_fuse_corner_init(struct cpr_drv *drv,
        int uV, diff;
        u32 min_uV;
        u8 expected;
-       const struct reg_default *accs;
+       const struct reg_sequence *accs;
 
        redun = &acc_desc->override;
        expected = acc_desc->override_value;
@@ -1786,12 +1786,12 @@ static const struct cpr_desc msm8916_desc = {
 };
 
 static const struct acc_desc msm8916_acc_desc = {
-       .settings = (struct reg_default[]){
+       .settings = (struct reg_sequence[]){
                { 0xf000, 0 },
                { 0xf000, 0x100 },
                { 0xf000, 0x101 }
        },
-       .override_settings = (struct reg_default[]){
+       .override_settings = (struct reg_sequence[]){
                { 0xf000, 0 },
                { 0xf000, 0x100 },
                { 0xf000, 0x100 }