boards: arm: Conditionalize i2c pinmuxes on nxp boards

Conditionalizes i2c pinmuxes on CONFIG_I2C for all nxp boards (kinetis,
lpc, and imx families) to avoid possible conflicts between peripherals.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
This commit is contained in:
Maureen Helm 2020-05-21 08:52:08 -05:00 committed by Carles Cufí
commit 5c2d8f3e2a
23 changed files with 36 additions and 36 deletions

View file

@ -48,7 +48,7 @@ static int colibri_imx7d_m4_pinmux_init(struct device *dev)
IOMUXC_UART2_RX_DATA_SELECT_INPUT_DAISY(3);
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay) && CONFIG_I2C
IOMUXC_SW_MUX_CTL_PAD_I2C1_SCL =
IOMUXC_SW_MUX_CTL_PAD_I2C1_SCL_MUX_MODE(0) |
IOMUXC_SW_MUX_CTL_PAD_I2C1_SCL_SION_MASK;
@ -72,7 +72,7 @@ static int colibri_imx7d_m4_pinmux_init(struct device *dev)
IOMUXC_SW_PAD_CTL_PAD_I2C1_SDA_HYS_MASK;
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay) && CONFIG_I2C
IOMUXC_SW_MUX_CTL_PAD_I2C2_SCL =
IOMUXC_SW_MUX_CTL_PAD_I2C2_SCL_MUX_MODE(0) |
IOMUXC_SW_MUX_CTL_PAD_I2C2_SCL_SION_MASK;
@ -96,7 +96,7 @@ static int colibri_imx7d_m4_pinmux_init(struct device *dev)
IOMUXC_SW_PAD_CTL_PAD_I2C2_SDA_HYS_MASK;
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c3), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c3), okay) && CONFIG_I2C
IOMUXC_SW_MUX_CTL_PAD_I2C3_SCL =
IOMUXC_SW_MUX_CTL_PAD_I2C3_SCL_MUX_MODE(0) |
IOMUXC_SW_MUX_CTL_PAD_I2C3_SCL_SION_MASK;
@ -120,7 +120,7 @@ static int colibri_imx7d_m4_pinmux_init(struct device *dev)
IOMUXC_SW_PAD_CTL_PAD_I2C3_SDA_HYS_MASK;
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c4), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c4), okay) && CONFIG_I2C
IOMUXC_SW_MUX_CTL_PAD_ENET1_RGMII_TD2 =
IOMUXC_SW_MUX_CTL_PAD_ENET1_RGMII_TD2_MUX_MODE(3) |
IOMUXC_SW_MUX_CTL_PAD_ENET1_RGMII_TD2_SION_MASK;

View file

@ -73,7 +73,7 @@ static int frdm_k22f_pinmux_init(struct device *dev)
pinmux_pin_set(portc, 11, PORT_PCR_MUX(kPORT_MuxAsGpio));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c0), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c0), okay) && CONFIG_I2C
/* I2C0 SCL, SDA */
pinmux_pin_set(portb, 2, PORT_PCR_MUX(kPORT_MuxAlt2)
| PORT_PCR_ODE_MASK);

View file

@ -109,7 +109,7 @@ static int frdm_k64f_pinmux_init(struct device *dev)
pinmux_pin_set(portd, 3, PORT_PCR_MUX(kPORT_MuxAlt2));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c0), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c0), okay) && CONFIG_I2C
/* I2C0 SCL, SDA */
pinmux_pin_set(porte, 24, PORT_PCR_MUX(kPORT_MuxAlt5)
| PORT_PCR_ODE_MASK);

View file

@ -52,7 +52,7 @@ static int frdm_k82f_pinmux_init(struct device *dev)
/* FXOS8700 INT1 */
pinmux_pin_set(portc, 13, PORT_PCR_MUX(kPORT_MuxAsGpio));
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c3), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c3), okay) && CONFIG_I2C
/* I2C3 SDA, SCL */
pinmux_pin_set(porta, 1, PORT_PCR_MUX(kPORT_MuxAlt4)
| PORT_PCR_ODE_MASK);

View file

@ -38,7 +38,7 @@ config PINMUX_MCUX_PORTD
default y
config PINMUX_MCUX_PORTE
default y if "$(dt_nodelabel_enabled,i2c0)"
default y if "$(dt_nodelabel_enabled,i2c0)" && I2C
endif # PINMUX_MCUX

View file

