ARM: S5PV210: Add resource definitions for MIPI CSIS

Naming changed for consistency with s5pv310 where there are two instances
of the device.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

3 files changed, 6 insertions, 5 deletions

diff --git a/arch/arm/mach-s5pv210/include/mach/irqs.h b/arch/arm/mach-s5pv210/include/mach/irqs.h
index 119b95fdc3ce..26710b35ef87 100644
--- a/arch/arm/mach-s5pv210/include/mach/irqs.h
+++ b/arch/arm/mach-s5pv210/include/mach/irqs.h
@@ -65,7 +65,7 @@
 #define IRQ_HSMMC0              S5P_IRQ_VIC1(26)
 #define IRQ_HSMMC1              S5P_IRQ_VIC1(27)
 #define IRQ_HSMMC2              S5P_IRQ_VIC1(28)
-#define IRQ_MIPICSI             S5P_IRQ_VIC1(29)
+#define IRQ_MIPI_CSIS           S5P_IRQ_VIC1(29)
 #define IRQ_MIPIDSI             S5P_IRQ_VIC1(30)
 #define IRQ_ONENAND_AUDI        S5P_IRQ_VIC1(31)
 
@@ -132,5 +132,6 @@
 #define IRQ_LCD_FIFO            IRQ_LCD0
 #define IRQ_LCD_VSYNC           IRQ_LCD1
 #define IRQ_LCD_SYSTEM          IRQ_LCD2
+#define IRQ_MIPI_CSIS0          IRQ_MIPI_CSIS
 
 #endif /* ASM_ARCH_IRQS_H */
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
index b2e0a62023ed..3611492ad681 100644
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -110,6 +110,8 @@
 #define S5PV210_PA_DMC0         (0xF0000000)
 #define S5PV210_PA_DMC1         (0xF1400000)
 
+#define S5PV210_PA_MIPI_CSIS    0xFA600000
+
 /* compatibiltiy defines. */
 #define S3C_PA_UART             S5PV210_PA_UART
 #define S3C_PA_HSMMC0           S5PV210_PA_HSMMC(0)
@@ -126,6 +128,7 @@
 #define S5P_PA_FIMC0            S5PV210_PA_FIMC0
 #define S5P_PA_FIMC1            S5PV210_PA_FIMC1
 #define S5P_PA_FIMC2            S5PV210_PA_FIMC2
+#define S5P_PA_MIPI_CSIS0       S5PV210_PA_MIPI_CSIS
 
 #define SAMSUNG_PA_ADC          S5PV210_PA_ADC
 #define SAMSUNG_PA_CFCON        S5PV210_PA_CFCON
diff --git a/arch/arm/mach-s5pv210/include/mach/regs-clock.h b/arch/arm/mach-s5pv210/include/mach/regs-clock.h
index ebaabe021af9..4c45b74def5f 100644
--- a/arch/arm/mach-s5pv210/include/mach/regs-clock.h
+++ b/arch/arm/mach-s5pv210/include/mach/regs-clock.h
@@ -161,7 +161,7 @@
 #define S5P_MDNIE_SEL           S5P_CLKREG(0x7008)
 #define S5P_MIPI_PHY_CON0       S5P_CLKREG(0x7200)
 #define S5P_MIPI_PHY_CON1       S5P_CLKREG(0x7204)
-#define S5P_MIPI_CONTROL        S5P_CLKREG(0xE814)
+#define S5P_MIPI_DPHY_CONTROL   S5P_CLKREG(0xE814)
 
 #define S5P_IDLE_CFG_TL_MASK    (3 << 30)
 #define S5P_IDLE_CFG_TM_MASK    (3 << 28)
@@ -195,9 +195,6 @@
 #define S5P_OTHERS_RET_UART             (1 << 28)
 #define S5P_OTHERS_USB_SIG_MASK         (1 << 16)
 
-/* MIPI */
-#define S5P_MIPI_DPHY_EN                (3)
-
 /* S5P_DAC_CONTROL */
 #define S5P_DAC_ENABLE                  (1)
 #define S5P_DAC_DISABLE                 (0)