FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-11 11:56:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Marvell Berlin BG2Q CPU clock driver:

Browse Source 
- add BG2Q CPU clock to clk driver
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWH/dLAAoJEN2kpao7fSL4WTMP/j95BmglqNQLm71boVsc5ZJy
 fP/IoO4afSNe9+E06yAKMF6ocRZmNi/bgrWSOEMmRdpr9KDGh3CwZlUdvME2pO/u
 XuM8MADQp9+b8bAYIYp/8m9c6ccmDbi74TV/vzY1dLzTjqzV8hgUwfA5DYXoqN2S
 Fsfl0uYlRbuP1V+nnYEElbXNSOgz7oz6viA4guXUtGrKyGa94EEEmlMfaZXsWWr7
 DCH398lkpTh3jsCHSKdp6V9VWW0HnUjghF6Sjo1bH49CIdqEpwc2fZF5spcx1pgr
 H2+qBXHvaPnH9dMLDnViHC/7EeycvRsHJn0S0KUTQY7RNhs78JU8D6JnjWQn5oKB
 4GyV0spDVXZuJ9tiiE6jgw7QP/gSORnjbKtFIlfqu8QogkH9ny2aQ8U7fhHuT6ZG
 sgqhw9dXAkWbH/KVIZG3JGqmQA0MTgRWaNVf4cCMZvm11E4NU0i/WGFtZEgRDSrh
 mEYhn9Zf1HiyynIWSOTcR5ZwHFBlDy7yhEXpR55rtTloDphbFUcef2mBqM/xXaTf
 DLzHPD/2tRgy0n3efHFGK3Qey99TWWCPZ0PIn/uGhdn+3w3GaC+q3SUCEb+VnLzj
 vz35jv7HwkpNypVz4U7IDabqLxsMIrHvnlfNIqCA52cht5/JMJJRCJNq56aqU50y
 vrk6jfGw95Mai5xN8bdK
 =slnI
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2015-10-15 22:41:04 +02:00
commit 41e602e8af
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/clk/berlin/bg2q.c
View File

@ -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++) {

1
include/dt-bindings/clock/berlin2q.h
View File

@ -29,3 +29,4 @@
#define CLKID_SMEMC 24
#define CLKID_PCIE 25
#define CLKID_TWD 26
#define CLKID_CPU 27