Merge tag 'mfd-next-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

Pull MFD updates from Lee Jones:
 "New Drivers:
   - Add support for Merrifield Basin Cove PMIC

  New Device Support:
   - Add support for Intel Tiger Lake to Intel LPSS PCI
   - Add support for Intel Sky Lake to Intel LPSS PCI
   - Add support for ST-Ericsson DB8520 to DB8500 PRCMU

  New Functionality:
   - Add RTC and PWRC support to MT6323

  Fix-ups:
   - Clean-up include files; davinci_voicecodec, asic3, sm501, mt6397
   - Ignore return values from debugfs_create*(); ab3100-*, ab8500-debugfs, aat2870-core
   - Device Tree changes; rn5t618, mt6397
   - Use new I2C API; tps80031, 88pm860x-core, ab3100-core, bcm590xx,
                      da9150-core, max14577, max77693, max77843, max8907,
                      max8925-i2c, max8997, max8998, palmas, twl-core,
   - Remove obsolete code; da9063, jz4740-adc
   - Simplify semantics; timberdale, htc-i2cpld
   - Add 'fall-through' tags; omap-usb-host, db8500-prcmu
   - Remove superfluous prints; ab8500-debugfs, db8500-prcmu, fsl-imx25-tsadc,
                                intel_soc_pmic_bxtwc, qcom_rpm, sm501
   - Trivial rename/whitespace/typo fixes; mt6397-core, MAINTAINERS
   - Reorganise code structure; mt6397-*
   - Improve code consistency; intel-lpss
   - Use MODULE_SOFTDEP() helper; intel-lpss
   - Use DEFINE_RES_*() helpers; mt6397-core

  Bug Fixes:
   - Clean-up resources; max77620
   - Prevent input events being dropped on resume; intel-lpss-pci
   - Prevent sleeping in IRQ context; ezx-pcap"

* tag 'mfd-next-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (48 commits)
  mfd: mt6323: Add MT6323 RTC and PWRC
  mfd: mt6323: Replace boilerplate resource code with DEFINE_RES_* macros
  mfd: mt6397: Add mutex include
  dt-bindings: mfd: mediatek: Add MT6323 Power Controller
  dt-bindings: mfd: mediatek: Update RTC to include MT6323
  dt-bindings: mfd: mediatek: mt6397: Change to relative paths
  mfd: db8500-prcmu: Support the higher DB8520 ARMSS
  mfd: intel-lpss: Use MODULE_SOFTDEP() instead of implicit request
  mfd: htc-i2cpld: Drop check because i2c_unregister_device() is NULL safe
  mfd: sm501: Include the GPIO driver header
  mfd: intel-lpss: Add Intel Skylake ACPI IDs
  mfd: intel-lpss: Consistently use GENMASK()
  mfd: Add support for Merrifield Basin Cove PMIC
  mfd: ezx-pcap: Replace mutex_lock with spin_lock
  mfd: asic3: Include the right header
  MAINTAINERS: altera-sysmgr: Fix typo in a filepath
  mfd: mt6397: Extract IRQ related code from core driver
  mfd: mt6397: Rename macros to something more readable
  mfd: Remove dev_err() usage after platform_get_irq()
  mfd: db8500-prcmu: Mark expected switch fall-throughs
  ...

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);