summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandor Yu <R01008@freescale.com>2014-07-04 17:13:58 +0800
committerYe Li <ye.li@nxp.com>2017-04-05 14:04:31 +0800
commitdb38481f18659a37ea81a4149566f1ff9e46b304 (patch)
treeb586e84bf256764a3b4b0dbbe3e1c8853535eca1
parent50b358a7eb30f6299923e8f35d10b77485c87472 (diff)
downloadu-boot-imx-db38481f18659a37ea81a4149566f1ff9e46b304.zip
u-boot-imx-db38481f18659a37ea81a4149566f1ff9e46b304.tar.gz
u-boot-imx-db38481f18659a37ea81a4149566f1ff9e46b304.tar.bz2
ENGR00321299 gis: clean csi0 input mux set bit in GPR
When gis enable in uboot, the CSI0 input mux select setting to vadc module, clean the bit when gis disabled. Signed-off-by: Sandor Yu <R01008@freescale.com> (cherry picked from commit ae66b17b7da3be50dc81ca636b67e8e879f52e26) (cherry picked from commit c83fd326e810c2fff44b8b02e78406d5d04c977c) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit d6e803ed5f51d31ebe7e9d178aa11f16401b7fc8) (cherry picked from commit 2065b417ae93436736e49ca66b66aa0791d003fe)
-rw-r--r--arch/arm/cpu/armv7/mx6/soc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index 8f7d1c0..d75b0cf 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -391,6 +391,7 @@ void vadc_power_up(void)
void vadc_power_down(void)
{
+ struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR;
u32 val;
/* Power down vadc ext power
@@ -399,6 +400,11 @@ void vadc_power_down(void)
val &= ~0x40000;
val |= 0x20000;
writel(val, GPC_BASE_ADDR + 0);
+
+ /* clean csi0 connect to vadc */
+ val = readl(&iomux->gpr[5]);
+ val &= ~IMX6SX_GPR5_CSI1_MUX_CTRL_MASK,
+ writel(val, &iomux->gpr[5]);
}
#endif