mfd: ab8500-sysctrl: AB8505 doesn't have SYSCLKREQ5..8

So we're removing support for it.

Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Tested-by: Marcus COOPER <marcus.xm.cooper@stericsson.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>

1 files changed, 22 insertions, 15 deletions

diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c
index f43c42b9f32c..272479cdb107 100644
--- a/drivers/mfd/ab8500-sysctrl.c
+++ b/drivers/mfd/ab8500-sysctrl.c
@@ -182,9 +182,9 @@ EXPORT_SYMBOL(ab8500_sysctrl_write);
 
 static int ab8500_sysctrl_probe(struct platform_device *pdev)
 {
+        struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
         struct ab8500_platform_data *plat;
         struct ab8500_sysctrl_platform_data *pdata;
-        int ret, i, j;
 
         plat = dev_get_platdata(pdev->dev.parent);
 
@@ -196,20 +196,27 @@ static int ab8500_sysctrl_probe(struct platform_device *pdev)
 
         pdata = plat->sysctrl;
 
-
-        for (i = AB8500_SYSCLKREQ1RFCLKBUF;
-             i <= AB8500_SYSCLKREQ8RFCLKBUF; i++) {
-                j = i - AB8500_SYSCLKREQ1RFCLKBUF;
-                ret = ab8500_sysctrl_write(i, 0xff,
-                                pdata->initial_req_buf_config[j]);
-                dev_dbg(&pdev->dev,
-                                "Setting SysClkReq%dRfClkBuf 0x%X\n",
-                                j + 1,
-                                pdata->initial_req_buf_config[j]);
-                if (ret < 0) {
-                        dev_err(&pdev->dev,
-                                "unable to set sysClkReq%dRfClkBuf: "
-                                "%d\n", j + 1, ret);
+        if (pdata) {
+                int last, ret, i, j;
+
+                if (is_ab8505(ab8500))
+                        last = AB8500_SYSCLKREQ4RFCLKBUF;
+                else
+                        last = AB8500_SYSCLKREQ8RFCLKBUF;
+
+                for (i = AB8500_SYSCLKREQ1RFCLKBUF; i <= last; i++) {
+                        j = i - AB8500_SYSCLKREQ1RFCLKBUF;
+                        ret = ab8500_sysctrl_write(i, 0xff,
+                                        pdata->initial_req_buf_config[j]);
+                        dev_dbg(&pdev->dev,
+                                        "Setting SysClkReq%dRfClkBuf 0x%X\n",
+                                        j + 1,
+                                        pdata->initial_req_buf_config[j]);
+                        if (ret < 0) {
+                                dev_err(&pdev->dev,
+                                        "unable to set sysClkReq%dRfClkBuf: "
+                                        "%d\n", j + 1, ret);
+                        }
                 }
         }