diff options
| author | Christian Hemp <c.hemp@phytec.de> | 2013-02-20 12:35:20 +0100 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2013-11-07 12:19:28 -0500 |
| commit | 22bb14746062bd57c4f601974ac2c4061bf0be94 (patch) | |
| tree | 45c520151c315e60555769a13dd6999cf0c743f1 /arch/arm/mach-mx6/board-mx6q_phyflex.h | |
| parent | a4aca8cb414442d01468dd03296bfff846e180cb (diff) | |
phyflex-imx6: add selection for phyCAM-P and S+
Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Diffstat (limited to 'arch/arm/mach-mx6/board-mx6q_phyflex.h')
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_phyflex.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_phyflex.h b/arch/arm/mach-mx6/board-mx6q_phyflex.h index 9a0c8e4f9228..0499d2cb53c5 100644 --- a/arch/arm/mach-mx6/board-mx6q_phyflex.h +++ b/arch/arm/mach-mx6/board-mx6q_phyflex.h @@ -223,7 +223,7 @@ static iomux_v3_cfg_t mx6q_phytec_common_pads[] = { MX6Q_PAD_EIM_DA1__IPU2_CSI1_D_8, MX6Q_PAD_EIM_DA0__IPU2_CSI1_D_9, MX6Q_PAD_EIM_EB1__IPU2_CSI1_D_10, - MX6Q_PAD_EIM_EB0__IPU2_CSI1_D_11, + MX6Q_PAD_EIM_EB0__GPIO_2_28, MX6Q_PAD_EIM_A17__IPU2_CSI1_D_12, MX6Q_PAD_EIM_A18__IPU2_CSI1_D_13, MX6Q_PAD_EIM_A19__IPU2_CSI1_D_14, @@ -234,9 +234,7 @@ static iomux_v3_cfg_t mx6q_phytec_common_pads[] = { MX6Q_PAD_EIM_A24__IPU2_CSI1_D_19, /* Enable CAM1 clocking only if it is needed for camera 1 lvds */ -#if defined (CONFIG_CAM1_LVDS) MX6Q_PAD_NANDF_CS2__CCM_CLKO2, -#endif /* PCIE_PRSNT */ MX6Q_PAD_SD1_DAT3__GPIO_1_21, |