Commit 6e8775ff authored by Martí Bolívar's avatar Martí Bolívar Committed by Carles Cufi
Browse files

devicetree: remove DT_HAS_NODE_STATUS_OKAY 



Several reviewers agreed that DT_HAS_NODE_STATUS_OKAY(...) was an
undesirable API for the following reasons:

- it's inconsistent with the rest of the DT_NODE_HAS_FOO names
- DT_NODE_HAS_FOO_BAR_BAZ(node) was agreed upon as a shorthand
  for macros which are equivalent to
  DT_NODE_HAS_FOO(node) && DT_NODE_HAS_BAR(node) &&
- DT_NODE_HAS_BAZ(node), and DT_HAS_NODE_STATUS_OKAY is an odd duck
- DT_NODE_HAS_STATUS(..., okay) was viewed as more readable anyway
- it is seen as a somewhat aesthetically challenged name

Replace all users with DT_NODE_HAS_STATUS(..., okay), which is
semantically equivalent.

This is mostly done with sed, but a few remaining cases were done by
hand, along with whitespace, docs, and comment changes. These special
cases include the Nordic SOC static assert files.

Signed-off-by: default avatarMartí Bolívar <marti.bolivar@nordicsemi.no>
parent 4f16b419

boards/arm/96b_aerocore2/pinmux.c

+13 −13
Original line number Diff line number Diff line
@@ -14,39 +14,39 @@ 


/* pin assignments for  board */

static const struct pin_config pinconf[] = {

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(usart1))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(usart1), okay)

	{STM32_PIN_PB6, STM32F4_PINMUX_FUNC_PB6_USART1_TX},

	{STM32_PIN_PB7, STM32F4_PINMUX_FUNC_PB7_USART1_RX},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(usart2))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(usart2), okay)

	{STM32_PIN_PD5, STM32F4_PINMUX_FUNC_PD5_USART2_TX},

	{STM32_PIN_PD6, STM32F4_PINMUX_FUNC_PD6_USART2_RX},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(usart3))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(usart3), okay)

	{STM32_PIN_PD8, STM32F4_PINMUX_FUNC_PD8_USART3_TX},

	{STM32_PIN_PD9, STM32F4_PINMUX_FUNC_PD9_USART3_RX},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(uart7))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart7), okay)

	{STM32_PIN_PE8, STM32F4_PINMUX_FUNC_PE8_UART7_TX},

	{STM32_PIN_PE7, STM32F4_PINMUX_FUNC_PE7_UART7_RX},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(uart8))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart8), okay)

	{STM32_PIN_PE1, STM32F4_PINMUX_FUNC_PE1_UART8_TX},

	{STM32_PIN_PE0, STM32F4_PINMUX_FUNC_PE0_UART8_RX},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(pwm4))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm4), okay)

	{STM32_PIN_PD12, STM32F4_PINMUX_FUNC_PD12_PWM4_CH1},

	{STM32_PIN_PD13, STM32F4_PINMUX_FUNC_PD13_PWM4_CH2},

	{STM32_PIN_PD14, STM32F4_PINMUX_FUNC_PD14_PWM4_CH3},

	{STM32_PIN_PD15, STM32F4_PINMUX_FUNC_PD15_PWM4_CH4},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(pwm5))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm5), okay)

	{STM32_PIN_PA0, STM32F4_PINMUX_FUNC_PA0_PWM5_CH1},

	{STM32_PIN_PA1, STM32F4_PINMUX_FUNC_PA1_PWM5_CH2},

	{STM32_PIN_PA2, STM32F4_PINMUX_FUNC_PA2_PWM5_CH3},

	{STM32_PIN_PA3, STM32F4_PINMUX_FUNC_PA3_PWM5_CH4},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(spi1))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi1), okay)

#ifdef CONFIG_SPI_STM32_USE_HW_SS

	{STM32_PIN_PA4, STM32F4_PINMUX_FUNC_PA4_SPI1_NSS |

			STM32_OSPEEDR_VERY_HIGH_SPEED},
@@ -56,7 +56,7 @@ static const struct pin_config pinconf[] = { 
	{STM32_PIN_PA6, STM32F4_PINMUX_FUNC_PA6_SPI1_MISO},

	{STM32_PIN_PA7, STM32F4_PINMUX_FUNC_PA7_SPI1_MOSI},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(spi2))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi2), okay)

#ifdef CONFIG_SPI_STM32_USE_HW_SS

	{STM32_PIN_PB12, STM32F4_PINMUX_FUNC_PB12_SPI2_NSS |

			STM32_OSPEEDR_VERY_HIGH_SPEED},
