Getting from GPIO1 in device tree for NRFX based code in 2.4.1

Hello,

I am updating code from 2.0.0 to 2.4.1 and see that there are large changes to the gpio interface on the zephyr side and most and the DT_GPIO macros seem to all be deprecated and I can no longer get the node label for gpio as before, DT_GPIO_LABEL.  I see in the NRFX code example in git that you are still using DT_GPIO_PIN macro and this works fine if the pin is on gpio0.  My issue is I have several devices that need to get the offset for gpio1 and i used to compare the label using DT_GPIO_LABEL which no longer works.  Any help would be appreciated as the current device tree based gpio drivers reference the device and nrfx code uses the absolute address.  Also if there is a better way to continue to use the PPI and DPPI that would be informative as well.

#define CLACKER_NODE              DT_ALIAS(spoon)
#define CLACKER_DT_LABEL          DT_GPIO_LABEL(CLACKER_NODE, gpios)    <- this macro is now broken
#define CLACKER_DT_PIN            DT_GPIO_PIN(CLACKER_NODE, gpios)
Thanks,
Ed