diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 22:41:04 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 22:41:04 +0200 |
| commit | 41e602e8af1300471e79e298a7276226344071db (patch) | |
| tree | 79b49827adbd9ab6221444f956538cced52be15b | |
| parent | 7a0205bc1895132d6a56fbbadf01885c4a4f0743 (diff) | |
| parent | 515f1a2027006839c08c842da919abfcc3c7ae2a (diff) | |
| download | linux-stable-41e602e8af1300471e79e298a7276226344071db.tar.gz linux-stable-41e602e8af1300471e79e298a7276226344071db.tar.bz2 linux-stable-41e602e8af1300471e79e298a7276226344071db.zip | |
Merge tag 'berlin-new-cpuclk-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/drivers
Merge "Marvell Berlin BG2Q CPU clock driver" from Sebastian Hesselbarth:
- add BG2Q CPU clock to clk driver
* tag 'berlin-new-cpuclk-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin:
clk: berlin: add cpuclk
ARM: berlin: dts: add CLKID_CPU for BG2Q
| -rw-r--r-- | drivers/clk/berlin/bg2q.c | 14 | ||||
| -rw-r--r-- | include/dt-bindings/clock/berlin2q.h | 1 |
2 files changed, 8 insertions, 7 deletions
diff --git a/drivers/clk/berlin/bg2q.c b/drivers/clk/berlin/bg2q.c index 221f40c2b850..72d2f3500db8 100644 --- a/drivers/clk/berlin/bg2q.c +++ b/drivers/clk/berlin/bg2q.c @@ -45,7 +45,7 @@ #define REG_SDIO0XIN_CLKCTL 0x0158 #define REG_SDIO1XIN_CLKCTL 0x015c -#define MAX_CLKS 27 +#define MAX_CLKS 28 static struct clk *clks[MAX_CLKS]; static struct clk_onecell_data clk_data; static DEFINE_SPINLOCK(lock); @@ -356,13 +356,13 @@ static void __init berlin2q_clock_setup(struct device_node *np) gd->bit_idx, 0, &lock); } - /* - * twdclk is derived from cpu/3 - * TODO: use cpupll until cpuclk is not available - */ + /* cpuclk divider is fixed to 1 */ + clks[CLKID_CPU] = + clk_register_fixed_factor(NULL, "cpu", clk_names[CPUPLL], + 0, 1, 1); + /* twdclk is derived from cpu/3 */ clks[CLKID_TWD] = - clk_register_fixed_factor(NULL, "twd", clk_names[CPUPLL], - 0, 1, 3); + clk_register_fixed_factor(NULL, "twd", "cpu", 0, 1, 3); /* check for errors on leaf clocks */ for (n = 0; n < MAX_CLKS; n++) { diff --git a/include/dt-bindings/clock/berlin2q.h b/include/dt-bindings/clock/berlin2q.h index 287fc3b4afb2..72eaf91c9ca6 100644 --- a/include/dt-bindings/clock/berlin2q.h +++ b/include/dt-bindings/clock/berlin2q.h @@ -29,3 +29,4 @@ #define CLKID_SMEMC 24 #define CLKID_PCIE 25 #define CLKID_TWD 26 +#define CLKID_CPU 27 |