@@ -66,13 +66,13 @@ static const struct pin_config pinconf[] = { 
	{STM32_PIN_PB14, STM32F4_PINMUX_FUNC_PB14_SPI2_MISO},

	{STM32_PIN_PB15, STM32F4_PINMUX_FUNC_PB15_SPI2_MOSI},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(spi3))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi3), okay)

	{STM32_PIN_PC10, STM32F4_PINMUX_FUNC_PC10_SPI3_SCK |

			STM32_OSPEEDR_VERY_HIGH_SPEED},

	{STM32_PIN_PC11, STM32F4_PINMUX_FUNC_PC11_SPI3_MISO},

	{STM32_PIN_PC12, STM32F4_PINMUX_FUNC_PC12_SPI3_MOSI},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(spi4))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi4), okay)

#ifdef CONFIG_SPI_STM32_USE_HW_SS

	{STM32_PIN_PE11, STM32F4_PINMUX_FUNC_PE11_SPI4_NSS |

			STM32_OSPEEDR_VERY_HIGH_SPEED},
@@ -82,11 +82,11 @@ static const struct pin_config pinconf[] = { 
	{STM32_PIN_PE13, STM32F4_PINMUX_FUNC_PE13_SPI4_MISO},

	{STM32_PIN_PE14, STM32F4_PINMUX_FUNC_PE14_SPI4_MOSI},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(i2c2))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay)

	{STM32_PIN_PB10, STM32F4_PINMUX_FUNC_PB10_I2C2_SCL},

	{STM32_PIN_PB11, STM32F4_PINMUX_FUNC_PB11_I2C2_SDA},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(adc1))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc1), okay)

	{STM32_PIN_PC0, STM32F4_PINMUX_FUNC_PC0_ADC123_IN10},

	{STM32_PIN_PC1, STM32F4_PINMUX_FUNC_PC1_ADC123_IN11},

	{STM32_PIN_PC2, STM32F4_PINMUX_FUNC_PC2_ADC123_IN12},

boards/arm/96b_argonkey/pinmux.c

+7 −7
Original line number Diff line number Diff line
@@ -14,23 +14,23 @@ 


/* pin assignments for 96boards Argonkey board */

static const struct pin_config pinconf[] = {

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(usart1))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(usart1), okay)

	{STM32_PIN_PA9, STM32F4_PINMUX_FUNC_PA9_USART1_TX},

	{STM32_PIN_PA10, STM32F4_PINMUX_FUNC_PA10_USART1_RX},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(i2c1))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)

	{STM32_PIN_PB6, STM32F4_PINMUX_FUNC_PB6_I2C1_SCL},

	{STM32_PIN_PB7, STM32F4_PINMUX_FUNC_PB7_I2C1_SDA},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(i2c2))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay)

	{STM32_PIN_PB10, STM32F4_PINMUX_FUNC_PB10_I2C2_SCL},

	{STM32_PIN_PB9, STM32F4_PINMUX_FUNC_PB9_I2C2_SDA},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(i2c3))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c3), okay)

	{STM32_PIN_PA8, STM32F4_PINMUX_FUNC_PA8_I2C3_SCL},

	{STM32_PIN_PB4, STM32F4_PINMUX_FUNC_PB4_I2C3_SDA},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(spi1))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi1), okay)

#ifdef CONFIG_SPI_STM32_USE_HW_SS

	{STM32_PIN_PA4, STM32F4_PINMUX_FUNC_PA4_SPI1_NSS |

			STM32_OSPEEDR_VERY_HIGH_SPEED},
@@ -40,7 +40,7 @@ static const struct pin_config pinconf[] = { 
	{STM32_PIN_PA6, STM32F4_PINMUX_FUNC_PA6_SPI1_MISO},

	{STM32_PIN_PA7, STM32F4_PINMUX_FUNC_PA7_SPI1_MOSI},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(spi2))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi2), okay)

#ifdef CONFIG_SPI_STM32_USE_HW_SS

	{STM32_PIN_PB12, STM32F4_PINMUX_FUNC_PB12_SPI2_NSS |

			STM32_OSPEEDR_VERY_HIGH_SPEED},
@@ -50,7 +50,7 @@ static const struct pin_config pinconf[] = { 
	{STM32_PIN_PB14, STM32F4_PINMUX_FUNC_PB14_SPI2_MISO},

	{STM32_PIN_PB15, STM32F4_PINMUX_FUNC_PB15_SPI2_MOSI},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(i2s5))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2s5), okay)

	{STM32_PIN_PB0, STM32F4_PINMUX_FUNC_PB0_I2S5_CK},

	{STM32_PIN_PB8, STM32F4_PINMUX_FUNC_PB8_I2S5_SD},

