Merge tag 'microblaze-v5.15' of git://git.monstr.eu/linux-2.6-microblaze

[linux-2.6-microblaze.git] / include / linux / mfd / dbx500-prcmu.h

diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
index e257104..cbf9d76 100644 (file)
--- a/include/linux/mfd/dbx500-prcmu.h
+++ b/include/linux/mfd/dbx500-prcmu.h
@@ -186,10 +186,11 @@ enum ddr_pwrst {
 #define PRCMU_FW_PROJECT_U8500_C3      8
 #define PRCMU_FW_PROJECT_U8500_C4      9
 #define PRCMU_FW_PROJECT_U9500_MBL     10
-#define PRCMU_FW_PROJECT_U8500_MBL     11 /* Customer specific */
+#define PRCMU_FW_PROJECT_U8500_SSG1    11 /* Samsung specific */
 #define PRCMU_FW_PROJECT_U8500_MBL2    12 /* Customer specific */
 #define PRCMU_FW_PROJECT_U8520         13
 #define PRCMU_FW_PROJECT_U8420         14
+#define PRCMU_FW_PROJECT_U8500_SSG2    15 /* Samsung specific */
 #define PRCMU_FW_PROJECT_U8420_SYSCLK  17
 #define PRCMU_FW_PROJECT_A9420         20
 /* [32..63] 9540 and derivatives */
@@ -321,21 +322,6 @@ static inline bool prcmu_is_ac_wake_requested(void)
        return db8500_prcmu_is_ac_wake_requested();
 }
 
-static inline int prcmu_set_display_clocks(void)
-{
-       return db8500_prcmu_set_display_clocks();
-}
-
-static inline int prcmu_disable_dsipll(void)
-{
-       return db8500_prcmu_disable_dsipll();
-}
-
-static inline int prcmu_enable_dsipll(void)
-{
-       return db8500_prcmu_enable_dsipll();
-}
-
 static inline int prcmu_config_esram0_deep_sleep(u8 state)
 {
        return db8500_prcmu_config_esram0_deep_sleep(state);
@@ -511,21 +497,6 @@ static inline bool prcmu_is_ac_wake_requested(void)
        return false;
 }
 
-static inline int prcmu_set_display_clocks(void)
-{
-       return 0;
-}
-
-static inline int prcmu_disable_dsipll(void)
-{
-       return 0;
-}
-
-static inline int prcmu_enable_dsipll(void)
-{
-       return 0;
-}
-
 static inline int prcmu_config_esram0_deep_sleep(u8 state)
 {
        return 0;