diff --git a/board/boundary/nitrogen8m/nitrogen8m.c b/board/boundary/nitrogen8m/nitrogen8m.c
index 7fe61989946a8d3ec9f814110704fd91a79cda99..c40be64e4898324363339450ed35759d38927b77 100644
--- a/board/boundary/nitrogen8m/nitrogen8m.c
+++ b/board/boundary/nitrogen8m/nitrogen8m.c
@@ -73,15 +73,17 @@ static iomux_v3_cfg_t const init_pads[] = {
 #define GP_EMMC_RESET			IMX_GPIO_NR(2, 10)
 	IMX8MQ_PAD_SD1_RESET_B__GPIO2_IO10 | MUX_PAD_CTRL(0x41),
 
-#define GP_CSI1_MIPI_PWDN		IMX_GPIO_NR(3, 3)
-	IMX8MQ_PAD_NAND_CE2_B__GPIO3_IO3 | MUX_PAD_CTRL(0x61),
-#define GP_CSI1_MIPI_RESET		IMX_GPIO_NR(3, 17)
-	IMX8MQ_PAD_NAND_WE_B__GPIO3_IO17 | MUX_PAD_CTRL(0x61),
-
-#define GP_CSI2_MIPI_PWDN		IMX_GPIO_NR(3, 2)
-	IMX8MQ_PAD_NAND_CE1_B__GPIO3_IO2 | MUX_PAD_CTRL(0x61),
-#define GP_CSI2_MIPI_RESET		IMX_GPIO_NR(2, 19)
-	IMX8MQ_PAD_SD2_RESET_B__GPIO2_IO19 |MUX_PAD_CTRL(0x61),
+#define GPIRQ_CSI1_TC3587		IMX_GPIO_NR(3, 3)
+#define GP_CSI1_OV5640_MIPI_POWER_DOWN	IMX_GPIO_NR(3, 3)
+	IMX8MQ_PAD_NAND_CE2_B__GPIO3_IO3 | MUX_PAD_CTRL(0x45),
+#define GP_CSI1_OV5640_MIPI_RESET	IMX_GPIO_NR(3, 17)
+	IMX8MQ_PAD_NAND_WE_B__GPIO3_IO17 | MUX_PAD_CTRL(0x05),
+
+#define GPIRQ_CSI2_TC3587		IMX_GPIO_NR(3, 2)
+#define GP_CSI2_OV5640_MIPI_POWER_DOWN	IMX_GPIO_NR(3, 2)
+	IMX8MQ_PAD_NAND_CE1_B__GPIO3_IO2 | MUX_PAD_CTRL(0x45),
+#define GP_CSI2_OV5640_MIPI_RESET	IMX_GPIO_NR(2, 19)
+	IMX8MQ_PAD_SD2_RESET_B__GPIO2_IO19 |MUX_PAD_CTRL(0x05),
 #ifdef CONFIG_FEC_MXC
 	/* PHY - AR8035 */
 	IOMUX_PAD_CTRL(ENET_MDIO__ENET_MDIO, PAD_CTRL_ENET_MDIO),
@@ -112,10 +114,10 @@ int board_early_init_f(void)
 	gpio_direction_output(GP_EMMC_RESET, 1);
 	gpio_direction_output(GP_I2C1_PCA9546_RESET, 0);
 	gpio_direction_output(GP_I2C4_SN65DSI83_EN, 0);
-	gpio_direction_output(GP_CSI1_MIPI_PWDN, 1);
-	gpio_direction_output(GP_CSI1_MIPI_RESET, 0);
-	gpio_direction_output(GP_CSI2_MIPI_PWDN, 1);
-	gpio_direction_output(GP_CSI2_MIPI_RESET, 0);
+	gpio_direction_input(GPIRQ_CSI1_TC3587);
+	gpio_direction_output(GP_CSI1_OV5640_MIPI_RESET, 0);
+	gpio_direction_input(GPIRQ_CSI2_TC3587);
+	gpio_direction_output(GP_CSI2_OV5640_MIPI_RESET, 0);
 
 	return 0;
 }