Eric Lee / smarc-uboot

Download as
Browse Code »

Commit 7e8702a00fe88590c2ece93061da4a40adf3c242

Authored by Wenyou Yang
Committed by Andreas Bießmann
1 parent 258b21fc69
Exists in v2017.01-smarct4x and in 33 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

arm: at91/spl: mpddrc: add struct atmel_mpddrc_config 

Add struct atmel_mpddrc_config to accommodate the mpddrc register
configurations, not using the mpddrc register map structure,
struct atmel_mpddrc, in order to increase readability and reduce
run-time memory use.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>

Showing 11 changed files with 30 additions and 20 deletions Side-by-side Diff

arch/arm/mach-at91/include/mach/atmel_mpddrc.h
Diff comments   View file @ 7e8702a
... ... @@ -8,6 +8,16 @@
8 8 #ifndef __ATMEL_MPDDRC_H__
9 9 #define __ATMEL_MPDDRC_H__
10 10  
  11 +struct atmel_mpddrc_config {
  12 + u32 mr;
  13 + u32 rtr;
  14 + u32 cr;
  15 + u32 tpr0;
  16 + u32 tpr1;
  17 + u32 tpr2;
  18 + u32 md;
  19 +};
  20 +
11 21 /*
12 22 * Only define the needed register in mpddr
13 23 * If other register needed, will add them later
... ... @@ -26,7 +36,7 @@
26 36  
27 37 int ddr2_init(const unsigned int base,
28 38 const unsigned int ram_address,
29   - const struct atmel_mpddr *mpddr);
  39 + const struct atmel_mpddrc_config *mpddr_value);
30 40  
31 41 /* Bit field in mode register */
32 42 #define ATMEL_MPDDRC_MR_MODE_NORMAL_CMD 0x0
arch/arm/mach-at91/mpddrc.c
Diff comments   View file @ 7e8702a
... ... @@ -30,7 +30,7 @@
30 30  
31 31 int ddr2_init(const unsigned int base,
32 32 const unsigned int ram_address,
33   - const struct atmel_mpddr *mpddr_value)
  33 + const struct atmel_mpddrc_config *mpddr_value)
34 34 {
35 35 const struct atmel_mpddr *mpddr = (struct atmel_mpddr *)base;
36 36  
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
Diff comments   View file @ 7e8702a
... ... @@ -97,7 +97,7 @@
97 97 }
98 98  
99 99 #include <asm/arch/atmel_mpddrc.h>
100   -static void ddr2_conf(struct atmel_mpddr *ddr2)
  100 +static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
