From e25d6a65ac838e1234c0051a87f25b9a61c50cf2 Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 14 Jan 2019 09:37:20 +0100 Subject: [PATCH] drivers/pinmux: stm32: Clean up after gpio driver factorization Clean up a left over from GPIO driver factorization. Definition of GPIO_REG_SIZE and GPIO_PORTS_BASE do not need anymore to be spread accross SoCs. Put these definitions directly in STM32 pinmux driver. Signed-off-by: Erwan Gouriou --- drivers/pinmux/stm32/pinmux_stm32.c | 4 ++++ soc/arm/st_stm32/stm32f0/soc.h | 4 ---- soc/arm/st_stm32/stm32f1/soc.h | 4 ---- soc/arm/st_stm32/stm32f2/soc.h | 4 ---- soc/arm/st_stm32/stm32f3/soc.h | 4 ---- soc/arm/st_stm32/stm32f4/soc.h | 4 ---- soc/arm/st_stm32/stm32f7/soc.h | 4 ---- soc/arm/st_stm32/stm32l0/soc.h | 4 ---- soc/arm/st_stm32/stm32l4/soc.h | 4 ---- 9 files changed, 4 insertions(+), 32 deletions(-) diff --git a/drivers/pinmux/stm32/pinmux_stm32.c b/drivers/pinmux/stm32/pinmux_stm32.c index 5d6cfe4f251..2c964cde025 100644 --- a/drivers/pinmux/stm32/pinmux_stm32.c +++ b/drivers/pinmux/stm32/pinmux_stm32.c @@ -23,6 +23,10 @@ #include "pinmux.h" +#define GPIO_REG_SIZE 0x400 +/* base address for where GPIO registers start */ +#define GPIO_PORTS_BASE (GPIOA_BASE) + static const u32_t ports_enable[STM32_PORTS_MAX] = { STM32_PERIPH_GPIOA, STM32_PERIPH_GPIOB, diff --git a/soc/arm/st_stm32/stm32f0/soc.h b/soc/arm/st_stm32/stm32f0/soc.h index a548551b94b..416171ae816 100644 --- a/soc/arm/st_stm32/stm32f0/soc.h +++ b/soc/arm/st_stm32/stm32f0/soc.h @@ -18,10 +18,6 @@ #ifndef _STM32F0_SOC_H_ #define _STM32F0_SOC_H_ -#define GPIO_REG_SIZE 0x400 -/* base address for where GPIO registers start */ -#define GPIO_PORTS_BASE (GPIOA_BASE) - #ifndef _ASMLANGUAGE #include diff --git a/soc/arm/st_stm32/stm32f1/soc.h b/soc/arm/st_stm32/stm32f1/soc.h index 15ff0af8c60..88dabd93f4e 100644 --- a/soc/arm/st_stm32/stm32f1/soc.h +++ b/soc/arm/st_stm32/stm32f1/soc.h @@ -18,10 +18,6 @@ #ifndef _STM32F1_SOC_H_ #define _STM32F1_SOC_H_ -#define GPIO_REG_SIZE 0x400 -/* base address for where GPIO registers start */ -#define GPIO_PORTS_BASE (GPIOA_BASE) - #ifndef _ASMLANGUAGE #include diff --git a/soc/arm/st_stm32/stm32f2/soc.h b/soc/arm/st_stm32/stm32f2/soc.h index e0fa3f4c3f9..1586485061c 100644 --- a/soc/arm/st_stm32/stm32f2/soc.h +++ b/soc/arm/st_stm32/stm32f2/soc.h @@ -17,10 +17,6 @@ #ifndef _STM32F2_SOC_H_ #define _STM32F2_SOC_H_ -#define GPIO_REG_SIZE 0x400 -/* base address for where GPIO registers start */ -#define GPIO_PORTS_BASE (GPIOA_BASE) - #ifndef _ASMLANGUAGE #include diff --git a/soc/arm/st_stm32/stm32f3/soc.h b/soc/arm/st_stm32/stm32f3/soc.h index c957e0fa05e..673ed3bb3f5 100644 --- a/soc/arm/st_stm32/stm32f3/soc.h +++ b/soc/arm/st_stm32/stm32f3/soc.h @@ -19,10 +19,6 @@ #ifndef _STM32F3_SOC_H_ #define _STM32F3_SOC_H_ -#define GPIO_REG_SIZE 0x400 -/* base address for where GPIO registers start */ -#define GPIO_PORTS_BASE (GPIOA_BASE) - #ifndef _ASMLANGUAGE #include diff --git a/soc/arm/st_stm32/stm32f4/soc.h b/soc/arm/st_stm32/stm32f4/soc.h index 74be869495c..5cd3436bff4 100644 --- a/soc/arm/st_stm32/stm32f4/soc.h +++ b/soc/arm/st_stm32/stm32f4/soc.h @@ -18,10 +18,6 @@ #ifndef _STM32F4_SOC_H_ #define _STM32F4_SOC_H_ -#define GPIO_REG_SIZE 0x400 -/* base address for where GPIO registers start */ -#define GPIO_PORTS_BASE (GPIOA_BASE) - #ifndef _ASMLANGUAGE #include diff --git a/soc/arm/st_stm32/stm32f7/soc.h b/soc/arm/st_stm32/stm32f7/soc.h index 74cb739a807..5279bf3ab71 100644 --- a/soc/arm/st_stm32/stm32f7/soc.h +++ b/soc/arm/st_stm32/stm32f7/soc.h @@ -17,10 +17,6 @@ #ifndef _STM32F7_SOC_H_ #define _STM32F7_SOC_H_ -#define GPIO_REG_SIZE 0x400 -/* base address for where GPIO registers start */ -#define GPIO_PORTS_BASE (GPIOA_BASE) - #ifndef _ASMLANGUAGE #include diff --git a/soc/arm/st_stm32/stm32l0/soc.h b/soc/arm/st_stm32/stm32l0/soc.h index 326aa6ce31e..43d2e892e5b 100644 --- a/soc/arm/st_stm32/stm32l0/soc.h +++ b/soc/arm/st_stm32/stm32l0/soc.h @@ -17,10 +17,6 @@ #ifndef _STM32L0_SOC_H_ #define _STM32L0_SOC_H_ -#define GPIO_REG_SIZE 0x400 -/* base address for where GPIO registers start */ -#define GPIO_PORTS_BASE (GPIOA_BASE) - #ifndef _ASMLANGUAGE #include diff --git a/soc/arm/st_stm32/stm32l4/soc.h b/soc/arm/st_stm32/stm32l4/soc.h index 558ecc9740e..f4fa0797d73 100644 --- a/soc/arm/st_stm32/stm32l4/soc.h +++ b/soc/arm/st_stm32/stm32l4/soc.h @@ -30,10 +30,6 @@ */ #include -#define GPIO_REG_SIZE 0x400 -/* base address for where GPIO registers start */ -#define GPIO_PORTS_BASE (GPIOA_BASE) - #ifdef CONFIG_GPIO_STM32 /* Required to enable VDDio2 for port G */ #include