diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-14 14:13:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-14 14:13:23 -0400 |
| commit | 4905dfc65d9a17083727865302d2cf633c15c911 (patch) | |
| tree | 1f75e2faf8005151705219226916a571467208ca /arch/arm/cpu | |
| parent | f4815763b410d8657f6f617067a1d53024b05220 (diff) | |
| parent | 8097cba809d8c40d8fe72f792c7dc0644c845a32 (diff) | |
| download | talos-obmc-uboot-4905dfc65d9a17083727865302d2cf633c15c911.tar.gz talos-obmc-uboot-4905dfc65d9a17083727865302d2cf633c15c911.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/armv7/stv0991/clock.c | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/stv0991/pinmux.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/stv0991/clock.c b/arch/arm/cpu/armv7/stv0991/clock.c index 70b8a8d984..26c0d3637d 100644 --- a/arch/arm/cpu/armv7/stv0991/clock.c +++ b/arch/arm/cpu/armv7/stv0991/clock.c @@ -33,7 +33,9 @@ void clock_setup(int peripheral) /* Clock selection for ethernet tx_clk & rx_clk*/ writel((readl(&stv0991_cgu_regs->eth_ctrl) & ETH_CLK_MASK) | ETH_CLK_CTRL, &stv0991_cgu_regs->eth_ctrl); - + break; + case QSPI_CLOCK_CFG: + writel(QSPI_CLK_CTRL, &stv0991_cgu_regs->qspi_freq); break; default: break; diff --git a/arch/arm/cpu/armv7/stv0991/pinmux.c b/arch/arm/cpu/armv7/stv0991/pinmux.c index 1d086a235d..24c67faaea 100644 --- a/arch/arm/cpu/armv7/stv0991/pinmux.c +++ b/arch/arm/cpu/armv7/stv0991/pinmux.c @@ -55,6 +55,11 @@ int stv0991_pinmux_config(int peripheral) ETH_M_VDD_CFG, &stv0991_creg->vdd_pad1); break; + case QSPI_CS_CLK_PAD: + writel((readl(&stv0991_creg->mux13) & FLASH_CS_NC_MASK) | + CFG_FLASH_CS_NC, &stv0991_creg->mux13); + writel((readl(&stv0991_creg->mux13) & FLASH_CLK_MASK) | + CFG_FLASH_CLK, &stv0991_creg->mux13); default: break; } |
