GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

veyron_pinky/rk3288: Use KHz, MHz and GHz constants 

Use the previously added frequency constants in patch
titled 'stddef: Add KHz, MHz and GHz constants'.

BUG=None
TEST=Compiled Veyron_Pinky.

Original-Change-Id: I4a1927fd423eb96d3f76f7e44b451192038b02e0
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/221800
Original-Reviewed-by: David Hendricks <dhendrix@chromium.org>

(cherry picked from commit 41bb8026818b4381d4a6d43d2d433c207c3971bc)
Signed-off-by: Aaron Durbin <adurbin@chromium.org>

Change-Id: I37a610d57f1a3d44796bf80de5104c2b5b3f3dac
Reviewed-on: http://review.coreboot.org/9254
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Julius Werner 2014-10-06 13:41:28 -07:00 committed by Aaron Durbin
parent 46826c36bf
commit b6092b7e39
10 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mainboard/google/veyron_pinky/bootblock.c
View File

@ -32,11 +32,11 @@ void bootblock_mainboard_init(void)
/* spi2 for firmware ROM */ /* spi2 for firmware ROM */
writel(IOMUX_SPI2_CSCLK, &rk3288_grf->iomux_spi2csclk); writel(IOMUX_SPI2_CSCLK, &rk3288_grf->iomux_spi2csclk);
writel(IOMUX_SPI2_TXRX, &rk3288_grf->iomux_spi2txrx); writel(IOMUX_SPI2_TXRX, &rk3288_grf->iomux_spi2txrx);
rockchip_spi_init(CONFIG_BOOT_MEDIA_SPI_BUS, 11000000); rockchip_spi_init(CONFIG_BOOT_MEDIA_SPI_BUS, 11*MHz);
/* spi0 for chrome ec */ /* spi0 for chrome ec */
writel(IOMUX_SPI0, &rk3288_grf->iomux_spi0); writel(IOMUX_SPI0, &rk3288_grf->iomux_spi0);
rockchip_spi_init(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS, 9000000); rockchip_spi_init(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS, 9*MHz);
setup_chromeos_gpios(); setup_chromeos_gpios();
} }

2
src/mainboard/google/veyron_pinky/sdram_inf/sdram-ddr3-hynix-2GB.inc
View File

@ -69,7 +69,7 @@
.noc_timing = 0x2891E41D, .noc_timing = 0x2891E41D,
.noc_activate = 0x5B6, .noc_activate = 0x5B6,
.ddrconfig = 3, .ddrconfig = 3,
.ddr_freq = 533000000, .ddr_freq = 533*MHz,
.dramtype = DDR3, .dramtype = DDR3,
.num_channels = 2, .num_channels = 2,
.stride = 9, .stride = 9,

2
src/mainboard/google/veyron_pinky/sdram_inf/sdram-ddr3-samsung-2GB.inc
View File

@ -70,7 +70,7 @@
.noc_timing = 0x30B25564, .noc_timing = 0x30B25564,
.noc_activate = 0x627, .noc_activate = 0x627,
.ddrconfig = 3, .ddrconfig = 3,
.ddr_freq = 666000000, .ddr_freq = 666*MHz,
.dramtype = DDR3, .dramtype = DDR3,
.num_channels = 2, .num_channels = 2,
.stride = 9, .stride = 9,

2
src/mainboard/google/veyron_pinky/sdram_inf/sdram-lpddr3-samsung-2GB.inc
View File

@ -70,7 +70,7 @@
.noc_timing = 0x20D266A4, .noc_timing = 0x20D266A4,
.noc_activate = 0x5B6, .noc_activate = 0x5B6,
.ddrconfig = 2, .ddrconfig = 2,
.ddr_freq = 533000000, .ddr_freq = 533*MHz,
.dramtype = LPDDR3, .dramtype = LPDDR3,
.num_channels = 2, .num_channels = 2,
.stride = 9, .stride = 9,

15
src/soc/rockchip/rk3288/clock.c
View File

