[coreboot-gerrit] New patch to review for coreboot: rockchip: rk3399: add spi clock driver

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14710

-gerrit

commit 1480c047207af32c5cc9b82741d0da41d939749d
Author: Shunqian Zheng <zhengsq at rock-chips.com>
Date:   Wed Apr 13 22:34:39 2016 +0800

    rockchip: rk3399: add spi clock driver
    
    This patch implements spi clock driver and initialize
    SPI flash rom for the baseboard gru.
    
    There are 6 on-chip SPI controllers inside RK3399. For
    SPI3, it's source clk from ppll, while the others from gpll.
    
    Please refer to CRU session of TRM for detail.
    
    BRANCH=none
    BUG=chrome-os-partner:51537
    TEST=emerge-kevin coreboot
    
    Change-Id: I597ae2cc8ba1bfaefdfbf6116027d009daa8e049
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 4c6a9b0aedd427727ed4f4a821c5c54fb3a174b9
    Original-Change-Id: I68ad859bf4fc5dacaaee5a2cd33418c729cf39b8
    Original-Signed-off-by: huang lin <hl at rock-chips.com>
    Original-Signed-off-by: Shunqian Zheng <zhengsq at rock-chips.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/338946
    Original-Commit-Ready: Vadim Bendebury <vbendeb at chromium.org>
    Original-Tested-by: Vadim Bendebury <vbendeb at chromium.org>
    Original-Reviewed-by: Vadim Bendebury <vbendeb at chromium.org>
---
 src/mainboard/google/gru/bootblock.c |  6 +++
 src/soc/rockchip/rk3399/clock.c      | 77 ++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/src/mainboard/google/gru/bootblock.c b/src/mainboard/google/gru/bootblock.c
index 1a99e84..d08b4cb 100644
--- a/src/mainboard/google/gru/bootblock.c
+++ b/src/mainboard/google/gru/bootblock.c
@@ -17,6 +17,7 @@
 #include <arch/io.h>
 #include <bootblock_common.h>
 #include <soc/grf.h>
+#include <soc/spi.h>
 #include <console/console.h>
 
 void bootblock_mainboard_early_init(void)
@@ -35,4 +36,9 @@ void bootblock_mainboard_early_init(void)
 
 void bootblock_mainboard_init(void)
 {
+	/* select the pinmux for spi flashrom */
+	write32(&rk3399_pmugrf->spi1_rxd, IOMUX_SPI1_RX);
+	write32(&rk3399_pmugrf->spi1_csclktx, IOMUX_SPI1_CSCLKTX);
+
+	rockchip_spi_init(CONFIG_BOOT_MEDIA_SPI_BUS, 24750*KHz);
 }
diff --git a/src/soc/rockchip/rk3399/clock.c b/src/soc/rockchip/rk3399/clock.c
index c2a1691..8a2b351 100644
--- a/src/soc/rockchip/rk3399/clock.c
+++ b/src/soc/rockchip/rk3399/clock.c
@@ -86,6 +86,14 @@ enum {
 	PMU_PCLK_DIV_CON_MASK		= 0x1f,
 	PMU_PCLK_DIV_CON_SHIFT		= 0,
 
+	/* PMUCRU_CLKSEL_CON1 */
+	SPI3_PLL_SEL_MASK		= 1,
+	SPI3_PLL_SEL_SHIFT		= 7,
+	SPI3_PLL_SEL_24M		= 0,
+	SPI3_PLL_SEL_PPLL		= 1,
+	SPI3_DIV_CON_MASK		= 0x7f,
+	SPI3_DIV_CON_SHIFT		= 0x0,
+
 	/* CLKSEL_CON0 */
 	ACLKM_CORE_L_DIV_CON_MASK	= 0x1f,
 	ACLKM_CORE_L_DIV_CON_SHIFT	= 8,
@@ -138,6 +146,26 @@ enum {
 	HCLK_PERILP1_DIV_CON_MASK	= 0x1f,
 	HCLK_PERILP1_DIV_CON_SHIFT	= 0,
 
+	/* CLKSEL_CON58 */
+	CLK_SPI_PLL_SEL_MASK		= 1,
+	CLK_SPI_PLL_SEL_CPLL		= 0,
+	CLK_SPI_PLL_SEL_GPLL		= 1,
+	CLK_SPI_PLL_DIV_CON_MASK	= 0x7f,
+	CLK_SPI5_PLL_DIV_CON_SHIFT	= 8,
+	CLK_SPI5_PLL_SEL_SHIFT		= 15,
+
+	/* CLKSEL_CON59 */
+	CLK_SPI1_PLL_SEL_SHIFT		= 15,
+	CLK_SPI1_PLL_DIV_CON_SHIFT	= 8,
+	CLK_SPI0_PLL_SEL_SHIFT		= 7,
+	CLK_SPI0_PLL_DIV_CON_SHIFT	= 0,
+
+	/* CLKSEL_CON60 */
+	CLK_SPI4_PLL_SEL_SHIFT		= 15,
+	CLK_SPI4_PLL_DIV_CON_SHIFT	= 8,
+	CLK_SPI2_PLL_SEL_SHIFT		= 7,
+	CLK_SPI2_PLL_DIV_CON_SHIFT	= 0,
+
 	/* CRU_SOFTRST_CON4 */
 	RESETN_DDR0_REQ_MASK		= 1,
 	RESETN_DDR0_REQ_SHIFT		= 8,
@@ -391,6 +419,55 @@ void rkclk_configure_ddr(unsigned int hz)
 	rkclk_set_pll(&cru_ptr->dpll_con[0], &dpll_cfg);
 }
 
+#define SPI_CLK_REG_VALUE(bus, clk_div) \
+		RK_CLRSETBITS(CLK_SPI_PLL_SEL_MASK << \
+					CLK_SPI ##bus## _PLL_SEL_SHIFT | \
+			      CLK_SPI_PLL_DIV_CON_MASK << \
+					CLK_SPI ##bus## _PLL_DIV_CON_SHIFT, \
+			      CLK_SPI_PLL_SEL_GPLL << \
+					CLK_SPI ##bus## _PLL_SEL_SHIFT | \
+			      (clk_div - 1) << \
+					CLK_SPI ##bus## _PLL_DIV_CON_SHIFT)
+
 void rkclk_configure_spi(unsigned int bus, unsigned int hz)
 {
+	int src_clk_div;
+	int pll;
+
+	/* spi3 src clock from ppll, while spi0,1,2,4,5 src clock from gpll */
+	pll = (bus == 3) ? PPLL_HZ : GPLL_HZ;
+	src_clk_div = pll / hz;
+	assert((src_clk_div - 1 < 127) && (src_clk_div * hz == pll));
+
+	switch (bus) {
+	case 0:
+		write32(&cru_ptr->clksel_con[59],
+			SPI_CLK_REG_VALUE(0, src_clk_div));
+		break;
+	case 1:
+		write32(&cru_ptr->clksel_con[59],
+			SPI_CLK_REG_VALUE(1, src_clk_div));
+		break;
+	case 2:
+		write32(&cru_ptr->clksel_con[60],
+			SPI_CLK_REG_VALUE(2, src_clk_div));
+		break;
+	case 3:
+		write32(&pmucru_ptr->pmucru_clksel[1],
+			RK_CLRSETBITS(SPI3_PLL_SEL_MASK << SPI3_PLL_SEL_SHIFT |
+				      SPI3_DIV_CON_MASK << SPI3_DIV_CON_SHIFT,
+				      SPI3_PLL_SEL_PPLL << SPI3_PLL_SEL_SHIFT |
+				      (src_clk_div - 1) << SPI3_DIV_CON_SHIFT));
+		break;
+	case 4:
+		write32(&cru_ptr->clksel_con[60],
+			SPI_CLK_REG_VALUE(4, src_clk_div));
+		break;
+	case 5:
+		write32(&cru_ptr->clksel_con[58],
+			SPI_CLK_REG_VALUE(5, src_clk_div));
+		break;
+	default:
+		printk(BIOS_ERR, "do not support this spi bus\n");
+	}
 }