Merge tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[pandora-kernel.git] / arch / arm / mach-exynos / regs-pmu.h

diff --git a/arch/arm/mach-exynos/regs-pmu.h b/arch/arm/mach-exynos/regs-pmu.h
index b5f4406..eb461e1 100644 (file)
--- a/arch/arm/mach-exynos/regs-pmu.h
+++ b/arch/arm/mach-exynos/regs-pmu.h
@@ -160,12 +160,14 @@
 #define EXYNOS5_L2RSTDISABLE_VALUE             BIT(3)
 
 #define S5P_PAD_RET_MAUDIO_OPTION              0x3028
+#define S5P_PAD_RET_MMC2_OPTION                        0x30c8
 #define S5P_PAD_RET_GPIO_OPTION                        0x3108
 #define S5P_PAD_RET_UART_OPTION                        0x3128
 #define S5P_PAD_RET_MMCA_OPTION                        0x3148
 #define S5P_PAD_RET_MMCB_OPTION                        0x3168
 #define S5P_PAD_RET_EBIA_OPTION                        0x3188
 #define S5P_PAD_RET_EBIB_OPTION                        0x31A8
+#define S5P_PAD_RET_SPI_OPTION                 0x31c8
 
 #define S5P_PS_HOLD_CONTROL                    0x330C
 #define S5P_PS_HOLD_EN                         (1 << 31)
@@ -326,6 +328,7 @@
                        (EXYNOS3_ARM_CORE0_OPTION + ((_nr) * 0x80))
 
 #define EXYNOS3_ARM_COMMON_OPTION                      0x2408
+#define EXYNOS3_ARM_L2_OPTION                          0x2608
 #define EXYNOS3_TOP_PWR_OPTION                         0x2C48
 #define EXYNOS3_CORE_TOP_PWR_OPTION                    0x2CA8
 #define EXYNOS3_XUSBXTI_DURATION                       0x341C