summaryrefslogtreecommitdiff
path: root/drivers/video/mxc_gis.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/mxc_gis.c')
-rw-r--r--drivers/video/mxc_gis.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/video/mxc_gis.c b/drivers/video/mxc_gis.c
index 7b07198..64c1b9a 100644
--- a/drivers/video/mxc_gis.c
+++ b/drivers/video/mxc_gis.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2014-2016 Freescale Semiconductor, Inc. All Rights Reserved.
*
* SPDX-License-Identifier: GPL-2.0+
*/
@@ -301,6 +301,20 @@ void mxc_enable_gis(void)
u32 csimemsize, pxpmemsize;
char const *gis_input = getenv("gis");
+#ifdef CONFIG_MX6
+ if (check_module_fused(MX6_MODULE_CSI)) {
+ printf("CSI@0x%x is fused, disable it\n", CSI1_BASE_ADDR);
+ return;
+ }
+#endif
+
+#ifdef CONFIG_MX6
+ if (check_module_fused(MX6_MODULE_PXP)) {
+ printf("PXP@0x%x is fused, disable it\n", PXP_BASE_ADDR);
+ return;
+ }
+#endif
+
gis_regs = (struct mxs_gis_regs *)GIS_BASE_ADDR;
pxp_regs = (struct mxs_pxp_regs *)PXP_BASE_ADDR;
csi_regs = (struct mxs_csi_regs *)CSI1_BASE_ADDR;