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

[linux-2.6-microblaze.git] / drivers / mfd / db8500-prcmu.c

diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 287da20..c1d3e7c 100644 (file)
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -37,7 +37,7 @@
 #include <linux/regulator/db8500-prcmu.h>
 #include <linux/regulator/machine.h>
 #include <linux/platform_data/ux500_wdt.h>
-#include "dbx500-prcmu-regs.h"
+#include "db8500-prcmu-regs.h"
 
 /* Index of different voltages to be used when accessing AVSData */
 #define PRCM_AVS_BASE          0x2FC
@@ -1622,22 +1622,20 @@ static long round_clock_rate(u8 clock, unsigned long rate)
 }
 
 static const unsigned long db8500_armss_freqs[] = {
-       200000000,
-       400000000,
-       800000000,
+       199680000,
+       399360000,
+       798720000,
        998400000
 };
 
 /* The DB8520 has slightly higher ARMSS max frequency */
 static const unsigned long db8520_armss_freqs[] = {
-       200000000,
-       400000000,
-       800000000,
+       199680000,
+       399360000,
+       798720000,
        1152000000
 };
 
-
-
 static long round_armss_rate(unsigned long rate)
 {
        unsigned long freq = 0;
@@ -2567,14 +2565,16 @@ static char *fw_project_name(u32 project)
                return "U8500 C4";
        case PRCMU_FW_PROJECT_U9500_MBL:
                return "U9500 MBL";
-       case PRCMU_FW_PROJECT_U8500_MBL:
-               return "U8500 MBL";
+       case PRCMU_FW_PROJECT_U8500_SSG1:
+               return "U8500 Samsung 1";
        case PRCMU_FW_PROJECT_U8500_MBL2:
                return "U8500 MBL2";
        case PRCMU_FW_PROJECT_U8520:
                return "U8520 MBL";
        case PRCMU_FW_PROJECT_U8420:
                return "U8420";
+       case PRCMU_FW_PROJECT_U8500_SSG2:
+               return "U8500 Samsung 2";
        case PRCMU_FW_PROJECT_U8420_SYSCLK:
                return "U8420-sysclk";
        case PRCMU_FW_PROJECT_U9540:
@@ -2951,14 +2951,13 @@ static const struct mfd_cell common_prcmu_devs[] = {
                .pdata_size = sizeof(db8500_wdt_pdata),
                .id = -1,
        },
+       MFD_CELL_NAME("db8500-cpuidle"),
 };
 
 static const struct mfd_cell db8500_prcmu_devs[] = {
        MFD_CELL_OF("db8500-prcmu-regulators", NULL,
                    &db8500_regulators, sizeof(db8500_regulators), 0,
                    "stericsson,db8500-prcmu-regulator"),
-       MFD_CELL_OF("cpuidle-dbx500",
-                   NULL, NULL, 0, 0, "stericsson,cpuidle-dbx500"),
        MFD_CELL_OF("db8500-thermal",
                    NULL, NULL, 0, 0, "stericsson,db8500-thermal"),
 };