edac: move dimm properties to struct dimm_info

[pandora-kernel.git] / drivers / edac / i5400_edac.c

diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
index 1869a10..c2379ba 100644 (file)
--- a/drivers/edac/i5400_edac.c
+++ b/drivers/edac/i5400_edac.c
@@ -1159,6 +1159,7 @@ static int i5400_init_csrows(struct mem_ctl_info *mci)
        int csrow_megs;
        int channel;
        int csrow;
+       struct dimm_info *dimm;
 
        pvt = mci->pvt_info;
 
@@ -1184,24 +1185,17 @@ static int i5400_init_csrows(struct mem_ctl_info *mci)
                p_csrow->last_page = 9 + csrow * 20;
                p_csrow->page_mask = 0xFFF;
 
-               p_csrow->grain = 8;
-
                csrow_megs = 0;
-               for (channel = 0; channel < pvt->maxch; channel++)
+               for (channel = 0; channel < pvt->maxch; channel++) {
                        csrow_megs += pvt->dimm_info[csrow][channel].megabytes;
 
-               p_csrow->nr_pages = csrow_megs << 8;
-
-               /* Assume DDR2 for now */
-               p_csrow->mtype = MEM_FB_DDR2;
-
-               /* ask what device type on this row */
-               if (MTR_DRAM_WIDTH(mtr))
-                       p_csrow->dtype = DEV_X8;
-               else
-                       p_csrow->dtype = DEV_X4;
-
-               p_csrow->edac_mode = EDAC_S8ECD8ED;
+                       p_csrow->nr_pages = csrow_megs << 8;
+                       dimm = p_csrow->channels[channel].dimm;
+                       dimm->grain = 8;
+                       dimm->dtype = MTR_DRAM_WIDTH(mtr) ? DEV_X8 : DEV_X4;
+                       dimm->mtype = MEM_RDDR2;
+                       dimm->edac_mode = EDAC_SECDED;
+               }
 
                empty = 0;
        }