Commit 4e8b382e authored by Martí Bolívar's avatar Martí Bolívar Committed by Anas Nashif
Browse files

soc: nrf: fix NRF_DT_CHECK_GPIO_CTLR_IS_SOC 



This was merged by mistake without being tested and is not working
properly. We need to avoid doing a BUILD_ASSERT() when the relevant
property is missing, because we can't use DT_GPIO_CTLR() on an
undefined property. Handle this with COND_CODE_1().

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

soc/arm/nordic_nrf/soc_nrf_common.h

+17 −8
Original line number Diff line number Diff line
@@ -66,14 +66,23 @@ 
 * @param prop_name human-readable string name for 'prop'

 */

#define NRF_DT_CHECK_GPIO_CTLR_IS_SOC(node_id, prop, prop_name)		\

	BUILD_ASSERT(!DT_NODE_HAS_PROP(node_id, prop) ||		\

		     DT_NODE_HAS_COMPAT(DT_GPIO_CTLR(node_id, prop),	\

	COND_CODE_1(DT_NODE_HAS_PROP(node_id, prop),			\

		   (BUILD_ASSERT(DT_NODE_HAS_COMPAT(			\

					 DT_GPIO_CTLR(node_id, prop),	\

					 nordic_nrf_gpio),		\

		     "Devicetree node " DT_NODE_PATH(node_id)		\

		     " property " prop_name " must refer to a GPIO "	\

		     " controller with compatible nordic,nrf-gpio; "	\

		     "got " DT_NODE_PATH(DT_GPIO_CTLR(node_id, prop))	\

		     ", which does not have this compatible")

				 "Devicetree node "			\

				 DT_NODE_PATH(node_id)			\

				 " property " prop_name			\

				 " must refer to a GPIO controller "	\

				 "with compatible nordic,nrf-gpio; "	\

				 "got "					\

				 DT_NODE_PATH(DT_GPIO_CTLR(node_id,	\

							   prop))	\

				 ", which does not have this "		\

				 "compatible")),			\

		    (BUILD_ASSERT(1,					\

				  "NRF_DT_CHECK_GPIO_CTLR_IS_SOC: OK")))

/* Note: allow a trailing ";" either way */



#endif /* !_ASMLANGUAGE */

CRA Git | Maintained and supported by SUSTech CRA and CCSE