UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

clk: aspeed: Support HPLL strapping on ast2400 

The HPLL can be configured through a register (SCU24), however some
platforms chose to configure it through the strapping settings and do
not use the register. This was not noticed as the logic for bit 18 in
SCU24 was confused: set means programmed, but the driver read it as set
means strapped.

This gives us the correct HPLL value on Palmetto systems, from which
most of the peripheral clocks are generated.

Fixes: 5eda5d79e4 ("clk: Add clock driver for ASPEED BMC SoCs")
Cc: stable@vger.kernel.org # v4.15
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
This commit is contained in:
Joel Stanley 2018-06-29 08:45:40 +09:30 committed by Stephen Boyd
parent 61c40f35f5
commit 565b9937f4
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/clk/clk-aspeed.c
View File

@ -24,7 +24,7 @@
#define ASPEED_MPLL_PARAM 0x20 #define ASPEED_MPLL_PARAM 0x20
#define ASPEED_HPLL_PARAM 0x24 #define ASPEED_HPLL_PARAM 0x24
#define AST2500_HPLL_BYPASS_EN BIT(20) #define AST2500_HPLL_BYPASS_EN BIT(20)
#define AST2400_HPLL_STRAPPED BIT(18) #define AST2400_HPLL_PROGRAMMED BIT(18)
#define AST2400_HPLL_BYPASS_EN BIT(17) #define AST2400_HPLL_BYPASS_EN BIT(17)
#define ASPEED_MISC_CTRL 0x2c #define ASPEED_MISC_CTRL 0x2c
#define UART_DIV13_EN BIT(12) #define UART_DIV13_EN BIT(12)
@ -578,29 +578,45 @@ builtin_platform_driver(aspeed_clk_driver);
static void __init aspeed_ast2400_cc(struct regmap *map) static void __init aspeed_ast2400_cc(struct regmap *map)
{ {
struct clk_hw *hw; struct clk_hw *hw;
u32 val, freq, div; u32 val, div, clkin, hpll;
const u16 hpll_rates[][4] = {
{384, 360, 336, 408},
{400, 375, 350, 425},
};
int rate;
/* /*
* CLKIN is the crystal oscillator, 24, 48 or 25MHz selected by * CLKIN is the crystal oscillator, 24, 48 or 25MHz selected by
* strapping * strapping
*/ */
regmap_read(map, ASPEED_STRAP, &val); regmap_read(map, ASPEED_STRAP, &val);
if (val & CLKIN_25MHZ_EN) rate = (val >> 8) & 3;
freq = 25000000; if (val & CLKIN_25MHZ_EN) {
else if (val & AST2400_CLK_SOURCE_SEL) clkin = 25000000;
freq = 48000000; hpll = hpll_rates[1][rate];
else } else if (val & AST2400_CLK_SOURCE_SEL) {
freq = 24000000; clkin = 48000000;
hw = clk_hw_register_fixed_rate(NULL, "clkin", NULL, 0, freq); hpll = hpll_rates[0][rate];
pr_debug("clkin @%u MHz\n", freq / 1000000); } else {
clkin = 24000000;
hpll = hpll_rates[0][rate];
}
hw = clk_hw_register_fixed_rate(NULL, "clkin", NULL, 0, clkin);
pr_debug("clkin @%u MHz\n", clkin / 1000000);
/* /*
* High-speed PLL clock derived from the crystal. This the CPU clock, * High-speed PLL clock derived from the crystal. This the CPU clock,
* and we assume that it is enabled * and we assume that it is enabled. It can be configured through the
* HPLL_PARAM register, or set to a specified frequency by strapping.
*/ */
regmap_read(map, ASPEED_HPLL_PARAM, &val); regmap_read(map, ASPEED_HPLL_PARAM, &val);
WARN(val & AST2400_HPLL_STRAPPED, "hpll is strapped not configured"); if (val & AST2400_HPLL_PROGRAMMED)
aspeed_clk_data->hws[ASPEED_CLK_HPLL] = aspeed_ast2400_calc_pll("hpll", val); hw = aspeed_ast2400_calc_pll("hpll", val);
else
hw = clk_hw_register_fixed_rate(NULL, "hpll", "clkin", 0,
hpll * 1000000);
aspeed_clk_data->hws[ASPEED_CLK_HPLL] = hw;
/* /*
* Strap bits 11:10 define the CPU/AHB clock frequency ratio (aka HCLK) * Strap bits 11:10 define the CPU/AHB clock frequency ratio (aka HCLK)