@ -52,7 +52,7 @@ static int frdm_kl25z_pinmux_init(struct device *dev)
pinmux_pin_set(porta, 14, PORT_PCR_MUX(kPORT_MuxAsGpio));
pinmux_pin_set(porta, 15, PORT_PCR_MUX(kPORT_MuxAsGpio));
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c0), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c0), okay) && CONFIG_I2C
/* I2C0 SCL, SDA */
pinmux_pin_set(porte, 24, PORT_PCR_MUX(kPORT_MuxAlt5)
| PORT_PCR_PS_MASK);

View file

@ -38,7 +38,7 @@ static int frdm_kw41z_pinmux_init(struct device *dev)
pinmux_pin_set(porta, 18, PORT_PCR_MUX(kPORT_MuxAsGpio));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay) && CONFIG_I2C
/* I2C1 SCL, SDA */
pinmux_pin_set(portc, 2, PORT_PCR_MUX(kPORT_MuxAlt3)
| PORT_PCR_PS_MASK);

View file

@ -42,7 +42,7 @@ static int hexiwear_k64_pinmux_init(struct device *dev)
pinmux_pin_set(portd, 0, PORT_PCR_MUX(kPORT_MuxAsGpio));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c0), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c0), okay) && CONFIG_I2C
/* I2C0 SCL, SDA - heart rate, light, humidity */
pinmux_pin_set(portb, 0, PORT_PCR_MUX(kPORT_MuxAlt2)
| PORT_PCR_ODE_MASK);
@ -58,7 +58,7 @@ static int hexiwear_k64_pinmux_init(struct device *dev)
gpio_pin_configure(gpiob, 12, GPIO_OUTPUT_LOW);
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay) && CONFIG_I2C
/* I2C1 SCL, SDA - accel/mag, gyro, pressure */
pinmux_pin_set(portc, 10, PORT_PCR_MUX(kPORT_MuxAlt2)
| PORT_PCR_ODE_MASK);

View file

@ -27,7 +27,7 @@ config PINMUX_MCUX_PORTB
config PINMUX_MCUX_PORTC
default y if "$(dt_nodelabel_enabled,lpuart0)" && SERIAL
default y if "$(dt_nodelabel_enabled,i2c1)"
default y if "$(dt_nodelabel_enabled,i2c1)" && I2C
endif # PINMUX_MCUX

View file

@ -28,7 +28,7 @@ static int hexiwear_kw40z_pinmux_init(struct device *dev)
pinmux_pin_set(portc, 7, PORT_PCR_MUX(kPORT_MuxAlt4));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay) && CONFIG_I2C
/* I2C1 SCL, SDA */
pinmux_pin_set(portc, 6, PORT_PCR_MUX(kPORT_MuxAlt3)
| PORT_PCR_PS_MASK);

View file

@ -107,7 +107,7 @@ static int lpcxpresso_54114_pinmux_init(struct device *dev)
pinmux_pin_set(port1, 10, port1_pin10_config);
#endif
#if DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm4), nxp_lpc_i2c, okay)
#if DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm4), nxp_lpc_i2c, okay) && CONFIG_I2C
/* PORT0 PIN25 is configured as FC4_RTS_SCL_SSEL1 */
pinmux_pin_set(port0, 25, IOCON_PIO_FUNC1 |
IOCON_PIO_I2CSLEW_I2C |

View file

@ -117,7 +117,7 @@ static int lpcxpresso_55s16_pinmux_init(struct device *dev)
pinmux_pin_set(port0, 30, port0_pin30_config);
#endif
#if DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm4), nxp_lpc_i2c, okay)
#if DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm4), nxp_lpc_i2c, okay) && CONFIG_I2C
/* PORT1 PIN20 is configured as FC4_TXD_SCL_MISO_WS */
pinmux_pin_set(port1, 20, IOCON_PIO_FUNC5 |
IOCON_PIO_MODE_INACT |

View file

@ -88,7 +88,7 @@ static int lpcxpresso_55s69_pinmux_init(struct device *dev)
pinmux_pin_set(port1, DT_GPIO_PIN(DT_ALIAS(sw2), gpios), sw2_config);
#endif
#if DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm4), nxp_lpc_i2c, okay)
#if DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm4), nxp_lpc_i2c, okay) && CONFIG_I2C
/* PORT1 PIN20 is configured as FC4_TXD_SCL_MISO_WS */
pinmux_pin_set(port1, 20, IOCON_PIO_FUNC5 |
IOCON_PIO_MODE_INACT |

View file

@ -52,7 +52,7 @@ static int mimxrt1010_evk_init(struct device *dev)
IOMUXC_SW_PAD_CTL_PAD_DSE(6));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay) && CONFIG_I2C
/* LPI2C1 SCL, SDA */
IOMUXC_SetPinMux(IOMUXC_GPIO_01_LPI2C1_SDA, 1);
IOMUXC_SetPinMux(IOMUXC_GPIO_02_LPI2C1_SCL, 1);

View file

@ -66,7 +66,7 @@ static int mimxrt1020_evk_init(struct device *dev)
IOMUXC_SW_PAD_CTL_PAD_DSE(6));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay) && CONFIG_I2C
/* LPI2C1 SCL, SDA */
IOMUXC_SetPinMux(IOMUXC_GPIO_AD_B1_14_LPI2C1_SCL, 1);
IOMUXC_SetPinMux(IOMUXC_GPIO_AD_B1_15_LPI2C1_SDA, 1);
@ -86,7 +86,7 @@ static int mimxrt1020_evk_init(struct device *dev)
IOMUXC_SW_PAD_CTL_PAD_DSE(6));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c4), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c4), okay) && CONFIG_I2C
/* LPI2C4 SCL, SDA */
IOMUXC_SetPinMux(IOMUXC_GPIO_SD_B1_02_LPI2C4_SCL, 1);
IOMUXC_SetPinMux(IOMUXC_GPIO_SD_B1_03_LPI2C4_SDA, 1);

