|
@@ -26,6 +26,7 @@
|
|
|
#include "ccu_nkmp.h"
|
|
|
#include "ccu_nm.h"
|
|
|
#include "ccu_phase.h"
|
|
|
+#include "ccu_sdm.h"
|
|
|
|
|
|
#include "ccu-sun5i.h"
|
|
|
|
|
@@ -49,11 +50,20 @@ static struct ccu_nkmp pll_core_clk = {
|
|
|
* the base (2x, 4x and 8x), and one variable divider (the one true
|
|
|
* pll audio).
|
|
|
*
|
|
|
- * We don't have any need for the variable divider for now, so we just
|
|
|
- * hardcode it to match with the clock names
|
|
|
+ * With sigma-delta modulation for fractional-N on the audio PLL,
|
|
|
+ * we have to use specific dividers. This means the variable divider
|
|
|
+ * can no longer be used, as the audio codec requests the exact clock
|
|
|
+ * rates we support through this mechanism. So we now hard code the
|
|
|
+ * variable divider to 1. This means the clock rates will no longer
|
|
|
+ * match the clock names.
|
|
|
*/
|
|
|
#define SUN5I_PLL_AUDIO_REG 0x008
|
|
|
|
|
|
+static struct ccu_sdm_setting pll_audio_sdm_table[] = {
|
|
|
+ { .rate = 22579200, .pattern = 0xc0010d84, .m = 8, .n = 7 },
|
|
|
+ { .rate = 24576000, .pattern = 0xc000ac02, .m = 14, .n = 14 },
|
|
|
+};
|
|
|
+
|
|
|
static struct ccu_nm pll_audio_base_clk = {
|
|
|
.enable = BIT(31),
|
|
|
.n = _SUNXI_CCU_MULT_OFFSET(8, 7, 0),
|
|
@@ -63,8 +73,11 @@ static struct ccu_nm pll_audio_base_clk = {
|
|
|
* offset
|
|
|
*/
|
|
|
.m = _SUNXI_CCU_DIV_OFFSET(0, 5, 0),
|
|
|
+ .sdm = _SUNXI_CCU_SDM(pll_audio_sdm_table, 0,
|
|
|
+ 0x00c, BIT(31)),
|
|
|
.common = {
|
|
|
.reg = 0x008,
|
|
|
+ .features = CCU_FEATURE_SIGMA_DELTA_MOD,
|
|
|
.hw.init = CLK_HW_INIT("pll-audio-base",
|
|
|
"hosc",
|
|
|
&ccu_nm_ops,
|
|
@@ -597,9 +610,9 @@ static struct ccu_common *sun5i_a10s_ccu_clks[] = {
|
|
|
&iep_clk.common,
|
|
|
};
|
|
|
|
|
|
-/* We hardcode the divider to 4 for now */
|
|
|
+/* We hardcode the divider to 1 for now */
|
|
|
static CLK_FIXED_FACTOR(pll_audio_clk, "pll-audio",
|
|
|
- "pll-audio-base", 4, 1, CLK_SET_RATE_PARENT);
|
|
|
+ "pll-audio-base", 1, 1, CLK_SET_RATE_PARENT);
|
|
|
static CLK_FIXED_FACTOR(pll_audio_2x_clk, "pll-audio-2x",
|
|
|
"pll-audio-base", 2, 1, CLK_SET_RATE_PARENT);
|
|
|
static CLK_FIXED_FACTOR(pll_audio_4x_clk, "pll-audio-4x",
|
|
@@ -980,10 +993,10 @@ static void __init sun5i_ccu_init(struct device_node *node,
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- /* Force the PLL-Audio-1x divider to 4 */
|
|
|
+ /* Force the PLL-Audio-1x divider to 1 */
|
|
|
val = readl(reg + SUN5I_PLL_AUDIO_REG);
|
|
|
val &= ~GENMASK(29, 26);
|
|
|
- writel(val | (3 << 26), reg + SUN5I_PLL_AUDIO_REG);
|
|
|
+ writel(val | (0 << 26), reg + SUN5I_PLL_AUDIO_REG);
|
|
|
|
|
|
/*
|
|
|
* Use the peripheral PLL as the AHB parent, instead of CPU /
|