@ -65,8 +65,8 @@ check_member(rk3288_cru_reg, cru_emmc_con[1], 0x021c);
static struct rk3288_cru_reg * const cru_ptr = (void *)CRU_BASE; static struct rk3288_cru_reg * const cru_ptr = (void *)CRU_BASE;
#define PLL_DIVISORS(hz, _nr, _no) {\ #define PLL_DIVISORS(hz, _nr, _no) {\
.nr = _nr, .nf = (u32)((u64)hz * _nr * _no / 24000000), .no = _no};\ .nr = _nr, .nf = (u32)((u64)hz * _nr * _no / (24*MHz)), .no = _no};\
_Static_assert(((u64)hz * _nr * _no / 24000000) * 24000000 /\ _Static_assert(((u64)hz * _nr * _no / (24*MHz)) * (24*MHz) /\
(_nr * _no) == hz,\ (_nr * _no) == hz,\
#hz "Hz cannot be hit with PLL divisors in " __FILE__); #hz "Hz cannot be hit with PLL divisors in " __FILE__);
@ -337,10 +337,10 @@ void rkclk_configure_ddr(unsigned int hz)
{ {
struct pll_div dpll_cfg; struct pll_div dpll_cfg;
if (hz <= 150000000) { if (hz <= 150*MHz) {
dpll_cfg.nr = 3; dpll_cfg.nr = 3;
dpll_cfg.no = 8; dpll_cfg.no = 8;
} else if (hz <= 540000000) { } else if (hz <= 540*MHz) {
dpll_cfg.nr = 6; dpll_cfg.nr = 6;
dpll_cfg.no = 4; dpll_cfg.no = 4;
} else { } else {
@ -348,10 +348,9 @@ void rkclk_configure_ddr(unsigned int hz)
dpll_cfg.no = 1; dpll_cfg.no = 1;
} }
dpll_cfg.nf = (hz / 1000 * dpll_cfg.nr * dpll_cfg.no) / 24000; dpll_cfg.nf = (hz/KHz * dpll_cfg.nr * dpll_cfg.no) / (24*KHz);
assert(dpll_cfg.nf < 4096 assert(dpll_cfg.nf < 4096 && hz == dpll_cfg.nf * (24*KHz) /
&& hz == dpll_cfg.nf * 24000 / (dpll_cfg.nr * dpll_cfg.no) (dpll_cfg.nr * dpll_cfg.no) * 1000);
* 1000);
/* pll enter slow-mode */ /* pll enter slow-mode */
writel(RK_CLRSETBITS(DPLL_MODE_MSK, DPLL_MODE_SLOW), writel(RK_CLRSETBITS(DPLL_MODE_MSK, DPLL_MODE_SLOW),
&cru_ptr->cru_mode_con); &cru_ptr->cru_mode_con);

18
src/soc/rockchip/rk3288/clock.h
View File

@ -22,17 +22,17 @@
#include "addressmap.h" #include "addressmap.h"
#define APLL_HZ 816000000 #define APLL_HZ (816*MHz)
#define GPLL_HZ 594000000 #define GPLL_HZ (594*MHz)
#define CPLL_HZ 384000000 #define CPLL_HZ (384*MHz)
#define PD_BUS_ACLK_HZ 148500000 #define PD_BUS_ACLK_HZ (148500*KHz)
#define PD_BUS_HCLK_HZ 148500000 #define PD_BUS_HCLK_HZ (148500*KHz)
#define PD_BUS_PCLK_HZ 74250000 #define PD_BUS_PCLK_HZ (74250*KHz)
#define PERI_ACLK_HZ 148500000 #define PERI_ACLK_HZ (148500*KHz)
#define PERI_HCLK_HZ 148500000 #define PERI_HCLK_HZ (148500*KHz)
#define PERI_PCLK_HZ 74250000 #define PERI_PCLK_HZ (74250*KHz)
void rkclk_init(void); void rkclk_init(void);
void rkclk_configure_spi(unsigned int bus, unsigned int hz); void rkclk_configure_spi(unsigned int bus, unsigned int hz);

32
src/soc/rockchip/rk3288/sdram.c
View File

@ -538,8 +538,8 @@ static void phy_dll_bypass_set(struct rk3288_ddr_publ_regs *ddr_publ_regs,
u32 freq) u32 freq)
{ {
int i; int i;
if (freq <= 250000000) { if (freq <= 250*MHz) {
if (freq <= 150000000) if (freq <= 150*MHz)
clrbits_le32(&ddr_publ_regs->dllgcr, SBIAS_BYPASS); clrbits_le32(&ddr_publ_regs->dllgcr, SBIAS_BYPASS);
else else
setbits_le32(&ddr_publ_regs->dllgcr, SBIAS_BYPASS); setbits_le32(&ddr_publ_regs->dllgcr, SBIAS_BYPASS);
@ -651,19 +651,19 @@ static void phy_cfg(u32 channel, const struct rk3288_sdram_params *sdram_params)
writel(sdram_params->noc_activate, &msch_regs->activate); writel(sdram_params->noc_activate, &msch_regs->activate);
writel(BUSWRTORD(2) | BUSRDTOWR(2) | BUSRDTORD(1), writel(BUSWRTORD(2) | BUSRDTOWR(2) | BUSRDTORD(1),
&msch_regs->devtodev); &msch_regs->devtodev);
writel(PRT_DLLLOCK(div_round_up(sdram_params->ddr_freq / 1000000 writel(PRT_DLLLOCK(div_round_up(sdram_params->ddr_freq/MHz
* 5120, 1000)) * 5120, 1000))
| PRT_DLLSRST(div_round_up(sdram_params->ddr_freq / 1000000 | PRT_DLLSRST(div_round_up(sdram_params->ddr_freq/MHz
* 50, 1000)) * 50, 1000))
| PRT_ITMSRST(8), &ddr_publ_regs->ptr[0]); | PRT_ITMSRST(8), &ddr_publ_regs->ptr[0]);
writel(PRT_DINIT0(div_round_up(sdram_params->ddr_freq / 1000000 writel(PRT_DINIT0(div_round_up(sdram_params->ddr_freq/MHz
* 500000, 1000)) * 500000, 1000))
| PRT_DINIT1(div_round_up(sdram_params->ddr_freq / 1000000 | PRT_DINIT1(div_round_up(sdram_params->ddr_freq/MHz
* 400, 1000)), &ddr_publ_regs->ptr[1]); * 400, 1000)), &ddr_publ_regs->ptr[1]);
writel(PRT_DINIT2(div_round_up(sdram_params->ddr_freq / 1000000 writel(PRT_DINIT2(div_round_up(sdram_params->ddr_freq/MHz
* 200000, 1000)) * 200000, 1000))
| PRT_DINIT3(div_round_up(sdram_params->ddr_freq / 1000000 | PRT_DINIT3(div_round_up(sdram_params->ddr_freq/MHz
* 1000, 1000)), &ddr_publ_regs->ptr[2]); * 1000, 1000)), &ddr_publ_regs->ptr[2]);
switch (sdram_params->dramtype) { switch (sdram_params->dramtype) {
case LPDDR3: case LPDDR3:
@ -971,9 +971,9 @@ void sdram_init(const struct rk3288_sdram_params *sdram_params)
printk(BIOS_INFO, "Starting SDRAM initialization...\n"); printk(BIOS_INFO, "Starting SDRAM initialization...\n");
if ((sdram_params->dramtype == DDR3 if ((sdram_params->dramtype == DDR3
&& sdram_params->ddr_freq > 800000000) && sdram_params->ddr_freq > 800*MHz)
|| (sdram_params->dramtype == LPDDR3 || (sdram_params->dramtype == LPDDR3
&& sdram_params->ddr_freq > 533000000)) && sdram_params->ddr_freq > 533*MHz))
die("SDRAM frequency is to high!"); die("SDRAM frequency is to high!");
rkclk_configure_ddr(sdram_params->ddr_freq); rkclk_configure_ddr(sdram_params->ddr_freq);

2
src/soc/rockchip/rk3288/spi.c
View File

@ -36,7 +36,7 @@ struct rockchip_spi_slave {
}; };
#define SPI_TIMEOUT_US 1000 #define SPI_TIMEOUT_US 1000
#define SPI_SRCCLK_HZ 99000000 #define SPI_SRCCLK_HZ (99*MHz)
#define SPI_FIFO_DEPTH 32 #define SPI_FIFO_DEPTH 32
static struct rockchip_spi_slave rockchip_spi_slaves[3] = { static struct rockchip_spi_slave rockchip_spi_slaves[3] = {

1
src/soc/rockchip/rk3288/timer.c
View File

@ -18,7 +18,6 @@
*/ */
#include <console/console.h> #include <console/console.h>
#include <timer.h>
#include <delay.h> #include <delay.h>
#include <arch/io.h> #include <arch/io.h>
#include "timer.h" #include "timer.h"

5
src/soc/rockchip/rk3288/timer.h
View File

@ -21,10 +21,11 @@
#define __SOC_ROCKCHIP_RK3288_TIMER_H__ #define __SOC_ROCKCHIP_RK3288_TIMER_H__
#include <inttypes.h> #include <inttypes.h>
#include <timer.h>
#include "addressmap.h" #include "addressmap.h"
#define SYS_CLK_FREQ 24000000 #define SYS_CLK_FREQ (24*MHz)
static const u32 clocks_per_usec = SYS_CLK_FREQ/1000000; static const u32 clocks_per_usec = SYS_CLK_FREQ/USECS_PER_SEC;
struct rk3288_timer { struct rk3288_timer {
u32 timer_load_count0; u32 timer_load_count0;