View file

@ -163,7 +163,7 @@ static int mimxrt1050_evk_init(struct device *dev)
IOMUXC_SW_PAD_CTL_PAD_DSE(6));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay) && CONFIG_I2C
/* LPI2C1 SCL, SDA */
IOMUXC_SetPinMux(IOMUXC_GPIO_AD_B1_00_LPI2C1_SCL, 1);
IOMUXC_SetPinMux(IOMUXC_GPIO_AD_B1_01_LPI2C1_SDA, 1);

View file

@ -146,7 +146,7 @@ static int mimxrt1060_evk_init(struct device *dev)
IOMUXC_SW_PAD_CTL_PAD_DSE(6));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay) && CONFIG_I2C
/* LPI2C1 SCL, SDA */
IOMUXC_SetPinMux(IOMUXC_GPIO_AD_B1_00_LPI2C1_SCL, 1);
IOMUXC_SetPinMux(IOMUXC_GPIO_AD_B1_01_LPI2C1_SDA, 1);

View file

@ -189,7 +189,7 @@ static int mimxrt1064_evk_init(struct device *dev)
GPIO_PinInit(GPIO2, 31, &config);
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay) && CONFIG_I2C
/* LPI2C1 SCL, SDA */
IOMUXC_SetPinMux(IOMUXC_GPIO_AD_B1_00_LPI2C1_SCL, 1);
IOMUXC_SetPinMux(IOMUXC_GPIO_AD_B1_01_LPI2C1_SDA, 1);

View file

@ -149,7 +149,7 @@ static int mm_swiftio_init(struct device *dev)
IOMUXC_SW_PAD_CTL_PAD_DSE(6));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay) && CONFIG_I2C
IOMUXC_SetPinMux(IOMUXC_GPIO_AD_B1_00_LPI2C1_SCL, 1);
IOMUXC_SetPinMux(IOMUXC_GPIO_AD_B1_01_LPI2C1_SDA, 1);
@ -168,7 +168,7 @@ static int mm_swiftio_init(struct device *dev)
IOMUXC_SW_PAD_CTL_PAD_DSE(6));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c3), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c3), okay) && CONFIG_I2C
IOMUXC_SetPinMux(IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL, 1);
IOMUXC_SetPinMux(IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA, 1);

View file

