diff options
author | Jon Loeliger <jdl@freescale.com> | 2005-08-01 13:20:47 -0500 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2005-08-01 13:20:47 -0500 |
commit | de1d0a69956a63cea6a62043ae5d5afb584efe93 (patch) | |
tree | 1914348ff43c309890deb6ecad206e37b2bc3a51 /cpu/mpc83xx/spd_sdram.c | |
parent | b0e32949239c7870d409ca687a2dfc1261a3d838 (diff) | |
download | u-boot-imx-de1d0a69956a63cea6a62043ae5d5afb584efe93.zip u-boot-imx-de1d0a69956a63cea6a62043ae5d5afb584efe93.tar.gz u-boot-imx-de1d0a69956a63cea6a62043ae5d5afb584efe93.tar.bz2 |
Fix style issues primarily in 85xx and 83xx boards.
- C++ comments
- Trailing white space
- Indentation not by TAB
- Excessive amount of empty lines
- Trailing empty lines
Diffstat (limited to 'cpu/mpc83xx/spd_sdram.c')
-rw-r--r-- | cpu/mpc83xx/spd_sdram.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/cpu/mpc83xx/spd_sdram.c b/cpu/mpc83xx/spd_sdram.c index 5bd112c..63dcd66 100644 --- a/cpu/mpc83xx/spd_sdram.c +++ b/cpu/mpc83xx/spd_sdram.c @@ -36,20 +36,16 @@ #ifdef CONFIG_SPD_EEPROM - #if defined(CONFIG_DDR_ECC) extern void dma_init(void); extern uint dma_check(void); extern int dma_xfer(void *dest, uint count, void *src); #endif - #ifndef CFG_READ_SPD #define CFG_READ_SPD i2c_read #endif - - /* * Convert picoseconds into clock cycles (rounding up if needed). */ @@ -67,14 +63,12 @@ picos_to_clk(int picos) return clks; } - unsigned int banksize(unsigned char row_dens) { return ((row_dens >> 2) | ((row_dens & 3) << 6)) << 24; } - long int spd_sdram(int(read_spd)(uint addr)) { volatile immap_t *immap = (immap_t *)CFG_IMMRBAR; @@ -86,8 +80,8 @@ long int spd_sdram(int(read_spd)(uint addr)) unsigned int law_size; unsigned char caslat; unsigned int trfc, trfc_clk, trfc_low; - -#warning Current spd_sdram does not fit its usage... adjust implementation or API... + +#warning Current spd_sdram does not fit its usage... adjust implementation or API... CFG_READ_SPD(SPD_EEPROM_ADDRESS, 0, 1, (uchar *) & spd, sizeof (spd)); @@ -111,7 +105,7 @@ long int spd_sdram(int(read_spd)(uint addr)) debug("\n"); debug("cs2_bnds = 0x%08x\n",ddr->csbnds[2].csbnds); debug("cs2_config = 0x%08x\n",ddr->cs_config[2]); - + if (spd.nrows == 2) { ddr->csbnds[3].csbnds = ( (banksize(spd.row_dens) >> 8) | ((banksize(spd.row_dens) >> 23) - 1) ); @@ -298,9 +292,12 @@ long int spd_sdram(int(read_spd)(uint addr)) udelay(500); - - ddr->sdram_clk_cntl = 0x82000000;/*SS_EN=1, CLK_ADJST = 2-MCK/MCK_B, is lauched 1/2 of one SDRAM clock cycle after address/command*/ - + /* + * SS_EN=1, + * CLK_ADJST = 2-MCK/MCK_B, is lauched 1/2 of one SDRAM + * clock cycle after address/command + */ + ddr->sdram_clk_cntl = 0x82000000; /* * Figure out the settings for the sdram_cfg register. Build up @@ -339,7 +336,6 @@ long int spd_sdram(int(read_spd)(uint addr)) #endif ddr->sdram_cfg = tmp; - asm("sync;isync"); udelay(500); @@ -347,7 +343,6 @@ long int spd_sdram(int(read_spd)(uint addr)) return memsize;/*in MBytes*/ } - #endif /* CONFIG_SPD_EEPROM */ @@ -407,7 +402,7 @@ ddr_enable_ecc(unsigned int dram_size) */ ddr->err_disable = 0x00000000; asm("sync;isync"); -#endif +#endif } #endif /* CONFIG_DDR_ECC */ |