Commit 8946bdf7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-soc-4.7-1' of git://git.infradead.org/linux-mvebu into next/soc 

Merge "mvebu soc for 4.7" from Gregory CLEMENT:

- Clock framework cleanup with the "Remove CLK_IS_ROOT" series

* tag 'mvebu-soc-4.7-1' of git://git.infradead.org/linux-mvebu:
  ARM: dove: Remove CLK_IS_ROOT
  ARM: orion5x: Remove CLK_IS_ROOT
  ARM: mv78xx0: Remove CLK_IS_ROOT
parents eb07e08d 3a1a4559

arch/arm/mach-dove/common.c

+1 −2
Original line number Diff line number Diff line
@@ -88,8 +88,7 @@ static void __init dove_clk_init(void) 
	struct clk *nand, *camera, *i2s0, *i2s1, *crypto, *ac97, *pdma;

	struct clk *xor0, *xor1, *ge, *gephy;



	tclk = clk_register_fixed_rate(NULL, "tclk", NULL, CLK_IS_ROOT,

				       dove_tclk);

	tclk = clk_register_fixed_rate(NULL, "tclk", NULL, 0, dove_tclk);



	usb0 = dove_register_gate("usb0", "tclk", CLOCK_GATING_BIT_USB0);

	usb1 = dove_register_gate("usb1", "tclk", CLOCK_GATING_BIT_USB1);

arch/arm/mach-mv78xx0/common.c

+1 −2
Original line number Diff line number Diff line
@@ -168,8 +168,7 @@ static struct clk *tclk; 


static void __init clk_init(void)

{

	tclk = clk_register_fixed_rate(NULL, "tclk", NULL, CLK_IS_ROOT,

				       get_tclk());

	tclk = clk_register_fixed_rate(NULL, "tclk", NULL, 0, get_tclk());



	orion_clkdev_init(tclk);

}

arch/arm/mach-orion5x/common.c

+1 −2
Original line number Diff line number Diff line
@@ -66,8 +66,7 @@ static struct clk *tclk; 


void __init clk_init(void)

{

	tclk = clk_register_fixed_rate(NULL, "tclk", NULL, CLK_IS_ROOT,

				       orion5x_tclk);

	tclk = clk_register_fixed_rate(NULL, "tclk", NULL, 0, orion5x_tclk);



	orion_clkdev_init(tclk);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE