Commit 03a1ee1d authored by Michał Mirosław's avatar Michał Mirosław Committed by Stephen Boyd

clk: at91: allow setting all PMC clock parents via DT

We need to have clocks accessible via phandle to select them
as peripheral clock parent using assigned-clock-parents in DT.
Add support for PLLACK/PLLBCK/AUDIOPLLCK clocks where available.
Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lkml.kernel.org/r/fa39cc10dab8341ea4bc2b7152be9217b2cd34a5.1588630999.git.mirq-linux@rere.qmqm.plSigned-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 99767cd4
...@@ -98,7 +98,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) ...@@ -98,7 +98,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np)
if (IS_ERR(regmap)) if (IS_ERR(regmap))
return; return;
at91rm9200_pmc = pmc_data_allocate(PMC_MAIN + 1, at91rm9200_pmc = pmc_data_allocate(PMC_PLLBCK + 1,
nck(at91rm9200_systemck), nck(at91rm9200_systemck),
nck(at91rm9200_periphck), 0, 4); nck(at91rm9200_periphck), 0, 4);
if (!at91rm9200_pmc) if (!at91rm9200_pmc)
...@@ -123,12 +123,16 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) ...@@ -123,12 +123,16 @@ static void __init at91rm9200_pmc_setup(struct device_node *np)
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
at91rm9200_pmc->chws[PMC_PLLACK] = hw;
hw = at91_clk_register_pll(regmap, "pllbck", "mainck", 1, hw = at91_clk_register_pll(regmap, "pllbck", "mainck", 1,
&at91rm9200_pll_layout, &at91rm9200_pll_layout,
&rm9200_pll_characteristics); &rm9200_pll_characteristics);
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
at91rm9200_pmc->chws[PMC_PLLBCK] = hw;
parent_names[0] = slowxtal_name; parent_names[0] = slowxtal_name;
parent_names[1] = "mainck"; parent_names[1] = "mainck";
parent_names[2] = "pllack"; parent_names[2] = "pllack";
......
...@@ -352,7 +352,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, ...@@ -352,7 +352,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np,
if (IS_ERR(regmap)) if (IS_ERR(regmap))
return; return;
at91sam9260_pmc = pmc_data_allocate(PMC_MAIN + 1, at91sam9260_pmc = pmc_data_allocate(PMC_PLLBCK + 1,
ndck(data->sck, data->num_sck), ndck(data->sck, data->num_sck),
ndck(data->pck, data->num_pck), ndck(data->pck, data->num_pck),
0, data->num_progck); 0, data->num_progck);
...@@ -399,12 +399,16 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, ...@@ -399,12 +399,16 @@ static void __init at91sam926x_pmc_setup(struct device_node *np,
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
at91sam9260_pmc->chws[PMC_PLLACK] = hw;
hw = at91_clk_register_pll(regmap, "pllbck", "mainck", 1, hw = at91_clk_register_pll(regmap, "pllbck", "mainck", 1,
data->pllb_layout, data->pllb_layout,
data->pllb_characteristics); data->pllb_characteristics);
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
at91sam9260_pmc->chws[PMC_PLLBCK] = hw;
parent_names[0] = slck_name; parent_names[0] = slck_name;
parent_names[1] = "mainck"; parent_names[1] = "mainck";
parent_names[2] = "pllack"; parent_names[2] = "pllack";
......
...@@ -115,7 +115,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) ...@@ -115,7 +115,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np)
if (IS_ERR(regmap)) if (IS_ERR(regmap))
return; return;
at91sam9g45_pmc = pmc_data_allocate(PMC_MAIN + 1, at91sam9g45_pmc = pmc_data_allocate(PMC_PLLACK + 1,
nck(at91sam9g45_systemck), nck(at91sam9g45_systemck),
nck(at91sam9g45_periphck), 0, 2); nck(at91sam9g45_periphck), 0, 2);
if (!at91sam9g45_pmc) if (!at91sam9g45_pmc)
...@@ -143,6 +143,8 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) ...@@ -143,6 +143,8 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np)
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
at91sam9g45_pmc->chws[PMC_PLLACK] = hw;
hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck"); hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck");
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
......
...@@ -128,7 +128,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) ...@@ -128,7 +128,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np)
if (IS_ERR(regmap)) if (IS_ERR(regmap))
return; return;
at91sam9n12_pmc = pmc_data_allocate(PMC_MAIN + 1, at91sam9n12_pmc = pmc_data_allocate(PMC_PLLBCK + 1,
nck(at91sam9n12_systemck), 31, 0, 2); nck(at91sam9n12_systemck), 31, 0, 2);
if (!at91sam9n12_pmc) if (!at91sam9n12_pmc)
return; return;
...@@ -162,11 +162,15 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) ...@@ -162,11 +162,15 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np)
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
at91sam9n12_pmc->chws[PMC_PLLACK] = hw;
hw = at91_clk_register_pll(regmap, "pllbck", "mainck", 1, hw = at91_clk_register_pll(regmap, "pllbck", "mainck", 1,
&at91rm9200_pll_layout, &pllb_characteristics); &at91rm9200_pll_layout, &pllb_characteristics);
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
at91sam9n12_pmc->chws[PMC_PLLBCK] = hw;
parent_names[0] = slck_name; parent_names[0] = slck_name;
parent_names[1] = "mainck"; parent_names[1] = "mainck";
parent_names[2] = "plladivck"; parent_names[2] = "plladivck";
......
...@@ -87,7 +87,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) ...@@ -87,7 +87,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np)
if (IS_ERR(regmap)) if (IS_ERR(regmap))
return; return;
at91sam9rl_pmc = pmc_data_allocate(PMC_MAIN + 1, at91sam9rl_pmc = pmc_data_allocate(PMC_PLLACK + 1,
nck(at91sam9rl_systemck), nck(at91sam9rl_systemck),
nck(at91sam9rl_periphck), 0, 2); nck(at91sam9rl_periphck), 0, 2);
if (!at91sam9rl_pmc) if (!at91sam9rl_pmc)
...@@ -105,6 +105,8 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) ...@@ -105,6 +105,8 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np)
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
at91sam9rl_pmc->chws[PMC_PLLACK] = hw;
hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck"); hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck");
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
......
...@@ -150,7 +150,7 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np, ...@@ -150,7 +150,7 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np,
if (IS_ERR(regmap)) if (IS_ERR(regmap))
return; return;
at91sam9x5_pmc = pmc_data_allocate(PMC_MAIN + 1, at91sam9x5_pmc = pmc_data_allocate(PMC_PLLACK + 1,
nck(at91sam9x5_systemck), 31, 0, 2); nck(at91sam9x5_systemck), 31, 0, 2);
if (!at91sam9x5_pmc) if (!at91sam9x5_pmc)
return; return;
...@@ -184,6 +184,8 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np, ...@@ -184,6 +184,8 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np,
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
at91sam9x5_pmc->chws[PMC_PLLACK] = hw;
hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck"); hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck");
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
......
...@@ -182,7 +182,7 @@ static void __init sam9x60_pmc_setup(struct device_node *np) ...@@ -182,7 +182,7 @@ static void __init sam9x60_pmc_setup(struct device_node *np)
if (IS_ERR(regmap)) if (IS_ERR(regmap))
return; return;
sam9x60_pmc = pmc_data_allocate(PMC_MAIN + 1, sam9x60_pmc = pmc_data_allocate(PMC_PLLACK + 1,
nck(sam9x60_systemck), nck(sam9x60_systemck),
nck(sam9x60_periphck), nck(sam9x60_periphck),
nck(sam9x60_gck), 8); nck(sam9x60_gck), 8);
...@@ -214,6 +214,8 @@ static void __init sam9x60_pmc_setup(struct device_node *np) ...@@ -214,6 +214,8 @@ static void __init sam9x60_pmc_setup(struct device_node *np)
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
sam9x60_pmc->chws[PMC_PLLACK] = hw;
hw = sam9x60_clk_register_pll(regmap, &pmc_pll_lock, "upllck", hw = sam9x60_clk_register_pll(regmap, &pmc_pll_lock, "upllck",
"main_osc", 1, &upll_characteristics); "main_osc", 1, &upll_characteristics);
if (IS_ERR(hw)) if (IS_ERR(hw))
......
...@@ -167,7 +167,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np) ...@@ -167,7 +167,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np)
if (IS_ERR(regmap)) if (IS_ERR(regmap))
return; return;
sama5d2_pmc = pmc_data_allocate(PMC_I2S1_MUX + 1, sama5d2_pmc = pmc_data_allocate(PMC_AUDIOPLLCK + 1,
nck(sama5d2_systemck), nck(sama5d2_systemck),
nck(sama5d2_periph32ck), nck(sama5d2_periph32ck),
nck(sama5d2_gck), 3); nck(sama5d2_gck), 3);
...@@ -203,6 +203,8 @@ static void __init sama5d2_pmc_setup(struct device_node *np) ...@@ -203,6 +203,8 @@ static void __init sama5d2_pmc_setup(struct device_node *np)
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
sama5d2_pmc->chws[PMC_PLLACK] = hw;
hw = at91_clk_register_audio_pll_frac(regmap, "audiopll_fracck", hw = at91_clk_register_audio_pll_frac(regmap, "audiopll_fracck",
"mainck"); "mainck");
if (IS_ERR(hw)) if (IS_ERR(hw))
...@@ -218,6 +220,8 @@ static void __init sama5d2_pmc_setup(struct device_node *np) ...@@ -218,6 +220,8 @@ static void __init sama5d2_pmc_setup(struct device_node *np)
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
sama5d2_pmc->chws[PMC_AUDIOPLLCK] = hw;
regmap_sfr = syscon_regmap_lookup_by_compatible("atmel,sama5d2-sfr"); regmap_sfr = syscon_regmap_lookup_by_compatible("atmel,sama5d2-sfr");
if (IS_ERR(regmap_sfr)) if (IS_ERR(regmap_sfr))
regmap_sfr = NULL; regmap_sfr = NULL;
......
...@@ -125,7 +125,7 @@ static void __init sama5d3_pmc_setup(struct device_node *np) ...@@ -125,7 +125,7 @@ static void __init sama5d3_pmc_setup(struct device_node *np)
if (IS_ERR(regmap)) if (IS_ERR(regmap))
return; return;
sama5d3_pmc = pmc_data_allocate(PMC_MAIN + 1, sama5d3_pmc = pmc_data_allocate(PMC_PLLACK + 1,
nck(sama5d3_systemck), nck(sama5d3_systemck),
nck(sama5d3_periphck), 0, 3); nck(sama5d3_periphck), 0, 3);
if (!sama5d3_pmc) if (!sama5d3_pmc)
...@@ -158,6 +158,8 @@ static void __init sama5d3_pmc_setup(struct device_node *np) ...@@ -158,6 +158,8 @@ static void __init sama5d3_pmc_setup(struct device_node *np)
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
sama5d3_pmc->chws[PMC_PLLACK] = hw;
hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck"); hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck");
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
......
...@@ -140,7 +140,7 @@ static void __init sama5d4_pmc_setup(struct device_node *np) ...@@ -140,7 +140,7 @@ static void __init sama5d4_pmc_setup(struct device_node *np)
if (IS_ERR(regmap)) if (IS_ERR(regmap))
return; return;
sama5d4_pmc = pmc_data_allocate(PMC_MCK2 + 1, sama5d4_pmc = pmc_data_allocate(PMC_PLLACK + 1,
nck(sama5d4_systemck), nck(sama5d4_systemck),
nck(sama5d4_periph32ck), 0, 3); nck(sama5d4_periph32ck), 0, 3);
if (!sama5d4_pmc) if (!sama5d4_pmc)
...@@ -173,6 +173,8 @@ static void __init sama5d4_pmc_setup(struct device_node *np) ...@@ -173,6 +173,8 @@ static void __init sama5d4_pmc_setup(struct device_node *np)
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
sama5d4_pmc->chws[PMC_PLLACK] = hw;
hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck"); hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck");
if (IS_ERR(hw)) if (IS_ERR(hw))
goto err_free; goto err_free;
......
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
#define PMC_MCK2 4 #define PMC_MCK2 4
#define PMC_I2S0_MUX 5 #define PMC_I2S0_MUX 5
#define PMC_I2S1_MUX 6 #define PMC_I2S1_MUX 6
#define PMC_PLLACK 7
#define PMC_PLLBCK 8
#define PMC_AUDIOPLLCK 9
#ifndef AT91_PMC_MOSCS #ifndef AT91_PMC_MOSCS
#define AT91_PMC_MOSCS 0 /* MOSCS Flag */ #define AT91_PMC_MOSCS 0 /* MOSCS Flag */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment