mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-14 14:06:40 +07:00
Merge tag 'mvebu-clk-4.1' of git://git.infradead.org/linux-mvebu into clk-next
clock changes for mvebu for v4.1 - Add clock support for Armada 39x
This commit is contained in:
commit
0833b5ae69
@ -23,6 +23,14 @@ The following is a list of provided IDs and clock names on Armada 380/385:
|
|||||||
2 = l2clk (L2 Cache clock)
|
2 = l2clk (L2 Cache clock)
|
||||||
3 = ddrclk (DDR clock)
|
3 = ddrclk (DDR clock)
|
||||||
|
|
||||||
|
The following is a list of provided IDs and clock names on Armada 39x:
|
||||||
|
0 = tclk (Internal Bus clock)
|
||||||
|
1 = cpuclk (CPU clock)
|
||||||
|
2 = nbclk (Coherent Fabric clock)
|
||||||
|
3 = hclk (SDRAM Controller Internal Clock)
|
||||||
|
4 = dclk (SDRAM Interface Clock)
|
||||||
|
5 = refclk (Reference Clock)
|
||||||
|
|
||||||
The following is a list of provided IDs and clock names on Kirkwood and Dove:
|
The following is a list of provided IDs and clock names on Kirkwood and Dove:
|
||||||
0 = tclk (Internal Bus clock)
|
0 = tclk (Internal Bus clock)
|
||||||
1 = cpuclk (CPU0 clock)
|
1 = cpuclk (CPU0 clock)
|
||||||
@ -39,6 +47,7 @@ Required properties:
|
|||||||
"marvell,armada-370-core-clock" - For Armada 370 SoC core clocks
|
"marvell,armada-370-core-clock" - For Armada 370 SoC core clocks
|
||||||
"marvell,armada-375-core-clock" - For Armada 375 SoC core clocks
|
"marvell,armada-375-core-clock" - For Armada 375 SoC core clocks
|
||||||
"marvell,armada-380-core-clock" - For Armada 380/385 SoC core clocks
|
"marvell,armada-380-core-clock" - For Armada 380/385 SoC core clocks
|
||||||
|
"marvell,armada-390-core-clock" - For Armada 39x SoC core clocks
|
||||||
"marvell,armada-xp-core-clock" - For Armada XP SoC core clocks
|
"marvell,armada-xp-core-clock" - For Armada XP SoC core clocks
|
||||||
"marvell,dove-core-clock" - for Dove SoC core clocks
|
"marvell,dove-core-clock" - for Dove SoC core clocks
|
||||||
"marvell,kirkwood-core-clock" - for Kirkwood SoC (except mv88f6180)
|
"marvell,kirkwood-core-clock" - for Kirkwood SoC (except mv88f6180)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
* Gated Clock bindings for Marvell EBU SoCs
|
* Gated Clock bindings for Marvell EBU SoCs
|
||||||
|
|
||||||
Marvell Armada 370/375/380/385/XP, Dove and Kirkwood allow some
|
Marvell Armada 370/375/380/385/39x/XP, Dove and Kirkwood allow some
|
||||||
peripheral clocks to be gated to save some power. The clock consumer
|
peripheral clocks to be gated to save some power. The clock consumer
|
||||||
should specify the desired clock by having the clock ID in its
|
should specify the desired clock by having the clock ID in its
|
||||||
"clocks" phandle cell. The clock ID is directly mapped to the
|
"clocks" phandle cell. The clock ID is directly mapped to the
|
||||||
@ -77,6 +77,18 @@ ID Clock Peripheral
|
|||||||
28 xor1 XOR 1
|
28 xor1 XOR 1
|
||||||
30 sata1 SATA 1
|
30 sata1 SATA 1
|
||||||
|
|
||||||
|
The following is a list of provided IDs for Armada 39x:
|
||||||
|
ID Clock Peripheral
|
||||||
|
-----------------------------------
|
||||||
|
5 pex1 PCIe 1
|
||||||
|
6 pex2 PCIe 2
|
||||||
|
7 pex3 PCIe 3
|
||||||
|
8 pex0 PCIe 0
|
||||||
|
9 usb3h0 USB3 Host 0
|
||||||
|
17 sdio SDIO
|
||||||
|
22 xor0 XOR 0
|
||||||
|
28 xor1 XOR 1
|
||||||
|
|
||||||
The following is a list of provided IDs for Armada XP:
|
The following is a list of provided IDs for Armada XP:
|
||||||
ID Clock Peripheral
|
ID Clock Peripheral
|
||||||
-----------------------------------
|
-----------------------------------
|
||||||
@ -152,6 +164,7 @@ Required properties:
|
|||||||
"marvell,armada-370-gating-clock" - for Armada 370 SoC clock gating
|
"marvell,armada-370-gating-clock" - for Armada 370 SoC clock gating
|
||||||
"marvell,armada-375-gating-clock" - for Armada 375 SoC clock gating
|
"marvell,armada-375-gating-clock" - for Armada 375 SoC clock gating
|
||||||
"marvell,armada-380-gating-clock" - for Armada 380/385 SoC clock gating
|
"marvell,armada-380-gating-clock" - for Armada 380/385 SoC clock gating
|
||||||
|
"marvell,armada-390-gating-clock" - for Armada 39x SoC clock gating
|
||||||
"marvell,armada-xp-gating-clock" - for Armada XP SoC clock gating
|
"marvell,armada-xp-gating-clock" - for Armada XP SoC clock gating
|
||||||
"marvell,dove-gating-clock" - for Dove SoC clock gating
|
"marvell,dove-gating-clock" - for Dove SoC clock gating
|
||||||
"marvell,kirkwood-gating-clock" - for Kirkwood SoC clock gating
|
"marvell,kirkwood-gating-clock" - for Kirkwood SoC clock gating
|
||||||
|
@ -21,6 +21,10 @@ config ARMADA_38X_CLK
|
|||||||
bool
|
bool
|
||||||
select MVEBU_CLK_COMMON
|
select MVEBU_CLK_COMMON
|
||||||
|
|
||||||
|
config ARMADA_39X_CLK
|
||||||
|
bool
|
||||||
|
select MVEBU_CLK_COMMON
|
||||||
|
|
||||||
config ARMADA_XP_CLK
|
config ARMADA_XP_CLK
|
||||||
bool
|
bool
|
||||||
select MVEBU_CLK_COMMON
|
select MVEBU_CLK_COMMON
|
||||||
|
@ -5,6 +5,7 @@ obj-$(CONFIG_MVEBU_CLK_COREDIV) += clk-corediv.o
|
|||||||
obj-$(CONFIG_ARMADA_370_CLK) += armada-370.o
|
obj-$(CONFIG_ARMADA_370_CLK) += armada-370.o
|
||||||
obj-$(CONFIG_ARMADA_375_CLK) += armada-375.o
|
obj-$(CONFIG_ARMADA_375_CLK) += armada-375.o
|
||||||
obj-$(CONFIG_ARMADA_38X_CLK) += armada-38x.o
|
obj-$(CONFIG_ARMADA_38X_CLK) += armada-38x.o
|
||||||
|
obj-$(CONFIG_ARMADA_39X_CLK) += armada-39x.o
|
||||||
obj-$(CONFIG_ARMADA_XP_CLK) += armada-xp.o
|
obj-$(CONFIG_ARMADA_XP_CLK) += armada-xp.o
|
||||||
obj-$(CONFIG_DOVE_CLK) += dove.o
|
obj-$(CONFIG_DOVE_CLK) += dove.o
|
||||||
obj-$(CONFIG_KIRKWOOD_CLK) += kirkwood.o
|
obj-$(CONFIG_KIRKWOOD_CLK) += kirkwood.o
|
||||||
|
156
drivers/clk/mvebu/armada-39x.c
Normal file
156
drivers/clk/mvebu/armada-39x.c
Normal file
@ -0,0 +1,156 @@
|
|||||||
|
/*
|
||||||
|
* Marvell Armada 39x SoC clocks
|
||||||
|
*
|
||||||
|
* Copyright (C) 2015 Marvell
|
||||||
|
*
|
||||||
|
* Gregory CLEMENT <gregory.clement@free-electrons.com>
|
||||||
|
* Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
||||||
|
* Andrew Lunn <andrew@lunn.ch>
|
||||||
|
* Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||||
|
*
|
||||||
|
* This file is licensed under the terms of the GNU General Public
|
||||||
|
* License version 2. This program is licensed "as is" without any
|
||||||
|
* warranty of any kind, whether express or implied.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/clk-provider.h>
|
||||||
|
#include <linux/io.h>
|
||||||
|
#include <linux/of.h>
|
||||||
|
#include "common.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* SARL[14:10] : Ratios between CPU, NBCLK, HCLK and DCLK.
|
||||||
|
*
|
||||||
|
* SARL[15] : TCLK frequency
|
||||||
|
* 0 = 250 MHz
|
||||||
|
* 1 = 200 MHz
|
||||||
|
*
|
||||||
|
* SARH[0] : Reference clock frequency
|
||||||
|
* 0 = 25 Mhz
|
||||||
|
* 1 = 40 Mhz
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define SARL 0
|
||||||
|
#define SARL_A390_TCLK_FREQ_OPT 15
|
||||||
|
#define SARL_A390_TCLK_FREQ_OPT_MASK 0x1
|
||||||
|
#define SARL_A390_CPU_DDR_L2_FREQ_OPT 10
|
||||||
|
#define SARL_A390_CPU_DDR_L2_FREQ_OPT_MASK 0x1F
|
||||||
|
#define SARH 4
|
||||||
|
#define SARH_A390_REFCLK_FREQ BIT(0)
|
||||||
|
|
||||||
|
static const u32 armada_39x_tclk_frequencies[] __initconst = {
|
||||||
|
250000000,
|
||||||
|
200000000,
|
||||||
|
};
|
||||||
|
|
||||||
|
static u32 __init armada_39x_get_tclk_freq(void __iomem *sar)
|
||||||
|
{
|
||||||
|
u8 tclk_freq_select;
|
||||||
|
|
||||||
|
tclk_freq_select = ((readl(sar + SARL) >> SARL_A390_TCLK_FREQ_OPT) &
|
||||||
|
SARL_A390_TCLK_FREQ_OPT_MASK);
|
||||||
|
return armada_39x_tclk_frequencies[tclk_freq_select];
|
||||||
|
}
|
||||||
|
|
||||||
|
static const u32 armada_39x_cpu_frequencies[] __initconst = {
|
||||||
|
[0x0] = 666 * 1000 * 1000,
|
||||||
|
[0x2] = 800 * 1000 * 1000,
|
||||||
|
[0x3] = 800 * 1000 * 1000,
|
||||||
|
[0x4] = 1066 * 1000 * 1000,
|
||||||
|
[0x5] = 1066 * 1000 * 1000,
|
||||||
|
[0x6] = 1200 * 1000 * 1000,
|
||||||
|
[0x8] = 1332 * 1000 * 1000,
|
||||||
|
[0xB] = 1600 * 1000 * 1000,
|
||||||
|
[0xC] = 1600 * 1000 * 1000,
|
||||||
|
[0x12] = 1800 * 1000 * 1000,
|
||||||
|
[0x1E] = 1800 * 1000 * 1000,
|
||||||
|
};
|
||||||
|
|
||||||
|
static u32 __init armada_39x_get_cpu_freq(void __iomem *sar)
|
||||||
|
{
|
||||||
|
u8 cpu_freq_select;
|
||||||
|
|
||||||
|
cpu_freq_select = ((readl(sar + SARL) >> SARL_A390_CPU_DDR_L2_FREQ_OPT) &
|
||||||
|
SARL_A390_CPU_DDR_L2_FREQ_OPT_MASK);
|
||||||
|
if (cpu_freq_select >= ARRAY_SIZE(armada_39x_cpu_frequencies)) {
|
||||||
|
pr_err("Selected CPU frequency (%d) unsupported\n",
|
||||||
|
cpu_freq_select);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
return armada_39x_cpu_frequencies[cpu_freq_select];
|
||||||
|
}
|
||||||
|
|
||||||
|
enum { A390_CPU_TO_NBCLK, A390_CPU_TO_HCLK, A390_CPU_TO_DCLK };
|
||||||
|
|
||||||
|
static const struct coreclk_ratio armada_39x_coreclk_ratios[] __initconst = {
|
||||||
|
{ .id = A390_CPU_TO_NBCLK, .name = "nbclk" },
|
||||||
|
{ .id = A390_CPU_TO_HCLK, .name = "hclk" },
|
||||||
|
{ .id = A390_CPU_TO_DCLK, .name = "dclk" },
|
||||||
|
};
|
||||||
|
|
||||||
|
static void __init armada_39x_get_clk_ratio(
|
||||||
|
void __iomem *sar, int id, int *mult, int *div)
|
||||||
|
{
|
||||||
|
switch (id) {
|
||||||
|
case A390_CPU_TO_NBCLK:
|
||||||
|
*mult = 1;
|
||||||
|
*div = 2;
|
||||||
|
break;
|
||||||
|
case A390_CPU_TO_HCLK:
|
||||||
|
*mult = 1;
|
||||||
|
*div = 4;
|
||||||
|
break;
|
||||||
|
case A390_CPU_TO_DCLK:
|
||||||
|
*mult = 1;
|
||||||
|
*div = 2;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static u32 __init armada_39x_refclk_ratio(void __iomem *sar)
|
||||||
|
{
|
||||||
|
if (readl(sar + SARH) & SARH_A390_REFCLK_FREQ)
|
||||||
|
return 40 * 1000 * 1000;
|
||||||
|
else
|
||||||
|
return 25 * 1000 * 1000;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct coreclk_soc_desc armada_39x_coreclks = {
|
||||||
|
.get_tclk_freq = armada_39x_get_tclk_freq,
|
||||||
|
.get_cpu_freq = armada_39x_get_cpu_freq,
|
||||||
|
.get_clk_ratio = armada_39x_get_clk_ratio,
|
||||||
|
.get_refclk_freq = armada_39x_refclk_ratio,
|
||||||
|
.ratios = armada_39x_coreclk_ratios,
|
||||||
|
.num_ratios = ARRAY_SIZE(armada_39x_coreclk_ratios),
|
||||||
|
};
|
||||||
|
|
||||||
|
static void __init armada_39x_coreclk_init(struct device_node *np)
|
||||||
|
{
|
||||||
|
mvebu_coreclk_setup(np, &armada_39x_coreclks);
|
||||||
|
}
|
||||||
|
CLK_OF_DECLARE(armada_39x_core_clk, "marvell,armada-390-core-clock",
|
||||||
|
armada_39x_coreclk_init);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Clock Gating Control
|
||||||
|
*/
|
||||||
|
static const struct clk_gating_soc_desc armada_39x_gating_desc[] __initconst = {
|
||||||
|
{ "pex1", NULL, 5 },
|
||||||
|
{ "pex2", NULL, 6 },
|
||||||
|
{ "pex3", NULL, 7 },
|
||||||
|
{ "pex0", NULL, 8 },
|
||||||
|
{ "usb3h0", NULL, 9 },
|
||||||
|
{ "sdio", NULL, 17 },
|
||||||
|
{ "xor0", NULL, 22 },
|
||||||
|
{ "xor1", NULL, 28 },
|
||||||
|
{ }
|
||||||
|
};
|
||||||
|
|
||||||
|
static void __init armada_39x_clk_gating_init(struct device_node *np)
|
||||||
|
{
|
||||||
|
mvebu_clk_gating_setup(np, armada_39x_gating_desc);
|
||||||
|
}
|
||||||
|
CLK_OF_DECLARE(armada_39x_clk_gating, "marvell,armada-390-gating-clock",
|
||||||
|
armada_39x_clk_gating_init);
|
@ -121,6 +121,11 @@ void __init mvebu_coreclk_setup(struct device_node *np,
|
|||||||
|
|
||||||
/* Allocate struct for TCLK, cpu clk, and core ratio clocks */
|
/* Allocate struct for TCLK, cpu clk, and core ratio clocks */
|
||||||
clk_data.clk_num = 2 + desc->num_ratios;
|
clk_data.clk_num = 2 + desc->num_ratios;
|
||||||
|
|
||||||
|
/* One more clock for the optional refclk */
|
||||||
|
if (desc->get_refclk_freq)
|
||||||
|
clk_data.clk_num += 1;
|
||||||
|
|
||||||
clk_data.clks = kzalloc(clk_data.clk_num * sizeof(struct clk *),
|
clk_data.clks = kzalloc(clk_data.clk_num * sizeof(struct clk *),
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
if (WARN_ON(!clk_data.clks)) {
|
if (WARN_ON(!clk_data.clks)) {
|
||||||
@ -162,6 +167,18 @@ void __init mvebu_coreclk_setup(struct device_node *np,
|
|||||||
WARN_ON(IS_ERR(clk_data.clks[2+n]));
|
WARN_ON(IS_ERR(clk_data.clks[2+n]));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* Register optional refclk */
|
||||||
|
if (desc->get_refclk_freq) {
|
||||||
|
const char *name = "refclk";
|
||||||
|
of_property_read_string_index(np, "clock-output-names",
|
||||||
|
2 + desc->num_ratios, &name);
|
||||||
|
rate = desc->get_refclk_freq(base);
|
||||||
|
clk_data.clks[2 + desc->num_ratios] =
|
||||||
|
clk_register_fixed_rate(NULL, name, NULL,
|
||||||
|
CLK_IS_ROOT, rate);
|
||||||
|
WARN_ON(IS_ERR(clk_data.clks[2 + desc->num_ratios]));
|
||||||
|
}
|
||||||
|
|
||||||
/* SAR register isn't needed anymore */
|
/* SAR register isn't needed anymore */
|
||||||
iounmap(base);
|
iounmap(base);
|
||||||
|
|
||||||
|
@ -30,6 +30,7 @@ struct coreclk_soc_desc {
|
|||||||
u32 (*get_tclk_freq)(void __iomem *sar);
|
u32 (*get_tclk_freq)(void __iomem *sar);
|
||||||
u32 (*get_cpu_freq)(void __iomem *sar);
|
u32 (*get_cpu_freq)(void __iomem *sar);
|
||||||
void (*get_clk_ratio)(void __iomem *sar, int id, int *mult, int *div);
|
void (*get_clk_ratio)(void __iomem *sar, int id, int *mult, int *div);
|
||||||
|
u32 (*get_refclk_freq)(void __iomem *sar);
|
||||||
bool (*is_sscg_enabled)(void __iomem *sar);
|
bool (*is_sscg_enabled)(void __iomem *sar);
|
||||||
u32 (*fix_sscg_deviation)(u32 system_clk);
|
u32 (*fix_sscg_deviation)(u32 system_clk);
|
||||||
const struct coreclk_ratio *ratios;
|
const struct coreclk_ratio *ratios;
|
||||||
|
Loading…
Reference in New Issue
Block a user