diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-15 08:49:20 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-15 08:49:26 +0200 |
| commit | c7595a3f815fcf052e2c8e7830f6c92aed34cb9b (patch) | |
| tree | 4df36241892ef04b6321e60427dd5da5a400fbd8 /arch/powerpc | |
| parent | bef194fd8581e8ad83744b4c6c33c4a4da84be09 (diff) | |
| download | barebox-c7595a3f815fcf052e2c8e7830f6c92aed34cb9b.tar.gz barebox-c7595a3f815fcf052e2c8e7830f6c92aed34cb9b.tar.xz | |
powerpc: Add prototypes to header file
This adds prototypes of the board specific functions
fsl_ddr_board_options() and fsl_ddr_board_info() to a header
file. Including this header file from the board files reveals
that the prototypes are different across the different implementations,
so harmonize them.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/boards/freescale-p1010rdb/ddr.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/boards/freescale-p1022ds/ddr.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/ddr-8xxx/ddr.h | 4 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/fsl_ddr_sdram.h | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/arch/powerpc/boards/freescale-p1010rdb/ddr.c b/arch/powerpc/boards/freescale-p1010rdb/ddr.c index 18069f4df1..14fa426726 100644 --- a/arch/powerpc/boards/freescale-p1010rdb/ddr.c +++ b/arch/powerpc/boards/freescale-p1010rdb/ddr.c @@ -20,7 +20,7 @@ static const u8 spd_addr = 0x52; -int fsl_ddr_board_info(struct ddr_board_info_s *info) +void fsl_ddr_board_info(struct ddr_board_info_s *info) { p1010rdb_early_init(); @@ -34,8 +34,6 @@ int fsl_ddr_board_info(struct ddr_board_info_s *info) info->i2c_speed = 400000; info->i2c_base = IOMEM(I2C2_BASE_ADDR); info->spd_i2c_addr = &spd_addr; - - return 0; } void fsl_ddr_board_options(struct memctl_options_s *popts, diff --git a/arch/powerpc/boards/freescale-p1022ds/ddr.c b/arch/powerpc/boards/freescale-p1022ds/ddr.c index 1944518c79..3a8298f928 100644 --- a/arch/powerpc/boards/freescale-p1022ds/ddr.c +++ b/arch/powerpc/boards/freescale-p1022ds/ddr.c @@ -19,7 +19,7 @@ static const u8 spd_addr = 0x51; -int fsl_ddr_board_info(struct ddr_board_info_s *info) +void fsl_ddr_board_info(struct ddr_board_info_s *info) { /* * Early mapping is needed to access the clock @@ -37,8 +37,6 @@ int fsl_ddr_board_info(struct ddr_board_info_s *info) info->i2c_speed = 400000; info->i2c_base = IOMEM(I2C2_BASE_ADDR); info->spd_i2c_addr = &spd_addr; - - return 0; } struct board_specific_parameters { diff --git a/arch/powerpc/ddr-8xxx/ddr.h b/arch/powerpc/ddr-8xxx/ddr.h index 2ef87f2776..8560e37167 100644 --- a/arch/powerpc/ddr-8xxx/ddr.h +++ b/arch/powerpc/ddr-8xxx/ddr.h @@ -109,8 +109,4 @@ int fsl_ddr_get_spd( struct ddr_board_info_s *binfo); int fsl_ddr_set_memctl_regs( const struct fsl_ddr_info_s *info); -void fsl_ddr_board_options( - struct memctl_options_s *popts, - struct dimm_params_s *pdimm); -void fsl_ddr_board_info(struct ddr_board_info_s *info); #endif diff --git a/arch/powerpc/include/asm/fsl_ddr_sdram.h b/arch/powerpc/include/asm/fsl_ddr_sdram.h index f4732389f6..b6c0b4dd7a 100644 --- a/arch/powerpc/include/asm/fsl_ddr_sdram.h +++ b/arch/powerpc/include/asm/fsl_ddr_sdram.h @@ -184,4 +184,12 @@ struct memctl_options_s { extern phys_size_t fsl_ddr_sdram(void); extern phys_size_t fixed_sdram(void); + +struct dimm_params_s; + +void fsl_ddr_board_options( + struct memctl_options_s *popts, + struct dimm_params_s *pdimm); +void fsl_ddr_board_info(struct ddr_board_info_s *info); + #endif |