diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-07 14:23:38 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-07 14:23:38 +0100 |
commit | 369d39adfe79334db5ed04d6f2acaf096c68b8a2 (patch) | |
tree | 9478a42e66c46e2f2b70ede9cd0b07dfc4f29298 /arch | |
parent | 8f397a4b163f6ee149837f0ab0dfd4081a720010 (diff) | |
parent | c57b0f9130fc759b9d1c354cea9f740eeb39615e (diff) | |
download | barebox-369d39adfe79334db5ed04d6f2acaf096c68b8a2.tar.gz barebox-369d39adfe79334db5ed04d6f2acaf096c68b8a2.tar.xz |
Merge branch 'for-next/spd'
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ppc/ddr-8xxx/ddr2_dimm_params.c | 6 | ||||
-rw-r--r-- | arch/ppc/ddr-8xxx/ddr3_dimm_params.c | 10 | ||||
-rw-r--r-- | arch/ppc/include/asm/fsl_ddr_sdram.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/arch/ppc/ddr-8xxx/ddr2_dimm_params.c b/arch/ppc/ddr-8xxx/ddr2_dimm_params.c index cc7f3fa6ba..22c05ca6da 100644 --- a/arch/ppc/ddr-8xxx/ddr2_dimm_params.c +++ b/arch/ppc/ddr-8xxx/ddr2_dimm_params.c @@ -190,13 +190,13 @@ uint32_t compute_dimm_parameters(const generic_spd_eeprom_t *spdin, struct dimm_params_s *pdimm) { - const struct ddr2_spd_eeprom_s *spd = spdin; - uint32_t retval; + const struct ddr2_spd_eeprom *spd = spdin; + int retval; if (spd->mem_type != SPD_MEMTYPE_DDR2) goto error; - retval = ddr2_spd_checksum_pass(spd); + retval = ddr2_spd_check(spd); if (retval) goto error; diff --git a/arch/ppc/ddr-8xxx/ddr3_dimm_params.c b/arch/ppc/ddr-8xxx/ddr3_dimm_params.c index d510c5b265..4f44925ab9 100644 --- a/arch/ppc/ddr-8xxx/ddr3_dimm_params.c +++ b/arch/ppc/ddr-8xxx/ddr3_dimm_params.c @@ -50,7 +50,7 @@ * 010 16bits * 011 32bits */ -static uint64_t compute_ranksize(const struct ddr3_spd_eeprom_s *spd) +static uint64_t compute_ranksize(const struct ddr3_spd_eeprom *spd) { uint64_t bsize; int sdram_cap_bsize = 0, prim_bus_width = 0, sdram_width = 0; @@ -78,14 +78,14 @@ uint32_t compute_dimm_parameters(const generic_spd_eeprom_t *spdin, struct dimm_params_s *pdimm) { - const struct ddr3_spd_eeprom_s *spd = spdin; - uint32_t retval, mtb_ps; - int ftb_tmp; + const struct ddr3_spd_eeprom *spd = spdin; + uint32_t mtb_ps; + int retval, ftb_tmp; if (spd->mem_type != SPD_MEMTYPE_DDR3) goto error; - retval = ddr3_spd_checksum_pass(spd); + retval = ddr3_spd_check(spd); if (retval) goto error; diff --git a/arch/ppc/include/asm/fsl_ddr_sdram.h b/arch/ppc/include/asm/fsl_ddr_sdram.h index 2c45608e5d..f4732389f6 100644 --- a/arch/ppc/include/asm/fsl_ddr_sdram.h +++ b/arch/ppc/include/asm/fsl_ddr_sdram.h @@ -32,10 +32,10 @@ #define FSL_DDR_MIN_TCKE_PULSE_WIDTH_DDR (3) #if defined(CONFIG_FSL_DDR2) -typedef struct ddr2_spd_eeprom_s generic_spd_eeprom_t; +typedef struct ddr2_spd_eeprom generic_spd_eeprom_t; #define FSL_SDRAM_TYPE SDRAM_TYPE_DDR2 #elif defined(CONFIG_FSL_DDR3) -typedef struct ddr3_spd_eeprom_s generic_spd_eeprom_t; +typedef struct ddr3_spd_eeprom generic_spd_eeprom_t; #define FSL_SDRAM_TYPE SDRAM_TYPE_DDR3 #endif |