@ -81,7 +81,7 @@ static int pico_pi_m4_pinmux_init(struct device *dev)
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay) && CONFIG_I2C
IOMUXC_SW_MUX_CTL_PAD_UART1_RX_DATA =
IOMUXC_SW_MUX_CTL_PAD_UART1_RX_DATA_MUX_MODE(1) |
IOMUXC_SW_MUX_CTL_PAD_UART1_RX_DATA_SION_MASK;
@ -106,7 +106,7 @@ static int pico_pi_m4_pinmux_init(struct device *dev)
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay) && CONFIG_I2C
IOMUXC_SW_MUX_CTL_PAD_I2C2_SCL =
IOMUXC_SW_MUX_CTL_PAD_I2C2_SCL_MUX_MODE(0) |
IOMUXC_SW_MUX_CTL_PAD_I2C2_SCL_SION_MASK;
@ -131,7 +131,7 @@ static int pico_pi_m4_pinmux_init(struct device *dev)
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c3), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c3), okay) && CONFIG_I2C
IOMUXC_SW_MUX_CTL_PAD_I2C3_SCL =
IOMUXC_SW_MUX_CTL_PAD_I2C3_SCL_MUX_MODE(0) |
IOMUXC_SW_MUX_CTL_PAD_I2C3_SCL_SION_MASK;
@ -156,7 +156,7 @@ static int pico_pi_m4_pinmux_init(struct device *dev)
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c4), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c4), okay) && CONFIG_I2C
IOMUXC_SW_MUX_CTL_PAD_SAI1_RX_SYNC =
IOMUXC_SW_MUX_CTL_PAD_SAI1_RX_SYNC_MUX_MODE(3) |
IOMUXC_SW_MUX_CTL_PAD_SAI1_RX_SYNC_SION_MASK;

View file

@ -107,13 +107,13 @@ static int twr_ke18f_pinmux_init(struct device *dev)
pinmux_pin_set(porte, 10, PORT_PCR_MUX(kPORT_MuxAlt2));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c0), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c0), okay) && CONFIG_I2C
/* LPI2C0 SCL, SDA - FXOS8700 */
pinmux_pin_set(porta, 3, PORT_PCR_MUX(kPORT_MuxAlt3));
pinmux_pin_set(porta, 2, PORT_PCR_MUX(kPORT_MuxAlt3));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay) && CONFIG_I2C
/* LPI2C1 SCL, SDA - Elevator connector */
pinmux_pin_set(portd, 9, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portd, 8, PORT_PCR_MUX(kPORT_MuxAlt2));

View file

@ -49,7 +49,7 @@ static int twr_kv58f220m_pinmux_init(struct device *dev)
pinmux_pin_set(portc, 18, PORT_PCR_MUX(kPORT_MuxAsGpio));
pinmux_pin_set(portc, 19, PORT_PCR_MUX(kPORT_MuxAsGpio));
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay) && CONFIG_I2C
/* I2C1 SCL, SDA */
pinmux_pin_set(portd, 8, PORT_PCR_MUX(kPORT_MuxAlt2)
| PORT_PCR_ODE_MASK);

View file

@ -69,7 +69,7 @@ static int warp7_m4_pinmux_init(struct device *dev)
IOMUXC_UART6_RX_DATA_SELECT_INPUT_DAISY(2);
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay) && CONFIG_I2C
IOMUXC_SW_MUX_CTL_PAD_I2C1_SCL =
IOMUXC_SW_MUX_CTL_PAD_I2C1_SCL_MUX_MODE(0) |
IOMUXC_SW_MUX_CTL_PAD_I2C1_SCL_SION_MASK;
@ -93,7 +93,7 @@ static int warp7_m4_pinmux_init(struct device *dev)
IOMUXC_SW_PAD_CTL_PAD_I2C1_SDA_HYS_MASK;
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay) && CONFIG_I2C
IOMUXC_SW_MUX_CTL_PAD_I2C2_SCL =
IOMUXC_SW_MUX_CTL_PAD_I2C2_SCL_MUX_MODE(0) |
IOMUXC_SW_MUX_CTL_PAD_I2C2_SCL_SION_MASK;
@ -117,7 +117,7 @@ static int warp7_m4_pinmux_init(struct device *dev)
IOMUXC_SW_PAD_CTL_PAD_I2C2_SDA_HYS_MASK;
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c3), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c3), okay) && CONFIG_I2C
IOMUXC_SW_MUX_CTL_PAD_I2C3_SCL =
IOMUXC_SW_MUX_CTL_PAD_I2C3_SCL_MUX_MODE(0) |
IOMUXC_SW_MUX_CTL_PAD_I2C3_SCL_SION_MASK;
@ -141,7 +141,7 @@ static int warp7_m4_pinmux_init(struct device *dev)
IOMUXC_SW_PAD_CTL_PAD_I2C3_SDA_HYS_MASK;
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c4), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c4), okay) && CONFIG_I2C
IOMUXC_SW_MUX_CTL_PAD_I2C4_SCL =
IOMUXC_SW_MUX_CTL_PAD_I2C4_SCL_MUX_MODE(0) |
IOMUXC_SW_MUX_CTL_PAD_I2C4_SCL_SION_MASK;