From 8945f69b409cdee8b87ca3f2fca54492209a5641 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 31 Mar 2020 20:27:55 -0500 Subject: [PATCH] boards: arm: Use DT_NODELABEL for arm,cmsdk-gpio references Move to using DT_NODELABEL to get references to specific GPIO ports on various boards that utilize the arm,cmsdk-gpio controller. Signed-off-by: Kumar Gala --- boards/arm/mps2_an385/pinmux.c | 8 ++++---- boards/arm/mps2_an521/pinmux.c | 8 ++++---- boards/arm/v2m_beetle/pinmux.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/boards/arm/mps2_an385/pinmux.c b/boards/arm/mps2_an385/pinmux.c index aa21e62bcf8..ebe1cc1cb15 100644 --- a/boards/arm/mps2_an385/pinmux.c +++ b/boards/arm/mps2_an385/pinmux.c @@ -32,13 +32,13 @@ */ #define CMSDK_AHB_GPIO0_DEV \ - ((volatile struct gpio_cmsdk_ahb *)DT_CMSDK_AHB_GPIO0) + ((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio0))) #define CMSDK_AHB_GPIO1_DEV \ - ((volatile struct gpio_cmsdk_ahb *)DT_CMSDK_AHB_GPIO1) + ((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio1))) #define CMSDK_AHB_GPIO2_DEV \ - ((volatile struct gpio_cmsdk_ahb *)DT_CMSDK_AHB_GPIO2) + ((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio2))) #define CMSDK_AHB_GPIO3_DEV \ - ((volatile struct gpio_cmsdk_ahb *)DT_CMSDK_AHB_GPIO3) + ((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio3))) /* * This is the mapping from the ARM MPS2 AN385 Board pins to GPIO diff --git a/boards/arm/mps2_an521/pinmux.c b/boards/arm/mps2_an521/pinmux.c index fe31c2c41ab..ebc27974569 100644 --- a/boards/arm/mps2_an521/pinmux.c +++ b/boards/arm/mps2_an521/pinmux.c @@ -32,13 +32,13 @@ */ #define CMSDK_AHB_GPIO0_DEV \ - ((volatile struct gpio_cmsdk_ahb *)DT_CMSDK_AHB_GPIO0) + ((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio0))) #define CMSDK_AHB_GPIO1_DEV \ - ((volatile struct gpio_cmsdk_ahb *)DT_CMSDK_AHB_GPIO1) + ((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio1))) #define CMSDK_AHB_GPIO2_DEV \ - ((volatile struct gpio_cmsdk_ahb *)DT_CMSDK_AHB_GPIO2) + ((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio2))) #define CMSDK_AHB_GPIO3_DEV \ - ((volatile struct gpio_cmsdk_ahb *)DT_CMSDK_AHB_GPIO3) + ((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio3))) /* * This is the mapping from the ARM MPS2 AN521 Board pins to GPIO diff --git a/boards/arm/v2m_beetle/pinmux.c b/boards/arm/v2m_beetle/pinmux.c index 5c3ce8d9f1e..e926db0dfa5 100644 --- a/boards/arm/v2m_beetle/pinmux.c +++ b/boards/arm/v2m_beetle/pinmux.c @@ -33,9 +33,9 @@ */ #define CMSDK_AHB_GPIO0_DEV \ - ((volatile struct gpio_cmsdk_ahb *)DT_CMSDK_AHB_GPIO0) + ((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio0))) #define CMSDK_AHB_GPIO1_DEV \ - ((volatile struct gpio_cmsdk_ahb *)DT_CMSDK_AHB_GPIO1) + ((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio1))) /* * This is the mapping from the ARM V2M Beetle Board pins to GPIO