Re: [U-Boot] [PATCH 1/2] dm: clk: remove CLK() macro for clk_stm32h7
Hi,
> -Original Message-
> From: Patrice CHOTARD
> Sent: Monday, October 09, 2017 2:41 AM
> To: u-boot@lists.denx.de; albert.u.b...@aribaud.net; s...@chromium.org; Vikas
> MANOCHA
> Cc: Patrice CHOTARD ; Patrick DELAUNAY
> ; Christophe KERELLO
>
> Subject: [PATCH 1/2] dm: clk: remove CLK() macro for clk_stm32h7
>
> From: Patrice Chotard
>
> CLK() macro is a residue of a previously reworked patch, remove it.
>
> Signed-off-by: Patrice Chotard
Reviewed-by: Vikas Manocha
Cheers,
Vikas
> ---
> drivers/clk/clk_stm32h7.c | 223
> ++
> 1 file changed, 108 insertions(+), 115 deletions(-)
>
> diff --git a/drivers/clk/clk_stm32h7.c b/drivers/clk/clk_stm32h7.c index
> fd0e3ab..9ca497a 100644
> --- a/drivers/clk/clk_stm32h7.c
> +++ b/drivers/clk/clk_stm32h7.c
> @@ -195,13 +195,6 @@ struct clk_cfg {
> const char *name;
> };
>
> -#define CLK(_gate_offset, _bit_idx, _name) \ -{ \
> - .gate_offset = _gate_offset,\
> - .gate_bit_idx = _bit_idx,\
> - .name = _name,\
> -}
> -
> /*
> * the way all these entries are sorted in this array could seem
> * unlogical, but we are dependant of kernel DT_bindings, @@ -210,114
> +203,114 @@ struct clk_cfg {
> */
>
> static const struct clk_cfg clk_map[] = {
> - CLK(RCC_AHB3ENR, 31, "d1sram1"), /* peripheral clocks */
> - CLK(RCC_AHB3ENR, 30, "itcm"),
> - CLK(RCC_AHB3ENR, 29, "dtcm2"),
> - CLK(RCC_AHB3ENR, 28, "dtcm1"),
> - CLK(RCC_AHB3ENR, 8, "flitf"),
> - CLK(RCC_AHB3ENR, 5, "jpgdec"),
> - CLK(RCC_AHB3ENR, 4, "dma2d"),
> - CLK(RCC_AHB3ENR, 0, "mdma"),
> - CLK(RCC_AHB1ENR, 28, "usb2ulpi"),
> - CLK(RCC_AHB1ENR, 17, "eth1rx"),
> - CLK(RCC_AHB1ENR, 16, "eth1tx"),
> - CLK(RCC_AHB1ENR, 15, "eth1mac"),
> - CLK(RCC_AHB1ENR, 14, "art"),
> - CLK(RCC_AHB1ENR, 26, "usb1ulpi"),
> - CLK(RCC_AHB1ENR, 1, "dma2"),
> - CLK(RCC_AHB1ENR, 0, "dma1"),
> - CLK(RCC_AHB2ENR, 31, "d2sram3"),
> - CLK(RCC_AHB2ENR, 30, "d2sram2"),
> - CLK(RCC_AHB2ENR, 29, "d2sram1"),
> - CLK(RCC_AHB2ENR, 5, "hash"),
> - CLK(RCC_AHB2ENR, 4, "crypt"),
> - CLK(RCC_AHB2ENR, 0, "camitf"),
> - CLK(RCC_AHB4ENR, 28, "bkpram"),
> - CLK(RCC_AHB4ENR, 25, "hsem"),
> - CLK(RCC_AHB4ENR, 21, "bdma"),
> - CLK(RCC_AHB4ENR, 19, "crc"),
> - CLK(RCC_AHB4ENR, 10, "gpiok"),
> - CLK(RCC_AHB4ENR, 9, "gpioj"),
> - CLK(RCC_AHB4ENR, 8, "gpioi"),
> - CLK(RCC_AHB4ENR, 7, "gpioh"),
> - CLK(RCC_AHB4ENR, 6, "gpiog"),
> - CLK(RCC_AHB4ENR, 5, "gpiof"),
> - CLK(RCC_AHB4ENR, 4, "gpioe"),
> - CLK(RCC_AHB4ENR, 3, "gpiod"),
> - CLK(RCC_AHB4ENR, 2, "gpioc"),
> - CLK(RCC_AHB4ENR, 1, "gpiob"),
> - CLK(RCC_AHB4ENR, 0, "gpioa"),
> - CLK(RCC_APB3ENR, 6, "wwdg1"),
> - CLK(RCC_APB1LENR, 29, "dac12"),
> - CLK(RCC_APB1LENR, 11, "wwdg2"),
> - CLK(RCC_APB1LENR, 8, "tim14"),
> - CLK(RCC_APB1LENR, 7, "tim13"),
> - CLK(RCC_APB1LENR, 6, "tim12"),
> - CLK(RCC_APB1LENR, 5, "tim7"),
> - CLK(RCC_APB1LENR, 4, "tim6"),
> - CLK(RCC_APB1LENR, 3, "tim5"),
> - CLK(RCC_APB1LENR, 2, "tim4"),
> - CLK(RCC_APB1LENR, 1, "tim3"),
> - CLK(RCC_APB1LENR, 0, "tim2"),
> - CLK(RCC_APB1HENR, 5, "mdios"),
> - CLK(RCC_APB1HENR, 4, "opamp"),
> - CLK(RCC_APB1HENR, 1, "crs"),
> - CLK(RCC_APB2ENR, 18, "tim17"),
> - CLK(RCC_APB2ENR, 17, "tim16"),
> - CLK(RCC_APB2ENR, 16, "tim15"),
> - CLK(RCC_APB2ENR, 1, "tim8"),
> - CLK(RCC_APB2ENR, 0, "tim1"),
> - CLK(RCC_APB4ENR, 26, "tmpsens"),
> - CLK(RCC_APB4ENR, 16, "rtcapb"),
> - CLK(RCC_APB4ENR, 15, "vref"),
> - CLK(RCC_APB4ENR, 14, "comp12"),
> - CLK(RCC_APB4ENR, 1, "syscfg"),
> - CLK(RCC_AHB3ENR, 16, "sdmmc1"),/* kernel clocks */
> - CLK(RCC_AHB3ENR, 14, "quadspi"),
> - CLK(RCC_AHB3ENR, 12, "fmc"),
> - CLK(RCC_AHB1ENR, 27, "usb2otg"),
> - CLK(RCC_AHB1ENR, 25, "usb1otg"),
> - CLK(RCC_AHB1ENR, 5, "adc12"),
> - CLK(RCC_AHB2ENR, 9, "sdmmc2"),
> - CLK(RCC_AHB2ENR, 6, "rng"),
> - CLK(RCC_AHB4ENR, 24, "adc3"),
> - CLK(RCC_APB3ENR, 4, "dsi"),
> - CLK(RCC_APB3ENR, 3, "ltdc"),
> - CLK(RCC_APB1LENR, 31, "usart8"),
> - CLK(RCC_APB1LENR, 30, "usart7"),
> - CLK(RCC_APB1LENR, 27, "hdmicec"),
> - CLK(RCC_APB1LENR, 23, "i2c3"),
> - CLK(RCC_APB1LENR, 22, "i2c2"),
> - CLK(RCC_APB1LENR, 21, "i2c1"),
> - CLK(RCC_APB1LENR, 20, "uart5"),
> - CLK(RCC_APB1LENR, 19, "uart4"),
> - CLK(RCC_APB1LENR, 18, "usart3"),
> - CLK(RCC_APB1LENR, 17, "usart2"),
> - CLK(RCC_APB1LENR, 16, "spdifrx"),
> - CLK(RCC_APB1LENR, 15, "spi3"),
> - CLK(RCC_APB1LENR, 14, "spi2"),
> - CLK(RCC_APB1LENR, 9, "lptim1"),
> - CLK(RCC_APB1HENR, 8, "fdcan"),
> - CLK(RCC_APB1HENR, 2, "swp"),
> - CLK(RCC_APB2ENR, 29, "hrtim"),
> - CLK(RCC_APB2ENR, 28, "dfsdm1"),
[U-Boot] [PATCH 1/2] dm: clk: remove CLK() macro for clk_stm32h7
From: Patrice Chotard
CLK() macro is a residue of a previously reworked patch,
remove it.
Signed-off-by: Patrice Chotard
---
drivers/clk/clk_stm32h7.c | 223 ++
1 file changed, 108 insertions(+), 115 deletions(-)
diff --git a/drivers/clk/clk_stm32h7.c b/drivers/clk/clk_stm32h7.c
index fd0e3ab..9ca497a 100644
--- a/drivers/clk/clk_stm32h7.c
+++ b/drivers/clk/clk_stm32h7.c
@@ -195,13 +195,6 @@ struct clk_cfg {
const char *name;
};
-#define CLK(_gate_offset, _bit_idx, _name) \
-{ \
- .gate_offset = _gate_offset,\
- .gate_bit_idx = _bit_idx,\
- .name = _name,\
-}
-
/*
* the way all these entries are sorted in this array could seem
* unlogical, but we are dependant of kernel DT_bindings,
@@ -210,114 +203,114 @@ struct clk_cfg {
*/
static const struct clk_cfg clk_map[] = {
- CLK(RCC_AHB3ENR, 31, "d1sram1"), /* peripheral clocks */
- CLK(RCC_AHB3ENR, 30, "itcm"),
- CLK(RCC_AHB3ENR, 29, "dtcm2"),
- CLK(RCC_AHB3ENR, 28, "dtcm1"),
- CLK(RCC_AHB3ENR, 8, "flitf"),
- CLK(RCC_AHB3ENR, 5, "jpgdec"),
- CLK(RCC_AHB3ENR, 4, "dma2d"),
- CLK(RCC_AHB3ENR, 0, "mdma"),
- CLK(RCC_AHB1ENR, 28, "usb2ulpi"),
- CLK(RCC_AHB1ENR, 17, "eth1rx"),
- CLK(RCC_AHB1ENR, 16, "eth1tx"),
- CLK(RCC_AHB1ENR, 15, "eth1mac"),
- CLK(RCC_AHB1ENR, 14, "art"),
- CLK(RCC_AHB1ENR, 26, "usb1ulpi"),
- CLK(RCC_AHB1ENR, 1, "dma2"),
- CLK(RCC_AHB1ENR, 0, "dma1"),
- CLK(RCC_AHB2ENR, 31, "d2sram3"),
- CLK(RCC_AHB2ENR, 30, "d2sram2"),
- CLK(RCC_AHB2ENR, 29, "d2sram1"),
- CLK(RCC_AHB2ENR, 5, "hash"),
- CLK(RCC_AHB2ENR, 4, "crypt"),
- CLK(RCC_AHB2ENR, 0, "camitf"),
- CLK(RCC_AHB4ENR, 28, "bkpram"),
- CLK(RCC_AHB4ENR, 25, "hsem"),
- CLK(RCC_AHB4ENR, 21, "bdma"),
- CLK(RCC_AHB4ENR, 19, "crc"),
- CLK(RCC_AHB4ENR, 10, "gpiok"),
- CLK(RCC_AHB4ENR, 9, "gpioj"),
- CLK(RCC_AHB4ENR, 8, "gpioi"),
- CLK(RCC_AHB4ENR, 7, "gpioh"),
- CLK(RCC_AHB4ENR, 6, "gpiog"),
- CLK(RCC_AHB4ENR, 5, "gpiof"),
- CLK(RCC_AHB4ENR, 4, "gpioe"),
- CLK(RCC_AHB4ENR, 3, "gpiod"),
- CLK(RCC_AHB4ENR, 2, "gpioc"),
- CLK(RCC_AHB4ENR, 1, "gpiob"),
- CLK(RCC_AHB4ENR, 0, "gpioa"),
- CLK(RCC_APB3ENR, 6, "wwdg1"),
- CLK(RCC_APB1LENR, 29, "dac12"),
- CLK(RCC_APB1LENR, 11, "wwdg2"),
- CLK(RCC_APB1LENR, 8, "tim14"),
- CLK(RCC_APB1LENR, 7, "tim13"),
- CLK(RCC_APB1LENR, 6, "tim12"),
- CLK(RCC_APB1LENR, 5, "tim7"),
- CLK(RCC_APB1LENR, 4, "tim6"),
- CLK(RCC_APB1LENR, 3, "tim5"),
- CLK(RCC_APB1LENR, 2, "tim4"),
- CLK(RCC_APB1LENR, 1, "tim3"),
- CLK(RCC_APB1LENR, 0, "tim2"),
- CLK(RCC_APB1HENR, 5, "mdios"),
- CLK(RCC_APB1HENR, 4, "opamp"),
- CLK(RCC_APB1HENR, 1, "crs"),
- CLK(RCC_APB2ENR, 18, "tim17"),
- CLK(RCC_APB2ENR, 17, "tim16"),
- CLK(RCC_APB2ENR, 16, "tim15"),
- CLK(RCC_APB2ENR, 1, "tim8"),
- CLK(RCC_APB2ENR, 0, "tim1"),
- CLK(RCC_APB4ENR, 26, "tmpsens"),
- CLK(RCC_APB4ENR, 16, "rtcapb"),
- CLK(RCC_APB4ENR, 15, "vref"),
- CLK(RCC_APB4ENR, 14, "comp12"),
- CLK(RCC_APB4ENR, 1, "syscfg"),
- CLK(RCC_AHB3ENR, 16, "sdmmc1"),/* kernel clocks */
- CLK(RCC_AHB3ENR, 14, "quadspi"),
- CLK(RCC_AHB3ENR, 12, "fmc"),
- CLK(RCC_AHB1ENR, 27, "usb2otg"),
- CLK(RCC_AHB1ENR, 25, "usb1otg"),
- CLK(RCC_AHB1ENR, 5, "adc12"),
- CLK(RCC_AHB2ENR, 9, "sdmmc2"),
- CLK(RCC_AHB2ENR, 6, "rng"),
- CLK(RCC_AHB4ENR, 24, "adc3"),
- CLK(RCC_APB3ENR, 4, "dsi"),
- CLK(RCC_APB3ENR, 3, "ltdc"),
- CLK(RCC_APB1LENR, 31, "usart8"),
- CLK(RCC_APB1LENR, 30, "usart7"),
- CLK(RCC_APB1LENR, 27, "hdmicec"),
- CLK(RCC_APB1LENR, 23, "i2c3"),
- CLK(RCC_APB1LENR, 22, "i2c2"),
- CLK(RCC_APB1LENR, 21, "i2c1"),
- CLK(RCC_APB1LENR, 20, "uart5"),
- CLK(RCC_APB1LENR, 19, "uart4"),
- CLK(RCC_APB1LENR, 18, "usart3"),
- CLK(RCC_APB1LENR, 17, "usart2"),
- CLK(RCC_APB1LENR, 16, "spdifrx"),
- CLK(RCC_APB1LENR, 15, "spi3"),
- CLK(RCC_APB1LENR, 14, "spi2"),
- CLK(RCC_APB1LENR, 9, "lptim1"),
- CLK(RCC_APB1HENR, 8, "fdcan"),
- CLK(RCC_APB1HENR, 2, "swp"),
- CLK(RCC_APB2ENR, 29, "hrtim"),
- CLK(RCC_APB2ENR, 28, "dfsdm1"),
- CLK(RCC_APB2ENR, 24, "sai3"),
- CLK(RCC_APB2ENR, 23, "sai2"),
- CLK(RCC_APB2ENR, 22, "sai1"),
- CLK(RCC_APB2ENR, 20, "spi5"),
- CLK(RCC_APB2ENR, 13, "spi4"),
- CLK(RCC_APB2ENR, 12, "spi1"),
- CLK(RCC_APB2ENR, 5, "usart6"),
- CLK(RCC_APB2ENR, 4, "usart1"),
- CLK(RCC_APB4ENR, 21, "sai4a"),
- CLK(RCC_APB4ENR, 21, "sai4b"),
- CLK(RCC_APB4ENR, 12, "l
