1 files changed, 36 insertions, 8 deletions

diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 90e0f21bc49c..0e019cc5da42 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -1695,21 +1695,41 @@ static long round_clock_rate(u8 clock, unsigned long rate)
         return rounded_rate;
 }
 
-static const unsigned long armss_freqs[] = {
+static const unsigned long db8500_armss_freqs[] = {
         200000000,
         400000000,
         800000000,
         998400000
 };
 
+/* The DB8520 has slightly higher ARMSS max frequency */
+static const unsigned long db8520_armss_freqs[] = {
+        200000000,
+        400000000,
+        800000000,
+        1152000000
+};
+
+
+
 static long round_armss_rate(unsigned long rate)
 {
         unsigned long freq = 0;
+        const unsigned long *freqs;
+        int nfreqs;
         int i;
 
+        if (fw_info.version.project == PRCMU_FW_PROJECT_U8520) {
+                freqs = db8520_armss_freqs;
+                nfreqs = ARRAY_SIZE(db8520_armss_freqs);
+        } else {
+                freqs = db8500_armss_freqs;
+                nfreqs = ARRAY_SIZE(db8500_armss_freqs);
+        }
+
         /* Find the corresponding arm opp from the cpufreq table. */
-        for (i = 0; i < ARRAY_SIZE(armss_freqs); i++) {
-                freq = armss_freqs[i];
+        for (i = 0; i < nfreqs; i++) {
+                freq = freqs[i];
                 if (rate <= freq)
                         break;
         }
@@ -1854,11 +1874,21 @@ static int set_armss_rate(unsigned long rate)
 {
         unsigned long freq;
         u8 opps[] = { ARM_EXTCLK, ARM_50_OPP, ARM_100_OPP, ARM_MAX_OPP };
+        const unsigned long *freqs;
+        int nfreqs;
         int i;
 
+        if (fw_info.version.project == PRCMU_FW_PROJECT_U8520) {
+                freqs = db8520_armss_freqs;
+                nfreqs = ARRAY_SIZE(db8520_armss_freqs);
+        } else {
+                freqs = db8500_armss_freqs;
+                nfreqs = ARRAY_SIZE(db8500_armss_freqs);
+        }
+
         /* Find the corresponding arm opp from the cpufreq table. */
-        for (i = 0; i < ARRAY_SIZE(armss_freqs); i++) {
-                freq = armss_freqs[i];
+        for (i = 0; i < nfreqs; i++) {
+                freq = freqs[i];
                 if (rate == freq)
                         break;
         }
@@ -3130,10 +3160,8 @@ static int db8500_prcmu_probe(struct platform_device *pdev)
         writel(ALL_MBOX_BITS, PRCM_ARM_IT1_CLR);
 
         irq = platform_get_irq(pdev, 0);
-        if (irq <= 0) {
-                dev_err(&pdev->dev, "no prcmu irq provided\n");
+        if (irq <= 0)
                 return irq;
-        }
 
         err = request_threaded_irq(irq, prcmu_irq_handler,
                 prcmu_irq_thread_fn, IRQF_NO_SUSPEND, "prcmu", NULL);