[PATCH 03/13] at91: rename mem_init() to at91_mem_init()
Ilias Apalodimas
ilias.apalodimas at linaro.org
Thu Aug 29 09:31:46 CEST 2024
On Wed, 28 Aug 2024 at 15:10, Jerome Forissier
<jerome.forissier at linaro.org> wrote:
>
> THe AT91-based platforms have a mem_init() function declared in
> arch/arm/mach-at91/include/mach/at91_common.h and implemented in various
> places. In preparation of the introduction of the lwIP networking library
> which also has a global mem_init() function, rename the AT91 one to
> at91_mem_init().
>
> Signed-off-by: Jerome Forissier <jerome.forissier at linaro.org>
> ---
> arch/arm/mach-at91/include/mach/at91_common.h | 2 +-
> arch/arm/mach-at91/spl_at91.c | 2 +-
> arch/arm/mach-at91/spl_atmel.c | 2 +-
> board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 2 +-
> board/atmel/at91sam9n12ek/at91sam9n12ek.c | 2 +-
> board/atmel/at91sam9x5ek/at91sam9x5ek.c | 2 +-
> board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c | 2 +-
> board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c | 2 +-
> board/atmel/sama5d2_icp/sama5d2_icp.c | 2 +-
> board/atmel/sama5d2_xplained/sama5d2_xplained.c | 2 +-
> board/atmel/sama5d3_xplained/sama5d3_xplained.c | 2 +-
> board/atmel/sama5d3xek/sama5d3xek.c | 2 +-
> board/atmel/sama5d4_xplained/sama5d4_xplained.c | 2 +-
> board/atmel/sama5d4ek/sama5d4ek.c | 2 +-
> board/conclusive/kstr-sama5d27/kstr-sama5d27.c | 2 +-
> board/gardena/smart-gateway-at91sam/spl.c | 2 +-
> board/siemens/corvus/board.c | 2 +-
> board/siemens/smartweb/smartweb.c | 2 +-
> board/siemens/taurus/taurus.c | 2 +-
> 19 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/arch/arm/mach-at91/include/mach/at91_common.h b/arch/arm/mach-at91/include/mach/at91_common.h
> index 683e539b1b..8fec346c1e 100644
> --- a/arch/arm/mach-at91/include/mach/at91_common.h
> +++ b/arch/arm/mach-at91/include/mach/at91_common.h
> @@ -28,7 +28,7 @@ void at91_pllb_init(u32 pllar);
> void at91_mck_init(u32 mckr);
> void at91_mck_init_down(u32 mckr);
> void at91_pmc_init(void);
> -void mem_init(void);
> +void at91_mem_init(void);
> void at91_phy_reset(void);
> void at91_sdram_hw_init(void);
> void at91_mck_init(u32 mckr);
> diff --git a/arch/arm/mach-at91/spl_at91.c b/arch/arm/mach-at91/spl_at91.c
> index cde1700a28..0d1233cd10 100644
> --- a/arch/arm/mach-at91/spl_at91.c
> +++ b/arch/arm/mach-at91/spl_at91.c
> @@ -142,7 +142,7 @@ void board_init_f(ulong dummy)
> preloader_console_init();
> #endif
>
> - mem_init();
> + at91_mem_init();
>
> at91_spl_board_init();
> }
> diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c
> index 62a7df8a19..7bfbadf048 100644
> --- a/arch/arm/mach-at91/spl_atmel.c
> +++ b/arch/arm/mach-at91/spl_atmel.c
> @@ -134,7 +134,7 @@ void board_init_f(ulong dummy)
>
> board_early_init_f();
>
> - mem_init();
> + at91_mem_init();
>
> ret = spl_init();
> if (ret) {
> diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
> index 3bd94d0889..af486e977e 100644
> --- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
> +++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
> @@ -125,7 +125,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
> 2 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET);
> }
>
> -void mem_init(void)
> +void at91_mem_init(void)
> {
> struct atmel_mpddrc_config ddr2;
>
> diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
> index afc0c0520e..6f9abcbb12 100644
> --- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c
> +++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
> @@ -167,7 +167,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
> 2 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET);
> }
>
> -void mem_init(void)
> +void at91_mem_init(void)
> {
> struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
> struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX;
> diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
> index e5688c6cf1..f52b9a9773 100644
> --- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c
> +++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
> @@ -181,7 +181,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
> 2 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET);
> }
>
> -void mem_init(void)
> +void at91_mem_init(void)
> {
> struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
> struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX;
> diff --git a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
> index 36995a927c..cb3cd7ac9a 100644
> --- a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
> +++ b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
> @@ -146,7 +146,7 @@ static void ddrc_conf(struct atmel_mpddrc_config *ddrc)
> (8 << ATMEL_MPDDRC_TPR2_TFAW_OFFSET));
> }
>
> -void mem_init(void)
> +void at91_mem_init(void)
> {
> struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
> struct atmel_mpddr *mpddrc = (struct atmel_mpddr *)ATMEL_BASE_MPDDRC;
> diff --git a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
> index c775d593e5..15cbd0daa6 100644
> --- a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
> +++ b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
> @@ -208,7 +208,7 @@ static void ddrc_conf(struct atmel_mpddrc_config *ddrc)
> ddrc->cal_mr4 |= ATMEL_MPDDRC_CAL_MR4_MR4R(0xFFFE);
> }
>
> -void mem_init(void)
> +void at91_mem_init(void)
> {
> struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
> struct atmel_mpddr *mpddrc = (struct atmel_mpddr *)ATMEL_BASE_MPDDRC;
> diff --git a/board/atmel/sama5d2_icp/sama5d2_icp.c b/board/atmel/sama5d2_icp/sama5d2_icp.c
> index 986da01639..6f0d578abf 100644
> --- a/board/atmel/sama5d2_icp/sama5d2_icp.c
> +++ b/board/atmel/sama5d2_icp/sama5d2_icp.c
> @@ -180,7 +180,7 @@ static void ddrc_conf(struct atmel_mpddrc_config *ddrc)
> (7 << ATMEL_MPDDRC_TPR2_TFAW_OFFSET));
> }
>
> -void mem_init(void)
> +void at91_mem_init(void)
> {
> struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
> struct atmel_mpddr *mpddrc = (struct atmel_mpddr *)ATMEL_BASE_MPDDRC;
> diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
> index c8a8eb4982..d104736fa7 100644
> --- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c
> +++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
> @@ -146,7 +146,7 @@ static void ddrc_conf(struct atmel_mpddrc_config *ddrc)
> 7 << ATMEL_MPDDRC_TPR2_TFAW_OFFSET);
> }
>
> -void mem_init(void)
> +void at91_mem_init(void)
> {
> struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
> struct atmel_mpddr *mpddrc = (struct atmel_mpddr *)ATMEL_BASE_MPDDRC;
> diff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c b/board/atmel/sama5d3_xplained/sama5d3_xplained.c
> index 54cc3c4d90..f98322fb54 100644
> --- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c
> +++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c
> @@ -175,7 +175,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
> 8 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET);
> }
>
> -void mem_init(void)
> +void at91_mem_init(void)
> {
> struct atmel_mpddrc_config ddr2;
>
> diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c
> index f2e1242fcb..28079a8151 100644
> --- a/board/atmel/sama5d3xek/sama5d3xek.c
> +++ b/board/atmel/sama5d3xek/sama5d3xek.c
> @@ -241,7 +241,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
> 8 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET);
> }
>
> -void mem_init(void)
> +void at91_mem_init(void)
> {
> struct atmel_mpddrc_config ddr2;
>
> diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
> index 09ca16ca88..f9112fc532 100644
> --- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c
> +++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
> @@ -184,7 +184,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
> 8 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET);
> }
>
> -void mem_init(void)
> +void at91_mem_init(void)
> {
> struct atmel_mpddrc_config ddr2;
>
> diff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c
> index 1f8b85f061..0bdc6adbdc 100644
> --- a/board/atmel/sama5d4ek/sama5d4ek.c
> +++ b/board/atmel/sama5d4ek/sama5d4ek.c
> @@ -169,7 +169,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
> 8 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET);
> }
>
> -void mem_init(void)
> +void at91_mem_init(void)
> {
> struct atmel_mpddrc_config ddr2;
> const struct atmel_mpddr *mpddr = (struct atmel_mpddr *)ATMEL_BASE_MPDDRC;
> diff --git a/board/conclusive/kstr-sama5d27/kstr-sama5d27.c b/board/conclusive/kstr-sama5d27/kstr-sama5d27.c
> index 64282ae9dc..37750137ad 100644
> --- a/board/conclusive/kstr-sama5d27/kstr-sama5d27.c
> +++ b/board/conclusive/kstr-sama5d27/kstr-sama5d27.c
> @@ -182,7 +182,7 @@ static void ddrc_conf(struct atmel_mpddrc_config *ddrc)
> (8 << ATMEL_MPDDRC_TPR2_TFAW_OFFSET));
> }
>
> -void mem_init(void)
> +void at91_mem_init(void)
> {
> struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
> struct atmel_mpddr *mpddrc = (struct atmel_mpddr *)ATMEL_BASE_MPDDRC;
> diff --git a/board/gardena/smart-gateway-at91sam/spl.c b/board/gardena/smart-gateway-at91sam/spl.c
> index fb3ec48f9c..db9ba88188 100644
> --- a/board/gardena/smart-gateway-at91sam/spl.c
> +++ b/board/gardena/smart-gateway-at91sam/spl.c
> @@ -110,7 +110,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
> 2 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET);
> }
>
> -void mem_init(void)
> +void at91_mem_init(void)
> {
> struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX;
> struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
> diff --git a/board/siemens/corvus/board.c b/board/siemens/corvus/board.c
> index 7d73d1f2b3..cd27fc1cc3 100644
> --- a/board/siemens/corvus/board.c
> +++ b/board/siemens/corvus/board.c
> @@ -187,7 +187,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
> 2 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET);
> }
>
> -void mem_init(void)
> +void at91_mem_init(void)
> {
> struct atmel_mpddrc_config ddr2;
>
> diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c
> index 946fbc3f22..e9e4bc348c 100644
> --- a/board/siemens/smartweb/smartweb.c
> +++ b/board/siemens/smartweb/smartweb.c
> @@ -238,7 +238,7 @@ void at91_spl_board_init(void)
> | AT91_SDRAMC_TRP_VAL(2) | AT91_SDRAMC_TRCD_VAL(2) \
> | AT91_SDRAMC_TRAS_VAL(5) | AT91_SDRAMC_TXSR_VAL(8))
>
> -void mem_init(void)
> +void at91_mem_init(void)
> {
> struct at91_matrix *ma = (struct at91_matrix *)ATMEL_BASE_MATRIX;
> struct at91_port *port = (struct at91_port *)ATMEL_BASE_PIOC;
> diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
> index bda12a9770..3764ab48ab 100644
> --- a/board/siemens/taurus/taurus.c
> +++ b/board/siemens/taurus/taurus.c
> @@ -177,7 +177,7 @@ void sdramc_configure(unsigned int mask)
> sdramc_initialize(ATMEL_BASE_CS1, &setting);
> }
>
> -void mem_init(void)
> +void at91_mem_init(void)
> {
> unsigned int ram_size = 0;
>
> --
> 2.40.1
>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas at linaro.org>
More information about the U-Boot
mailing list