diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 10:44:13 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 10:44:13 +0900 |
| commit | 724c35cf530651f68f5958dc02e0b49ac6661226 (patch) | |
| tree | 7511b55f0efc07495a559f48b3071a34f0bfaff3 /arch/arm/mach-s5pv210/include/mach/regs-clock.h | |
| parent | 57ca51514905b7aea532977e4e87e989d33bfcbb (diff) | |
| parent | 3bbef1b912df64a86a86e402d7686a8ed38abaf4 (diff) | |
Merge branch 'next-s5p' into for-next-new
Diffstat (limited to 'arch/arm/mach-s5pv210/include/mach/regs-clock.h')
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/regs-clock.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-s5pv210/include/mach/regs-clock.h b/arch/arm/mach-s5pv210/include/mach/regs-clock.h index ebaabe021af..4c45b74def5 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) |