| Message ID | 20211118081939.861407-7-sr@denx.de |
|---|---|
| State | Accepted |
| Commit | 622882893d83e73e63d6c8c03c81bbbd2f04c19a |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | [1/9] arm: mvebu: theadorable_debug_defconfig: Enable DM_I2C | expand |
On 11/18/21 09:19, Stefan Roese wrote: > This function is not referenced in mainline U-Boot. Let's remove now. > > Signed-off-by: Stefan Roese <sr@denx.de> Applied to u-boot-marvell/next Thanks, Stefan > --- > drivers/ddr/marvell/axp/ddr3_hw_training.h | 1 - > drivers/ddr/marvell/axp/ddr3_init.c | 24 ---------------------- > drivers/ddr/marvell/axp/ddr3_init.h | 1 - > 3 files changed, 26 deletions(-) > > diff --git a/drivers/ddr/marvell/axp/ddr3_hw_training.h b/drivers/ddr/marvell/axp/ddr3_hw_training.h > index 30daaa9831b9..fcdef792c76a 100644 > --- a/drivers/ddr/marvell/axp/ddr3_hw_training.h > +++ b/drivers/ddr/marvell/axp/ddr3_hw_training.h > @@ -373,7 +373,6 @@ int ddr3_load_dqs_patterns(MV_DRAM_INFO *dram_info); > > void ddr3_static_training_init(void); > > -u8 ddr3_get_eprom_fabric(void); > void ddr3_set_performance_params(MV_DRAM_INFO *dram_info); > int ddr3_dram_sram_burst(u32 src, u32 dst, u32 len); > void ddr3_save_training(MV_DRAM_INFO *dram_info); > diff --git a/drivers/ddr/marvell/axp/ddr3_init.c b/drivers/ddr/marvell/axp/ddr3_init.c > index 607f3e12c3ae..c5aa1ac18f51 100644 > --- a/drivers/ddr/marvell/axp/ddr3_init.c > +++ b/drivers/ddr/marvell/axp/ddr3_init.c > @@ -943,30 +943,6 @@ int ddr3_check_config(u32 twsi_addr, MV_CONFIG_TYPE config_type) > return 0; > } > > -#if defined(DB_88F78X60_REV2) > -/* > - * Name: ddr3_get_eprom_fabric - Get Fabric configuration from EPROM > - * Desc: > - * Args: twsi Address > - * Notes: Only Available for ArmadaXP DB Rev2 boards > - * Returns: None. > - */ > -u8 ddr3_get_eprom_fabric(void) > -{ > -#ifdef AUTO_DETECTION_SUPPORT > - u8 data = 0; > - int ret; > - > - ret = i2c_read(NEW_FABRIC_TWSI_ADDR, 1, 1, (u8 *)&data, 1); > - if (!ret) > - return data & 0x1F; > -#endif > - > - return 0; > -} > - > -#endif > - > /* > * Name: ddr3_cl_to_valid_cl - this return register matching CL value > * Desc: > diff --git a/drivers/ddr/marvell/axp/ddr3_init.h b/drivers/ddr/marvell/axp/ddr3_init.h > index 569a14b7184f..9a21886ac3e7 100644 > --- a/drivers/ddr/marvell/axp/ddr3_init.h > +++ b/drivers/ddr/marvell/axp/ddr3_init.h > @@ -98,7 +98,6 @@ int ddr3_hw_training(u32 target_freq, u32 ddr_width, > > void ddr3_print_version(void); > void fix_pll_val(u8 target_fab); > -u8 ddr3_get_eprom_fabric(void); > u32 ddr3_get_fab_opt(void); > u32 ddr3_get_cpu_freq(void); > u32 ddr3_get_vco_freq(void); > Viele Grüße, Stefan Roese
diff --git a/drivers/ddr/marvell/axp/ddr3_hw_training.h b/drivers/ddr/marvell/axp/ddr3_hw_training.h index 30daaa9831b9..fcdef792c76a 100644 --- a/drivers/ddr/marvell/axp/ddr3_hw_training.h +++ b/drivers/ddr/marvell/axp/ddr3_hw_training.h @@ -373,7 +373,6 @@ int ddr3_load_dqs_patterns(MV_DRAM_INFO *dram_info); void ddr3_static_training_init(void); -u8 ddr3_get_eprom_fabric(void); void ddr3_set_performance_params(MV_DRAM_INFO *dram_info); int ddr3_dram_sram_burst(u32 src, u32 dst, u32 len); void ddr3_save_training(MV_DRAM_INFO *dram_info); diff --git a/drivers/ddr/marvell/axp/ddr3_init.c b/drivers/ddr/marvell/axp/ddr3_init.c index 607f3e12c3ae..c5aa1ac18f51 100644 --- a/drivers/ddr/marvell/axp/ddr3_init.c +++ b/drivers/ddr/marvell/axp/ddr3_init.c @@ -943,30 +943,6 @@ int ddr3_check_config(u32 twsi_addr, MV_CONFIG_TYPE config_type) return 0; } -#if defined(DB_88F78X60_REV2) -/* - * Name: ddr3_get_eprom_fabric - Get Fabric configuration from EPROM - * Desc: - * Args: twsi Address - * Notes: Only Available for ArmadaXP DB Rev2 boards - * Returns: None. - */ -u8 ddr3_get_eprom_fabric(void) -{ -#ifdef AUTO_DETECTION_SUPPORT - u8 data = 0; - int ret; - - ret = i2c_read(NEW_FABRIC_TWSI_ADDR, 1, 1, (u8 *)&data, 1); - if (!ret) - return data & 0x1F; -#endif - - return 0; -} - -#endif - /* * Name: ddr3_cl_to_valid_cl - this return register matching CL value * Desc: diff --git a/drivers/ddr/marvell/axp/ddr3_init.h b/drivers/ddr/marvell/axp/ddr3_init.h index 569a14b7184f..9a21886ac3e7 100644 --- a/drivers/ddr/marvell/axp/ddr3_init.h +++ b/drivers/ddr/marvell/axp/ddr3_init.h @@ -98,7 +98,6 @@ int ddr3_hw_training(u32 target_freq, u32 ddr_width, void ddr3_print_version(void); void fix_pll_val(u8 target_fab); -u8 ddr3_get_eprom_fabric(void); u32 ddr3_get_fab_opt(void); u32 ddr3_get_cpu_freq(void); u32 ddr3_get_vco_freq(void);
This function is not referenced in mainline U-Boot. Let's remove now. Signed-off-by: Stefan Roese <sr@denx.de> --- drivers/ddr/marvell/axp/ddr3_hw_training.h | 1 - drivers/ddr/marvell/axp/ddr3_init.c | 24 ---------------------- drivers/ddr/marvell/axp/ddr3_init.h | 1 - 3 files changed, 26 deletions(-)