Commit 1e94d07faf871ebe0fdd06de0b14dc048c742913
Committed by
Albert ARIBAUD
1 parent
c67d9c5e58
Exists in
master
and in
55 other branches
i.mx28: Replaced magic numbers for scratch register addresses with register definitions
This patch replaces the use of magice numbers for scratch register addresses with earlier defined register definitions. Signed-off-by: Robert Delien <robert@delien.nl>
Showing 2 changed files with 8 additions and 8 deletions Side-by-side Diff
arch/arm/cpu/arm926ejs/mx28/mx28.c
... | ... | @@ -261,14 +261,14 @@ |
261 | 261 | } |
262 | 262 | #endif |
263 | 263 | |
264 | -#define HW_DIGCTRL_SCRATCH0 0x8001c280 | |
265 | -#define HW_DIGCTRL_SCRATCH1 0x8001c290 | |
266 | 264 | int mx28_dram_init(void) |
267 | 265 | { |
266 | + struct mx28_digctl_regs *digctl_regs = | |
267 | + (struct mx28_digctl_regs *)MXS_DIGCTL_BASE; | |
268 | 268 | uint32_t sz[2]; |
269 | 269 | |
270 | - sz[0] = readl(HW_DIGCTRL_SCRATCH0); | |
271 | - sz[1] = readl(HW_DIGCTRL_SCRATCH1); | |
270 | + sz[0] = readl(&digctl_regs->hw_digctl_scratch0); | |
271 | + sz[1] = readl(&digctl_regs->hw_digctl_scratch1); | |
272 | 272 | |
273 | 273 | if (sz[0] != sz[1]) { |
274 | 274 | printf("MX28:\n" |
arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c
... | ... | @@ -165,8 +165,6 @@ |
165 | 165 | &power_regs->hw_power_vdddctrl); |
166 | 166 | } |
167 | 167 | |
168 | -#define HW_DIGCTRL_SCRATCH0 0x8001c280 | |
169 | -#define HW_DIGCTRL_SCRATCH1 0x8001c290 | |
170 | 168 | void data_abort_memdetect_handler(void) __attribute__((naked)); |
171 | 169 | void data_abort_memdetect_handler(void) |
172 | 170 | { |
... | ... | @@ -175,6 +173,8 @@ |
175 | 173 | |
176 | 174 | void mx28_mem_get_size(void) |
177 | 175 | { |
176 | + struct mx28_digctl_regs *digctl_regs = | |
177 | + (struct mx28_digctl_regs *)MXS_DIGCTL_BASE; | |
178 | 178 | uint32_t sz, da; |
179 | 179 | uint32_t *vt = (uint32_t *)0x20; |
180 | 180 | |
... | ... | @@ -183,8 +183,8 @@ |
183 | 183 | vt[4] = (uint32_t)&data_abort_memdetect_handler; |
184 | 184 | |
185 | 185 | sz = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE); |
186 | - writel(sz, HW_DIGCTRL_SCRATCH0); | |
187 | - writel(sz, HW_DIGCTRL_SCRATCH1); | |
186 | + writel(sz, &digctl_regs->hw_digctl_scratch0); | |
187 | + writel(sz, &digctl_regs->hw_digctl_scratch1); | |
188 | 188 | |
189 | 189 | /* Restore the old DABT handler. */ |
190 | 190 | vt[4] = da; |