#endif

boards/arm/96b_avenger96/pinmux.c

+2 −2
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 


/* pin assignments for Avenger96 board */

static const struct pin_config pinconf[] = {

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(uart4))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)

	{ STM32_PIN_PB2, STM32MP1X_PINMUX_FUNC_PB2_UART4_RX },

	{ STM32_PIN_PD1, STM32MP1X_PINMUX_FUNC_PD1_UART4_TX },

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(uart7))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart7), okay)

	{ STM32_PIN_PE7, STM32MP1X_PINMUX_FUNC_PE7_UART7_RX },

	{ STM32_PIN_PE8, STM32MP1X_PINMUX_FUNC_PE8_UART7_TX },

#endif

boards/arm/96b_carbon/pinmux.c

+7 −7
Original line number Diff line number Diff line
@@ -14,27 +14,27 @@ 


/* pin assignments for 96boards Carbon board */

static const struct pin_config pinconf[] = {

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(usart1))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(usart1), okay)

	{STM32_PIN_PA9, STM32F4_PINMUX_FUNC_PA9_USART1_TX},

	{STM32_PIN_PA10, STM32F4_PINMUX_FUNC_PA10_USART1_RX},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(usart2))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(usart2), okay)

	{STM32_PIN_PA2, STM32F4_PINMUX_FUNC_PA2_USART2_TX},

	{STM32_PIN_PA3, STM32F4_PINMUX_FUNC_PA3_USART2_RX},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(usart6))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(usart6), okay)

	{STM32_PIN_PC6, STM32F4_PINMUX_FUNC_PC6_USART6_TX},

	{STM32_PIN_PC7, STM32F4_PINMUX_FUNC_PC7_USART6_RX},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(i2c1))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)

	{STM32_PIN_PB6, STM32F4_PINMUX_FUNC_PB6_I2C1_SCL},

	{STM32_PIN_PB7, STM32F4_PINMUX_FUNC_PB7_I2C1_SDA},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(i2c2))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay)

	{STM32_PIN_PB10, STM32F4_PINMUX_FUNC_PB10_I2C2_SCL},

	{STM32_PIN_PB3, STM32F4_PINMUX_FUNC_PB3_I2C2_SDA},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(spi1))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi1), okay)

#ifdef CONFIG_SPI_STM32_USE_HW_SS

	{STM32_PIN_PA4, STM32F4_PINMUX_FUNC_PA4_SPI1_NSS},

#endif /* CONFIG_SPI_STM32_USE_HW_SS */
@@ -42,7 +42,7 @@ static const struct pin_config pinconf[] = { 
	{STM32_PIN_PA6, STM32F4_PINMUX_FUNC_PA6_SPI1_MISO},

	{STM32_PIN_PA7, STM32F4_PINMUX_FUNC_PA7_SPI1_MOSI},

#endif

#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(spi2))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi2), okay)

#ifdef CONFIG_SPI_STM32_USE_HW_SS

	{STM32_PIN_PB12, STM32F4_PINMUX_FUNC_PB12_SPI2_NSS},

#endif /* CONFIG_SPI_STM32_USE_HW_SS */

boards/arm/96b_meerkat96/pinmux.c

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ static int meerakt96_pinmux_init(struct device *dev) 
{

	ARG_UNUSED(dev);



#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(gpio1))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)

	/* GPIO1_IO04 Mux Config */

	IOMUXC_LPSR_SW_MUX_CTL_PAD_GPIO1_IO04 = 0;

	IOMUXC_LPSR_SW_PAD_CTL_PAD_GPIO1_IO04 = 0;
@@ -26,7 +26,7 @@ static int meerakt96_pinmux_init(struct device *dev) 
	IOMUXC_LPSR_SW_PAD_CTL_PAD_GPIO1_IO07 = 0;

#endif



#if DT_HAS_NODE_STATUS_OKAY(DT_NODELABEL(uart1))

#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)

	IOMUXC_SW_MUX_CTL_PAD_UART1_RX_DATA =

		IOMUXC_SW_MUX_CTL_PAD_UART1_RX_DATA_MUX_MODE(0);

	IOMUXC_SW_MUX_CTL_PAD_UART1_TX_DATA =

CRA Git | Maintained and supported by SUSTech CRA and CCSE