101 101 {
102 102 ddr2->md = (ATMEL_MPDDRC_MD_DBW_16_BITS | ATMEL_MPDDRC_MD_DDR2_SDRAM);
103 103  
... ... @@ -131,7 +131,7 @@
131 131 void mem_init(void)
132 132 {
133 133 struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
134   - struct atmel_mpddr ddr2;
  134 + struct atmel_mpddrc_config ddr2;
135 135  
136 136 ddr2_conf(&ddr2);
137 137  
board/atmel/at91sam9n12ek/at91sam9n12ek.c
Diff comments   View file @ 7e8702a
... ... @@ -274,7 +274,7 @@
274 274 }
275 275  
276 276 #include <asm/arch/atmel_mpddrc.h>
277   -static void ddr2_conf(struct atmel_mpddr *ddr2)
  277 +static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
278 278 {
279 279 ddr2->md = (ATMEL_MPDDRC_MD_DBW_16_BITS | ATMEL_MPDDRC_MD_DDR2_SDRAM);
280 280  
... ... @@ -310,7 +310,7 @@
310 310 {
311 311 struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
312 312 struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX;
313   - struct atmel_mpddr ddr2;
  313 + struct atmel_mpddrc_config ddr2;
314 314 unsigned long csa;
315 315  
316 316 ddr2_conf(&ddr2);
board/atmel/at91sam9x5ek/at91sam9x5ek.c
Diff comments   View file @ 7e8702a
... ... @@ -310,7 +310,7 @@
310 310 }
311 311  
312 312 #include <asm/arch/atmel_mpddrc.h>
313   -static void ddr2_conf(struct atmel_mpddr *ddr2)
  313 +static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
314 314 {
315 315 ddr2->md = (ATMEL_MPDDRC_MD_DBW_16_BITS | ATMEL_MPDDRC_MD_DDR2_SDRAM);
316 316  
... ... @@ -347,7 +347,7 @@
347 347 {
348 348 struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
349 349 struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX;
350   - struct atmel_mpddr ddr2;
  350 + struct atmel_mpddrc_config ddr2;
351 351 unsigned long csa;
352 352  
353 353 ddr2_conf(&ddr2);
board/atmel/sama5d3_xplained/sama5d3_xplained.c
Diff comments   View file @ 7e8702a
... ... @@ -143,7 +143,7 @@
143 143 #endif
144 144 }
145 145  
146   -static void ddr2_conf(struct atmel_mpddr *ddr2)
  146 +static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
147 147 {
148 148 ddr2->md = (ATMEL_MPDDRC_MD_DBW_32_BITS | ATMEL_MPDDRC_MD_DDR2_SDRAM);
149 149  
... ... @@ -185,7 +185,7 @@
185 185 void mem_init(void)
186 186 {
187 187 struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
188   - struct atmel_mpddr ddr2;
  188 + struct atmel_mpddrc_config ddr2;
189 189  
190 190 ddr2_conf(&ddr2);
191 191  
board/atmel/sama5d3xek/sama5d3xek.c
Diff comments   View file @ 7e8702a
... ... @@ -402,7 +402,7 @@
402 402 #endif
403 403 }
404 404  
405   -static void ddr2_conf(struct atmel_mpddr *ddr2)
  405 +static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
406 406 {
407 407 ddr2->md = (ATMEL_MPDDRC_MD_DBW_32_BITS | ATMEL_MPDDRC_MD_DDR2_SDRAM);
408 408  
... ... @@ -444,7 +444,7 @@
444 444 void mem_init(void)
445 445 {
446 446 struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
447   - struct atmel_mpddr ddr2;
  447 + struct atmel_mpddrc_config ddr2;
448 448  
449 449 ddr2_conf(&ddr2);
450 450  
board/atmel/sama5d4_xplained/sama5d4_xplained.c
Diff comments   View file @ 7e8702a
... ... @@ -346,7 +346,7 @@
346 346 #endif
347 347 }
348 348  
349   -static void ddr2_conf(struct atmel_mpddr *ddr2)
  349 +static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
350 350 {
351 351 ddr2->md = (ATMEL_MPDDRC_MD_DBW_32_BITS | ATMEL_MPDDRC_MD_DDR2_SDRAM);
352 352  
... ... @@ -384,7 +384,7 @@
384 384 void mem_init(void)
385 385 {
386 386 struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
387   - struct atmel_mpddr ddr2;
  387 + struct atmel_mpddrc_config ddr2;
388 388  
389 389 ddr2_conf(&ddr2);
390 390  
board/atmel/sama5d4ek/sama5d4ek.c
Diff comments   View file @ 7e8702a
... ... @@ -342,7 +342,7 @@
342 342 #endif
343 343 }
344 344  
345   -static void ddr2_conf(struct atmel_mpddr *ddr2)
  345 +static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
346 346 {
347 347 ddr2->md = (ATMEL_MPDDRC_MD_DBW_32_BITS | ATMEL_MPDDRC_MD_DDR2_SDRAM);
348 348  
... ... @@ -380,7 +380,7 @@
380 380 void mem_init(void)
381 381 {
382 382 struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
383   - struct atmel_mpddr ddr2;
  383 + struct atmel_mpddrc_config ddr2;
384 384  
385 385 ddr2_conf(&ddr2);
386 386  
board/mini-box/picosam9g45/picosam9g45.c
Diff comments   View file @ 7e8702a
... ... @@ -47,7 +47,7 @@
47 47 }
48 48  
49 49 #include <asm/arch/atmel_mpddrc.h>
50   -static void ddr2_conf(struct atmel_mpddr *ddr2)
  50 +static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
51 51 {
52 52 ddr2->md = (ATMEL_MPDDRC_MD_DBW_16_BITS | ATMEL_MPDDRC_MD_DDR2_SDRAM);
53 53  
... ... @@ -82,7 +82,7 @@
82 82 {
83 83 struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
84 84 struct at91_matrix *mat = (struct at91_matrix *)ATMEL_BASE_MATRIX;
85   - struct atmel_mpddr ddr2;
  85 + struct atmel_mpddrc_config ddr2;
86 86 unsigned long csa;
87 87  
88 88 ddr2_conf(&ddr2);
board/siemens/corvus/board.c
Diff comments   View file @ 7e8702a
... ... @@ -114,7 +114,7 @@
114 114 }
115 115  
116 116 #include <asm/arch/atmel_mpddrc.h>
117   -static void ddr2_conf(struct atmel_mpddr *ddr2)
  117 +static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
118 118 {
119 119 ddr2->md = (ATMEL_MPDDRC_MD_DBW_16_BITS | ATMEL_MPDDRC_MD_DDR2_SDRAM);
120 120  
... ... @@ -148,7 +148,7 @@
148 148 void mem_init(void)
149 149 {
150 150 struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
151   - struct atmel_mpddr ddr2;
  151 + struct atmel_mpddrc_config ddr2;
152 152  
153 153 ddr2_conf(&ddr2);
154 154