Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41e602e8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'berlin-new-cpuclk-for-4.4-1' of... 

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
parents 7a0205bc 515f1a20

drivers/clk/berlin/bg2q.c

+7 −7
Original line number Diff line number Diff line
@@ -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++) {

include/dt-bindings/clock/berlin2q.h

+1 −0
Original line number Diff line number Diff line
@@ -29,3 +29,4 @@ 
#define CLKID_SMEMC		24

#define CLKID_PCIE		25

#define CLKID_TWD		26

#define CLKID_CPU		27