diff options
| author | Dan Murphy <dmurphy@ti.com> | 2011-10-12 10:15:15 -0500 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-10-01 12:59:19 +0200 |
| commit | e5d82b3f5b4bf5fc920269d2ac9bbe859a55c2ef (patch) | |
| tree | adaf33e4e151f0eea69294710c76127ed61da982 | |
| parent | 84d866fb997bac4b7d620720f41834d658691ffe (diff) | |
| download | kernel_samsung_tuna-e5d82b3f5b4bf5fc920269d2ac9bbe859a55c2ef.zip kernel_samsung_tuna-e5d82b3f5b4bf5fc920269d2ac9bbe859a55c2ef.tar.gz kernel_samsung_tuna-e5d82b3f5b4bf5fc920269d2ac9bbe859a55c2ef.tar.bz2 | |
ARM: MUX: Add csi22_dx2 and csi22_dy2 to the mux
The csi22_dx2 and csi22_dy2 is routed and the mux
needs to be updated.
Change-Id: Ica0e3b0a319423c03e5a323cd335ee278abe2e59
Signed-off-by: Dan Murphy <dmurphy@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/mux44xx.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/mux44xx.h | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h b/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h index e408d99..c209c5f 100644 --- a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h +++ b/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h @@ -941,7 +941,7 @@ #define OMAP4_CAMERARX_UNIPRO_CTRLCLKEN_SHIFT 31 #define OMAP4_CAMERARX_UNIPRO_CTRLCLKEN_MASK (1 << 31) #define OMAP4_CAMERARX_CSI22_LANEENABLE_SHIFT 29 -#define OMAP4_CAMERARX_CSI22_LANEENABLE_MASK (0x3 << 29) +#define OMAP4_CAMERARX_CSI22_LANEENABLE_MASK (0x7 << 29) #define OMAP4_CAMERARX_CSI21_LANEENABLE_SHIFT 24 #define OMAP4_CAMERARX_CSI21_LANEENABLE_MASK (0x1f << 24) #define OMAP4_CAMERARX_UNIPRO_CAMMODE_SHIFT 22 diff --git a/arch/arm/mach-omap2/mux44xx.c b/arch/arm/mach-omap2/mux44xx.c index f5a74da..0d32ff6 100644 --- a/arch/arm/mach-omap2/mux44xx.c +++ b/arch/arm/mach-omap2/mux44xx.c @@ -534,6 +534,10 @@ static struct omap_mux __initdata omap4_core_muxmodes[] = { _OMAP4_MUXENTRY(DPM_EMU19, 191, "dpm_emu19", "dmtimer11_pwm_evt", "dsi2_te1", "gpio_191", "rfbi_data0", "dispc2_data0", "hw_dbg19", "reserved"), + _OMAP4_MUXENTRY(CSI22_DX2, 0, "csi22_dx2", NULL, "cam2_fid", + NULL, NULL, NULL, NULL, "safe_mode"), + _OMAP4_MUXENTRY(CSI22_DY2, 0, "csi22_dy2", NULL, "cam2_wen", + NULL, NULL, NULL, NULL, "safe_mode"), { .reg_offset = OMAP_MUX_TERMINATOR }, }; @@ -748,6 +752,8 @@ static struct omap_ball __initdata omap4_core_cbl_ball[] = { _OMAP4_BALLENTRY(DPM_EMU17, "ab3", NULL), _OMAP4_BALLENTRY(DPM_EMU18, "ab4", NULL), _OMAP4_BALLENTRY(DPM_EMU19, "ac4", NULL), + _OMAP4_BALLENTRY(CSI22_DX2, "n27", NULL), + _OMAP4_BALLENTRY(CSI22_DY2, "m27", NULL), { .reg_offset = OMAP_MUX_TERMINATOR }, }; #else diff --git a/arch/arm/mach-omap2/mux44xx.h b/arch/arm/mach-omap2/mux44xx.h index c635026..6b11087 100644 --- a/arch/arm/mach-omap2/mux44xx.h +++ b/arch/arm/mach-omap2/mux44xx.h @@ -232,6 +232,8 @@ #define OMAP4_CTRL_MODULE_PAD_DPM_EMU17_OFFSET 0x01d0 #define OMAP4_CTRL_MODULE_PAD_DPM_EMU18_OFFSET 0x01d2 #define OMAP4_CTRL_MODULE_PAD_DPM_EMU19_OFFSET 0x01d4 +#define OMAP4_CTRL_MODULE_PAD_CSI22_DX2_OFFSET 0x01d6 +#define OMAP4_CTRL_MODULE_PAD_CSI22_DY2_OFFSET 0x01f4 /* ES2.0 only */ #define OMAP4_CTRL_MODULE_PAD_GPMC_WAIT2_OFFSET 0x008e |