powerpc: Fix CamelCase warnings in DDR related code
PATCH v3 1/1 powerpc: Fix CamelCase warnings in DDR related code
Some DDR related structures present in fsl_ddr_dimm_params.h, fsl_ddr_sdram.h, ddr_spd.h has various parameters with embedded acronyms capitalized that trigger the CamelCase warning in checkpatch.pl
Convert those variable names to smallcase naming convention and modify all files which are using these structures with modified structures.
---
Changes for v3:
Updated patch description. Fix warning related to force_2T in board specific files.
Changes for v2:
Corrected CamelCase error related to twoT_en and threeT_en which got missed in v0 patch. Thanks to Prabhakar Kushwaha for helping in finding this issue.
.../powerpc/cpu/mpc8xxx/ddr/common_timing_params.h | 46 ++-- arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c | 76 +++--- arch/powerpc/cpu/mpc8xxx/ddr/ddr.h | 2 +- arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c | 52 ++-- arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c | 52 ++-- arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c | 54 ++-- arch/powerpc/cpu/mpc8xxx/ddr/interactive.c | 312 ++++++++++---------- .../cpu/mpc8xxx/ddr/lc_common_dimm_params.c | 214 +++++++------- arch/powerpc/cpu/mpc8xxx/ddr/main.c | 6 +- arch/powerpc/cpu/mpc8xxx/ddr/options.c | 34 +- arch/powerpc/include/asm/fsl_ddr_dimm_params.h | 48 ++-- arch/powerpc/include/asm/fsl_ddr_sdram.h | 28 +- arch/powerpc/include/asm/immap_512x.h | 4 +- board/exmeritus/hww1u1a/ddr.c | 2 +- board/freescale/b4860qds/ddr.c | 32 +- board/freescale/bsc9131rdb/ddr.c | 26 +- board/freescale/bsc9132qds/ddr.c | 26 +- board/freescale/c29xpcie/ddr.c | 26 +- board/freescale/corenet_ds/ddr.c | 6 +- board/freescale/mpc8349emds/ddr.c | 8 +- board/freescale/mpc8540ads/ddr.c | 2 +- board/freescale/mpc8544ds/ddr.c | 2 +- board/freescale/mpc8560ads/ddr.c | 2 +- board/freescale/mpc8572ds/ddr.c | 6 +- board/freescale/mpc8610hpcd/ddr.c | 2 +- board/freescale/mpc8641hpcn/ddr.c | 2 +- board/freescale/p1010rdb/ddr.c | 26 +- board/freescale/p1022ds/ddr.c | 6 +- board/freescale/p1023rdb/ddr.c | 26 +- board/freescale/p1_p2_rdb_pc/ddr.c | 130 ++++---- board/freescale/p2020ds/ddr.c | 6 +- board/freescale/p2041rdb/ddr.c | 6 +- board/freescale/t4qds/ddr.c | 4 +- board/freescale/t4qds/ddr.h | 2 +- board/stx/stxgp3/ddr.c | 2 +- board/stx/stxssa/ddr.c | 2 +- board/xes/xpedite550x/ddr.c | 2 +- include/ddr_spd.h | 56 ++-- 38 files changed, 670 insertions(+), 668 deletions(-)
arch/powerpc/cpu/mpc8xxx/ddr/common_timing_params.h +23 -23
@@ -12,39 +12,39 @@ typedef struct { /* parameters to constrict */ - unsigned int tCKmin_X_ps; - unsigned int tCKmax_ps; - unsigned int tCKmax_max_ps; - unsigned int tRCD_ps; - unsigned int tRP_ps; - unsigned int tRAS_ps; - - unsigned int tWR_ps; /* maximum = 63750 ps */ - unsigned int tWTR_ps; /* maximum = 63750 ps */ - unsigned int tRFC_ps; /* maximum = 255 ns + 256 ns + .75 ns + unsigned int tckmin_x_ps; + unsigned int tckmax_ps; + unsigned int tckmax_max_ps; + unsigned int trcd_ps; + unsigned int trp_ps; + unsigned int tras_ps; + + unsigned int twr_ps; /* maximum = 63750 ps */ + unsigned int twtr_ps; /* maximum = 63750 ps */ + unsigned int trfc_ps; /* maximum = 255 ns + 256 ns + .75 ns = 511750 ps */ - unsigned int tRRD_ps; /* maximum = 63750 ps */ - unsigned int tRC_ps; /* maximum = 254 ns + .75 ns = 254750 ps */ + unsigned int trrd_ps; /* maximum = 63750 ps */ + unsigned int trc_ps; /* maximum = 254 ns + .75 ns = 254750 ps */ unsigned int refresh_rate_ps; - unsigned int tIS_ps; /* byte 32, spd->ca_setup */ - unsigned int tIH_ps; /* byte 33, spd->ca_hold */ - unsigned int tDS_ps; /* byte 34, spd->data_setup */ - unsigned int tDH_ps; /* byte 35, spd->data_hold */ - unsigned int tRTP_ps; /* byte 38, spd->trtp */ - unsigned int tDQSQ_max_ps; /* byte 44, spd->tdqsq */ - unsigned int tQHS_ps; /* byte 45, spd->tqhs */ + unsigned int tis_ps; /* byte 32, spd->ca_setup */ + unsigned int tih_ps; /* byte 33, spd->ca_hold */ + unsigned int tds_ps; /* byte 34, spd->data_setup */ + unsigned int tdh_ps; /* byte 35, spd->data_hold */ + unsigned int trtp_ps; /* byte 38, spd->trtp */ + unsigned int tdqsq_max_ps; /* byte 44, spd->tdqsq */ + unsigned int tqhs_ps; /* byte 45, spd->tqhs */ unsigned int ndimms_present; unsigned int lowest_common_SPD_caslat; unsigned int highest_common_derated_caslat; unsigned int additive_latency; - unsigned int all_DIMMs_burst_lengths_bitmask; - unsigned int all_DIMMs_registered; - unsigned int all_DIMMs_unbuffered; - unsigned int all_DIMMs_ECC_capable; + unsigned int all_dimms_burst_lengths_bitmask; + unsigned int all_dimms_registered; + unsigned int all_dimms_unbuffered; + unsigned int all_dimms_ecc_capable; unsigned long long total_mem; unsigned long long base_address;
arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c +38 -38
204 lines not on this page · raw message
arch/powerpc/cpu/mpc8xxx/ddr/ddr.h +1 -1
@@ -72,7 +72,7 @@ unsigned int compute_lowest_common_dimm_parameters(const dimm_params_t *dimm_params, common_timing_params_t *outpdimm, unsigned int number_of_dimms); -unsigned int populate_memctl_options (int all_DIMMs_registered, +unsigned int populate_memctl_options (int all_dimms_registered,memctl_options_t *popts,dimm_params_t *pdimm,unsigned int ctrl_num);
arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c +26 -26
83 lines not on this page · raw message
arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c +26 -26
83 lines not on this page · raw message
arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c +27 -27
143 lines not on this page · raw message
arch/powerpc/cpu/mpc8xxx/ddr/interactive.c +156 -156
428 lines not on this page · raw message
arch/powerpc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c +107 -107
354 lines not on this page · raw message
arch/powerpc/cpu/mpc8xxx/ddr/main.c +3 -3
@@ -457,7 +457,7 @@ fsl_ddr_compute(fsl_ddr_info_t *pinfo, unsigned int start_step,* which is currently STEP_ASSIGN_ADDRESSES. */ populate_memctl_options ( - timing_params[i].all_DIMMs_registered, + timing_params[i].all_dimms_registered, &pinfo->memctl_opts[i], pinfo->dimm_params[i], i);/*
@@ -466,7 +466,7 @@ fsl_ddr_compute(fsl_ddr_info_t *pinfo, unsigned int start_step,* using fixed parameters, this function should be * be called from board init file. */ -if (timing_params[i].all_DIMMs_registered) +if (timing_params[i].all_dimms_registered) assert_reset =1 ; }if (assert_reset) {
@@ -589,7 +589,7 @@ phys_size_t fsl_ddr_sdram(void)*/ deassert_reset =board_need_mem_reset ();for (i =0 ; i <CONFIG_NUM_DDR_CONTROLLERS ; i++) { -if (info.common_timing_params[i].all_DIMMs_registered) +if (info.common_timing_params[i].all_dimms_registered) deassert_reset =1 ; }for (i =0 ; i <CONFIG_NUM_DDR_CONTROLLERS ; i++) {
arch/powerpc/cpu/mpc8xxx/ddr/options.c +17 -17
@@ -499,7 +499,7 @@ static inline unsigned int auto_bank_intlv(dimm_params_t *pdimm)return 0 ; } -unsigned int populate_memctl_options (int all_DIMMs_registered, +unsigned int populate_memctl_options (int all_dimms_registered,memctl_options_t *popts,dimm_params_t *pdimm,unsigned int ctrl_num)
@@ -635,20 +635,20 @@ unsigned int populate_memctl_options(int all_DIMMs_registered, popts->ba_intlv_ctl =0 ;/* Memory Organization Parameters */ - popts->registered_dimm_en = all_DIMMs_registered; + popts->registered_dimm_en = all_dimms_registered;/* Operational Mode Paramters */ /* Pick ECC modes */ - popts->ECC_mode =0 ;/* 0 = disabled, 1 = enabled */ + popts->ecc_mode =0 ;/* 0 = disabled, 1 = enabled */ #ifdef CONFIG_DDR_ECC if (hwconfig_sub_f ("fsl_ddr" ,"ecc" , buf)) {if (hwconfig_subarg_cmp_f ("fsl_ddr" ,"ecc" ,"on" , buf)) - popts->ECC_mode =1 ; + popts->ecc_mode =1 ; }else - popts->ECC_mode =1 ; + popts->ecc_mode =1 ;#endif - popts->ECC_init_using_memctl =1 ;/* 0 = use DMA, 1 = use memctl */ + popts->ecc_init_using_memctl =1 ;/* 0 = use DMA, 1 = use memctl */ /* * Choose DQS config
@@ -656,9 +656,9 @@ unsigned int populate_memctl_options(int all_DIMMs_registered,* 1 for DDR2 */ #if defined(CONFIG_FSL_DDR1 ) - popts->DQS_config =0 ; + popts->dqs_config =0 ;#elif defined(CONFIG_FSL_DDR2 ) || defined(CONFIG_FSL_DDR3 ) - popts->DQS_config =1 ; + popts->dqs_config =1 ;#endif /* Choose self-refresh during sleep. */
@@ -705,15 +705,15 @@ unsigned int populate_memctl_options(int all_DIMMs_registered,/* Choose burst length. */ #if defined(CONFIG_FSL_DDR3 )#if defined(CONFIG_E500MC ) - popts->OTF_burst_chop_en =0 ;/* on-the-fly burst chop disable */ + popts->otf_burst_chop_en =0 ;/* on-the-fly burst chop disable */ popts->burst_length =DDR_BL8 ;/* Fixed 8-beat burst len */ #else if ((popts->data_bus_width ==1 ) || (popts->data_bus_width ==2 )) {/* 32-bit or 16-bit bus */ - popts->OTF_burst_chop_en =0 ; + popts->otf_burst_chop_en =0 ; popts->burst_length =DDR_BL8 ; }else { - popts->OTF_burst_chop_en =1 ;/* on-the-fly burst chop */ + popts->otf_burst_chop_en =1 ;/* on-the-fly burst chop */ popts->burst_length =DDR_OTF ;/* on-the-fly BC4 and BL8 */ }#endif
@@ -756,8 +756,8 @@ unsigned int populate_memctl_options(int all_DIMMs_registered,* - number of components, number of active ranks * - how much time you want to spend playing around */ - popts->twoT_en =0 ; - popts->threeT_en =0 ; + popts->twot_en =0 ; + popts->threet_en =0 ;/* for RDIMM, address parity enable */ popts->ap_en =1 ;
@@ -775,7 +775,7 @@ unsigned int populate_memctl_options(int all_DIMMs_registered, popts->bstopre =0x100 ;/* Minimum CKE pulse width -- tCKE(MIN) */ - popts->tCKE_clock_pulse_width_ps + popts->tcke_clock_pulse_width_ps =mclk_to_picos (FSL_DDR_MIN_TCKE_PULSE_WIDTH_DDR );/*
@@ -786,17 +786,17 @@ unsigned int populate_memctl_options(int all_DIMMs_registered,* FIXME: width, was considering looking at pdimm->primary_sdram_width */ #if defined(CONFIG_FSL_DDR1 ) - popts->tFAW_window_four_activates_ps =mclk_to_picos (1 ); + popts->tfaw_window_four_activates_ps =mclk_to_picos (1 );#elif defined(CONFIG_FSL_DDR2 )/* * x4/x8; some datasheets have 35000 * x16 wide columns only? Use 50000? */ - popts->tFAW_window_four_activates_ps =37500 ; + popts->tfaw_window_four_activates_ps =37500 ;#elif defined(CONFIG_FSL_DDR3 ) - popts->tFAW_window_four_activates_ps = pdimm[0 ].tFAW_ps; + popts->tfaw_window_four_activates_ps = pdimm[0 ].tfaw_ps;#endif popts->zq_en =0 ; popts->wrlvl_en =0 ;
arch/powerpc/include/asm/fsl_ddr_dimm_params.h +24 -24
72 lines not on this page · raw message
arch/powerpc/include/asm/fsl_ddr_sdram.h +14 -14
@@ -219,13 +219,13 @@ typedef struct fsl_ddr_cfg_regs_s { } fsl_ddr_cfg_regs_t;typedef struct memctl_options_partial_s { -unsigned int all_DIMMs_ECC_capable; -unsigned int all_DIMMs_tCKmax_ps; -unsigned int all_DIMMs_burst_lengths_bitmask; -unsigned int all_DIMMs_registered; -unsigned int all_DIMMs_unbuffered; +unsigned int all_dimms_ecc_capable; +unsigned int all_dimms_tckmax_ps; +unsigned int all_dimms_burst_lengths_bitmask; +unsigned int all_dimms_registered; +unsigned int all_dimms_unbuffered;/* unsigned int lowest_common_SPD_caslat; */ -unsigned int all_DIMMs_minimum_tRCD_ps; +unsigned int all_dimms_minimum_trcd_ps; }memctl_options_partial_t ;#define DDR_DATA_BUS_WIDTH_64 0
@@ -261,10 +261,10 @@ typedef struct memctl_options_s {unsigned int addr_hash;/* Operational mode parameters */ -unsigned int ECC_mode;/* Use ECC? */ +unsigned int ecc_mode;/* Use ECC? */ /* Initialize ECC using memory controller? */ -unsigned int ECC_init_using_memctl; -unsigned int DQS_config;/* Use DQS? maybe only with DDR2? */ +unsigned int ecc_init_using_memctl; +unsigned int dqs_config;/* Use DQS? maybe only with DDR2? */ /* SREN - self-refresh during sleep */ unsigned int self_refresh_in_sleep;unsigned int dynamic_power;/* DYN_PWR */
@@ -272,7 +272,7 @@ typedef struct memctl_options_s {unsigned int data_bus_width;unsigned int burst_length;/* BL4, OTF and BL8 */ /* On-The-Fly Burst Chop enable */ -unsigned int OTF_burst_chop_en; +unsigned int otf_burst_chop_en;/* mirrior DIMMs for DDR3 */ unsigned int mirrored_dimm;unsigned int quad_rank_present;
@@ -297,11 +297,11 @@ typedef struct memctl_options_s {unsigned int wrlvl_ctl_3;unsigned int half_strength_driver_enable; -unsigned int twoT_en; -unsigned int threeT_en; +unsigned int twot_en; +unsigned int threet_en;unsigned int bstopre; -unsigned int tCKE_clock_pulse_width_ps;/* tCKE */ -unsigned int tFAW_window_four_activates_ps;/* tFAW -- FOUR_ACT */ +unsigned int tcke_clock_pulse_width_ps;/* tCKE */ +unsigned int tfaw_window_four_activates_ps;/* tFAW -- FOUR_ACT */ /* Rtt impedance */ unsigned int rtt_override;/* rtt_override enable */
arch/powerpc/include/asm/immap_512x.h +2 -2
@@ -279,8 +279,8 @@ typedef struct ddr512x {u32 self_refresh_cmd_5;/* Enter/Exit Self Refresh Registers */ u32 self_refresh_cmd_6;/* Enter/Exit Self Refresh Registers */ u32 self_refresh_cmd_7;/* Enter/Exit Self Refresh Registers */ -u32 DQS_config_offset_count;/* DQS Config Offset Count */ -u32 DQS_config_offset_time;/* DQS Config Offset Time */ +u32 dqs_config_offset_count;/* DQS Config Offset Count */ +u32 dqs_config_offset_time;/* DQS Config Offset Time */ u32 DQS_delay_status;/* DQS Delay Status */ u32 res0[0xF ];u32 prioman_config1;/* Priority Manager Configuration */
board/exmeritus/hww1u1a/ddr.c +1 -1
@@ -30,5 +30,5 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->clk_adjust =4 ; popts->cpo_override =4 ; popts->write_data_delay =2 ; - popts->twoT_en =0 ; + popts->twot_en =0 ; }
board/freescale/b4860qds/ddr.c +16 -16
@@ -31,20 +31,20 @@ dimm_params_t ddr_raw_timing = { .edc_config = 2, /* ECC */ .burst_lengths_bitmask = 0x0c, - .tCKmin_X_ps = 1071, - .caslat_X = 0x2fe << 4, /* 5,6,7,8,9,10,11,13 */ - .tAA_ps = 13910, - .tWR_ps = 15000, - .tRCD_ps = 13910, - .tRRD_ps = 6000, - .tRP_ps = 13910, - .tRAS_ps = 34000, - .tRC_ps = 48910, - .tRFC_ps = 260000, - .tWTR_ps = 7500, - .tRTP_ps = 7500, + .tckmin_x_ps = 1071, + .caslat_x = 0x2fe << 4, /* 5,6,7,8,9,10,11,13 */ + .taa_ps = 13910, + .twr_ps = 15000, + .trcd_ps = 13910, + .trrd_ps = 6000, + .trp_ps = 13910, + .tras_ps = 34000, + .trc_ps = 48910, + .trfc_ps = 260000, + .twtr_ps = 7500, + .trtp_ps = 7500, .refresh_rate_ps = 7800000, - .tFAW_ps = 35000, + .tfaw_ps = 35000, }; int fsl_ddr_get_dimm_params(dimm_params_t *pdimm,
@@ -71,7 +71,7 @@ struct board_specific_parameters {u32 wrlvl_ctl_3;u32 cpo;u32 write_data_delay; -u32 force_2T; +u32 force_2t; };/*
@@ -129,7 +129,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->wrlvl_start = pbsp->wrlvl_start; popts->wrlvl_ctl_2 = pbsp->wrlvl_ctl_2; popts->wrlvl_ctl_3 = pbsp->wrlvl_ctl_3; - popts->twoT_en = pbsp->force_2T; + popts->twot_en = pbsp->force_2t; goto found; } pbsp_highest = pbsp;
@@ -146,7 +146,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->write_data_delay = pbsp_highest->write_data_delay; popts->clk_adjust = pbsp_highest->clk_adjust; popts->wrlvl_start = pbsp_highest->wrlvl_start; - popts->twoT_en = pbsp_highest->force_2T; + popts->twot_en = pbsp_highest->force_2t; }else {panic ("DIMM is not supported by this board" ); }
board/freescale/bsc9131rdb/ddr.c +13 -13
@@ -114,20 +114,20 @@ dimm_params_t ddr_raw_timing = { .edc_config = 0, .burst_lengths_bitmask = 0x0c, - .tCKmin_X_ps = 1870, - .caslat_X = 0x1e << 4, /* 5,6,7,8 */ - .tAA_ps = 13125, - .tWR_ps = 15000, - .tRCD_ps = 13125, - .tRRD_ps = 7500, - .tRP_ps = 13125, - .tRAS_ps = 37500, - .tRC_ps = 50625, - .tRFC_ps = 160000, - .tWTR_ps = 7500, - .tRTP_ps = 7500, + .tckmin_x_ps = 1870, + .caslat_x = 0x1e << 4, /* 5,6,7,8 */ + .taa_ps = 13125, + .twr_ps = 15000, + .trcd_ps = 13125, + .trrd_ps = 7500, + .trp_ps = 13125, + .tras_ps = 37500, + .trc_ps = 50625, + .trfc_ps = 160000, + .twtr_ps = 7500, + .trtp_ps = 7500, .refresh_rate_ps = 7800000, - .tFAW_ps = 37500, + .tfaw_ps = 37500, }; int fsl_ddr_get_dimm_params(dimm_params_t *pdimm,
board/freescale/bsc9132qds/ddr.c +13 -13
@@ -136,20 +136,20 @@ dimm_params_t ddr_raw_timing = { .edc_config = 0, .burst_lengths_bitmask = 0x0c, - .tCKmin_X_ps = 1870, - .caslat_X = 0x1e << 4, /* 5,6,7,8 */ - .tAA_ps = 13125, - .tWR_ps = 15000, - .tRCD_ps = 13125, - .tRRD_ps = 7500, - .tRP_ps = 13125, - .tRAS_ps = 37500, - .tRC_ps = 50625, - .tRFC_ps = 160000, - .tWTR_ps = 7500, - .tRTP_ps = 7500, + .tckmin_x_ps = 1870, + .caslat_x = 0x1e << 4, /* 5,6,7,8 */ + .taa_ps = 13125, + .twr_ps = 15000, + .trcd_ps = 13125, + .trrd_ps = 7500, + .trp_ps = 13125, + .tras_ps = 37500, + .trc_ps = 50625, + .trfc_ps = 160000, + .twtr_ps = 7500, + .trtp_ps = 7500, .refresh_rate_ps = 7800000, - .tFAW_ps = 37500, + .tfaw_ps = 37500, }; int fsl_ddr_get_dimm_params(dimm_params_t *pdimm,
board/freescale/c29xpcie/ddr.c +13 -13
@@ -26,20 +26,20 @@ dimm_params_t ddr_raw_timing = { .edc_config = 2, .burst_lengths_bitmask = 0x0c, - .tCKmin_X_ps = 1650, - .caslat_X = 0x7e << 4, /* 5,6,7,8,9,10 */ - .tAA_ps = 14050, - .tWR_ps = 15000, - .tRCD_ps = 13500, - .tRRD_ps = 75000, - .tRP_ps = 13500, - .tRAS_ps = 40000, - .tRC_ps = 49500, - .tRFC_ps = 160000, - .tWTR_ps = 75000, - .tRTP_ps = 75000, + .tckmin_x_ps = 1650, + .caslat_x = 0x7e << 4, /* 5,6,7,8,9,10 */ + .taa_ps = 14050, + .twr_ps = 15000, + .trcd_ps = 13500, + .trrd_ps = 75000, + .trp_ps = 13500, + .tras_ps = 40000, + .trc_ps = 49500, + .trfc_ps = 160000, + .twtr_ps = 75000, + .trtp_ps = 75000, .refresh_rate_ps = 7800000, - .tFAW_ps = 30000, + .tfaw_ps = 30000, }; int fsl_ddr_get_dimm_params(dimm_params_t *pdimm,
board/freescale/corenet_ds/ddr.c +3 -3
@@ -114,7 +114,7 @@ struct board_specific_parameters {u32 wrlvl_start;u32 cpo;u32 write_data_delay; -u32 force_2T; +u32 force_2t; };/*
@@ -217,7 +217,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, pbsp->write_data_delay; popts->clk_adjust = pbsp->clk_adjust; popts->wrlvl_start = pbsp->wrlvl_start; - popts->twoT_en = pbsp->force_2T; + popts->twot_en = pbsp->force_2t; goto found; } pbsp_highest = pbsp;
@@ -234,7 +234,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->write_data_delay = pbsp_highest->write_data_delay; popts->clk_adjust = pbsp_highest->clk_adjust; popts->wrlvl_start = pbsp_highest->wrlvl_start; - popts->twoT_en = pbsp_highest->force_2T; + popts->twot_en = pbsp_highest->force_2t; }else {panic ("DIMM is not supported by this board" ); }
board/freescale/mpc8349emds/ddr.c +4 -4
@@ -15,7 +15,7 @@ struct board_specific_parameters {u32 clk_adjust;u32 cpo;u32 write_data_delay; -u32 force_2T; +u32 force_2t; };/*
@@ -70,7 +70,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->cpo_override = pbsp->cpo; popts->write_data_delay = pbsp->write_data_delay; - popts->twoT_en = pbsp->force_2T; + popts->twot_en = pbsp->force_2t; goto found; } pbsp_highest = pbsp;
@@ -86,7 +86,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->clk_adjust = pbsp_highest->clk_adjust; popts->cpo_override = pbsp_highest->cpo; popts->write_data_delay = pbsp_highest->write_data_delay; - popts->twoT_en = pbsp_highest->force_2T; + popts->twot_en = pbsp_highest->force_2t; }else {panic ("DIMM is not supported by this board" ); }
@@ -97,5 +97,5 @@ found:* - number of DIMMs installed */ popts->half_strength_driver_enable =0 ; - popts->DQS_config =0 ;/* only true DQS signal is used on board */ + popts->dqs_config =0 ;/* only true DQS signal is used on board */ }
board/freescale/mpc8540ads/ddr.c +1 -1
@@ -36,7 +36,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->write_data_delay =3 ;/* 2T timing enable */ - popts->twoT_en =1 ; + popts->twot_en =1 ;/* * Factors to consider for half-strength driver enable:
board/freescale/mpc8544ds/ddr.c +1 -1
@@ -49,7 +49,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->write_data_delay =3 ;/* 2T timing enable */ - popts->twoT_en =1 ; + popts->twot_en =1 ;/* * Factors to consider for half-strength driver enable:
board/freescale/mpc8560ads/ddr.c +1 -1
@@ -36,7 +36,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->write_data_delay =3 ;/* 2T timing enable */ - popts->twoT_en =1 ; + popts->twot_en =1 ;/* * Factors to consider for half-strength driver enable:
board/freescale/mpc8572ds/ddr.c +3 -3
@@ -17,7 +17,7 @@ struct board_specific_parameters {u32 clk_adjust;u32 cpo;u32 write_data_delay; -u32 force_2T; +u32 force_2t; };/*
@@ -139,7 +139,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->cpo_override = pbsp->cpo; popts->write_data_delay = pbsp->write_data_delay; - popts->twoT_en = pbsp->force_2T; + popts->twot_en = pbsp->force_2t; goto found; } pbsp_highest = pbsp;
@@ -155,7 +155,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->clk_adjust = pbsp->clk_adjust; popts->cpo_override = pbsp->cpo; popts->write_data_delay = pbsp->write_data_delay; - popts->twoT_en = pbsp->force_2T; + popts->twot_en = pbsp->force_2t; }else {panic ("DIMM is not supported by this board" ); }
board/freescale/mpc8610hpcd/ddr.c +1 -1
@@ -49,7 +49,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->write_data_delay =3 ;/* 2T timing enable */ - popts->twoT_en =1 ; + popts->twot_en =1 ;/* * Factors to consider for half-strength driver enable:
board/freescale/mpc8641hpcn/ddr.c +1 -1
@@ -106,5 +106,5 @@ void fsl_ddr_board_options(memctl_options_t *popts, found:/* 2T timing enable */ - popts->twoT_en =1 ; + popts->twot_en =1 ; }
board/freescale/p1010rdb/ddr.c +13 -13
@@ -172,20 +172,20 @@ dimm_params_t ddr_raw_timing = { .edc_config = 0, .burst_lengths_bitmask = 0x0c, - .tCKmin_X_ps = 1875, - .caslat_X = 0x1e << 4, /* 5,6,7,8 */ - .tAA_ps = 13125, - .tWR_ps = 15000, - .tRCD_ps = 13125, - .tRRD_ps = 7500, - .tRP_ps = 13125, - .tRAS_ps = 37500, - .tRC_ps = 50625, - .tRFC_ps = 160000, - .tWTR_ps = 7500, - .tRTP_ps = 7500, + .tckmin_x_ps = 1875, + .caslat_x = 0x1e << 4, /* 5,6,7,8 */ + .taa_ps = 13125, + .twr_ps = 15000, + .trcd_ps = 13125, + .trrd_ps = 7500, + .trp_ps = 13125, + .tras_ps = 37500, + .trc_ps = 50625, + .trfc_ps = 160000, + .twtr_ps = 7500, + .trtp_ps = 7500, .refresh_rate_ps = 7800000, - .tFAW_ps = 37500, + .tfaw_ps = 37500, }; int fsl_ddr_get_dimm_params(dimm_params_t *pdimm,
board/freescale/p1022ds/ddr.c +3 -3
@@ -17,7 +17,7 @@ struct board_specific_parameters {u32 clk_adjust;/* Range: 0-8 */ u32 cpo;/* Range: 2-31 */ u32 write_data_delay;/* Range: 0-6 */ -u32 force_2T; +u32 force_2t; };/*
@@ -72,7 +72,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm, popts->cpo_override = pbsp->cpo; popts->write_data_delay = pbsp->write_data_delay; - popts->twoT_en = pbsp->force_2T; + popts->twot_en = pbsp->force_2t; goto found; } pbsp_highest = pbsp;
@@ -88,7 +88,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm, popts->clk_adjust = pbsp->clk_adjust; popts->cpo_override = pbsp->cpo; popts->write_data_delay = pbsp->write_data_delay; - popts->twoT_en = pbsp->force_2T; + popts->twot_en = pbsp->force_2t; }else {panic ("DIMM is not supported by this board" ); }
board/freescale/p1023rdb/ddr.c +13 -13
@@ -33,20 +33,20 @@ dimm_params_t ddr_raw_timing = { .edc_config = 0, .burst_lengths_bitmask = 0x0c, - .tCKmin_X_ps = 1875, - .caslat_X = 0x1e << 4, /* 5,6,7,8 */ - .tAA_ps = 13125, - .tWR_ps = 18000, - .tRCD_ps = 13125, - .tRRD_ps = 7500, - .tRP_ps = 13125, - .tRAS_ps = 37500, - .tRC_ps = 50625, - .tRFC_ps = 160000, - .tWTR_ps = 7500, - .tRTP_ps = 7500, + .tckmin_x_ps = 1875, + .caslat_x = 0x1e << 4, /* 5,6,7,8 */ + .taa_ps = 13125, + .twr_ps = 18000, + .trcd_ps = 13125, + .trrd_ps = 7500, + .trp_ps = 13125, + .tras_ps = 37500, + .trc_ps = 50625, + .trfc_ps = 160000, + .twtr_ps = 7500, + .trtp_ps = 7500, .refresh_rate_ps = 7800000, - .tFAW_ps = 37500, + .tfaw_ps = 37500, }; int fsl_ddr_get_dimm_params(dimm_params_t *pdimm,
board/freescale/p1_p2_rdb_pc/ddr.c +65 -65
165 lines not on this page · raw message
board/freescale/p2020ds/ddr.c +3 -3
@@ -17,7 +17,7 @@ struct board_specific_parameters {u32 clk_adjust;u32 cpo;u32 write_data_delay; -u32 force_2T; +u32 force_2t; };
@@ -90,7 +90,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->cpo_override = pbsp->cpo; popts->write_data_delay = pbsp->write_data_delay; - popts->twoT_en = pbsp->force_2T; + popts->twot_en = pbsp->force_2t; goto found; } pbsp_highest = pbsp;
@@ -106,7 +106,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->clk_adjust = pbsp_highest->clk_adjust; popts->cpo_override = pbsp_highest->cpo; popts->write_data_delay = pbsp_highest->write_data_delay; - popts->twoT_en = pbsp_highest->force_2T; + popts->twot_en = pbsp_highest->force_2t; }else {panic ("DIMM is not supported by this board" ); }
board/freescale/p2041rdb/ddr.c +3 -3
@@ -21,7 +21,7 @@ struct board_specific_parameters {u32 wrlvl_start;u32 cpo;u32 write_data_delay; -u32 force_2T; +u32 force_2t; };/*
@@ -76,7 +76,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, pbsp->write_data_delay; popts->clk_adjust = pbsp->clk_adjust; popts->wrlvl_start = pbsp->wrlvl_start; - popts->twoT_en = pbsp->force_2T; + popts->twot_en = pbsp->force_2t; goto found; } pbsp_highest = pbsp;
@@ -93,7 +93,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->write_data_delay = pbsp_highest->write_data_delay; popts->clk_adjust = pbsp_highest->clk_adjust; popts->wrlvl_start = pbsp_highest->wrlvl_start; - popts->twoT_en = pbsp_highest->force_2T; + popts->twot_en = pbsp_highest->force_2t; }else {panic ("DIMM is not supported by this board" ); }
board/freescale/t4qds/ddr.c +2 -2
@@ -56,7 +56,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->wrlvl_start = pbsp->wrlvl_start; popts->wrlvl_ctl_2 = pbsp->wrlvl_ctl_2; popts->wrlvl_ctl_3 = pbsp->wrlvl_ctl_3; - popts->twoT_en = pbsp->force_2T; + popts->twot_en = pbsp->force_2t; goto found; } pbsp_highest = pbsp;
@@ -75,7 +75,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->wrlvl_start = pbsp_highest->wrlvl_start; popts->wrlvl_ctl_2 = pbsp->wrlvl_ctl_2; popts->wrlvl_ctl_3 = pbsp->wrlvl_ctl_3; - popts->twoT_en = pbsp_highest->force_2T; + popts->twot_en = pbsp_highest->force_2t; }else {panic ("DIMM is not supported by this board" ); }
board/freescale/t4qds/ddr.h +1 -1
@@ -16,7 +16,7 @@ struct board_specific_parameters {u32 wrlvl_ctl_3;u32 cpo;u32 write_data_delay; -u32 force_2T; +u32 force_2t; };/*
board/stx/stxgp3/ddr.c +1 -1
@@ -36,7 +36,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->write_data_delay =3 ;/* 2T timing enable */ - popts->twoT_en =1 ; + popts->twot_en =1 ;/* * Factors to consider for half-strength driver enable:
board/stx/stxssa/ddr.c +1 -1
@@ -37,7 +37,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->write_data_delay =3 ;/* 2T timing enable */ - popts->twoT_en =1 ; + popts->twot_en =1 ;/* * Factors to consider for half-strength driver enable:
board/xes/xpedite550x/ddr.c +1 -1
@@ -108,7 +108,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, ddr_freq <= pbsp->datarate_mhz_high) { popts->clk_adjust = pbsp->clk_adjust; popts->cpo_override = pbsp->cpo; - popts->twoT_en =0 ; + popts->twot_en =0 ;break ; } pbsp++;
include/ddr_spd.h +29 -27
89 lines not on this page · raw message
Signature · 1 line
1.7.4.1
PATCH v3 1/1 powerpc: Fix CamelCase warnings in DDR related code
Quoted 8 lines · Priyanka Jain
Some DDR related structures present in
fsl_ddr_dimm_params.h,fsl_ddr_sdram.h,ddr_spd.hhas various parameters with embedded acronyms capitalized that trigger the CamelCase warning in checkpatch.plConvert those variable names to smallcase naming convention and modify all files which are using these structures with modified structures.
Signed-off-by Priyanka Jain <[email protected]>
Quoted 9 lines
---
Changes for v3:
Updated patch description. Fix warning related toforce_2Tin board specific files.
Changes for v2:
Corrected CamelCase error related totwoT_enandthreeT_enwhich got missed in v0 patch. Thanks to Prabhakar Kushwaha for helping in finding this issue.
Applied to u-boot-mpc85xx/next, pending merging to u-boot-mpc85xx/master branch.
York