From de22784ce1e1db581c2ca68514bf839b32e86abf Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Thu, 21 May 2020 09:27:18 -0500 Subject: [PATCH] boards: arm: Conditionalize display pinmuxes on nxp boards Conditionalizes display pinmuxes on CONFIG_DISPLAY for all nxp boards (kinetis, lpc, and imx families) to avoid possible conflicts between peripherals. Signed-off-by: Maureen Helm --- boards/arm/mimxrt1050_evk/pinmux.c | 2 +- boards/arm/mimxrt1060_evk/pinmux.c | 2 +- boards/arm/mimxrt1064_evk/pinmux.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boards/arm/mimxrt1050_evk/pinmux.c b/boards/arm/mimxrt1050_evk/pinmux.c index 9aebb3e090c..8afad26686a 100644 --- a/boards/arm/mimxrt1050_evk/pinmux.c +++ b/boards/arm/mimxrt1050_evk/pinmux.c @@ -249,7 +249,7 @@ static int mimxrt1050_evk_init(struct device *dev) GPIO_WritePinOutput(GPIO1, 9, 0); #endif -#if DT_NODE_HAS_STATUS(DT_NODELABEL(lcdif), okay) +#if DT_NODE_HAS_STATUS(DT_NODELABEL(lcdif), okay) && CONFIG_DISPLAY IOMUXC_SetPinMux(IOMUXC_GPIO_B0_00_LCD_CLK, 0); IOMUXC_SetPinMux(IOMUXC_GPIO_B0_01_LCD_ENABLE, 0); IOMUXC_SetPinMux(IOMUXC_GPIO_B0_02_LCD_HSYNC, 0); diff --git a/boards/arm/mimxrt1060_evk/pinmux.c b/boards/arm/mimxrt1060_evk/pinmux.c index 1124f15db66..961ea3c4d2a 100644 --- a/boards/arm/mimxrt1060_evk/pinmux.c +++ b/boards/arm/mimxrt1060_evk/pinmux.c @@ -204,7 +204,7 @@ static int mimxrt1060_evk_init(struct device *dev) GPIO_WritePinOutput(GPIO1, 9, 0); #endif -#if DT_NODE_HAS_STATUS(DT_NODELABEL(lcdif), okay) +#if DT_NODE_HAS_STATUS(DT_NODELABEL(lcdif), okay) && CONFIG_DISPLAY IOMUXC_SetPinMux(IOMUXC_GPIO_B0_00_LCD_CLK, 0); IOMUXC_SetPinMux(IOMUXC_GPIO_B0_01_LCD_ENABLE, 0); IOMUXC_SetPinMux(IOMUXC_GPIO_B0_02_LCD_HSYNC, 0); diff --git a/boards/arm/mimxrt1064_evk/pinmux.c b/boards/arm/mimxrt1064_evk/pinmux.c index 06ebe2c2c8a..88fc0975a73 100644 --- a/boards/arm/mimxrt1064_evk/pinmux.c +++ b/boards/arm/mimxrt1064_evk/pinmux.c @@ -130,7 +130,7 @@ static int mimxrt1064_evk_init(struct device *dev) IOMUXC_SW_PAD_CTL_PAD_DSE(6)); #endif -#if DT_NODE_HAS_STATUS(DT_NODELABEL(lcdif), okay) +#if DT_NODE_HAS_STATUS(DT_NODELABEL(lcdif), okay) && CONFIG_DISPLAY IOMUXC_SetPinMux(IOMUXC_GPIO_B0_00_LCD_CLK, 0); IOMUXC_SetPinMux(IOMUXC_GPIO_B0_01_LCD_ENABLE, 0); IOMUXC_SetPinMux(IOMUXC_GPIO_B0_02_LCD_HSYNC, 0);