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

Commit 85a18198 authored by Prashant Gaikwad's avatar Prashant Gaikwad Committed by Mike Turquette
Browse files

clk: sunxi: Use common of_clk_init() function 



Use common of_clk_init() function to initialize clocks.

Signed-off-by: default avatarPrashant Gaikwad <pgaikwad@nvidia.com>
Acked-by: default avatarMaxime Ripard <maxime.ripard@anandra.org>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent f2f6c255

drivers/clk/clk-sunxi.c

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Maxime Ripard

 *

 * Maxime Ripard <maxime.ripard@free-electrons.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/clk-provider.h>

#include <linux/clkdev.h>

#include <linux/clk/sunxi.h>

#include <linux/of.h>



static const __initconst struct of_device_id clk_match[] = {

	{ .compatible = "fixed-clock", .data = of_fixed_clk_setup, },

	{}

};



void __init sunxi_init_clocks(void)

{

	of_clk_init(clk_match);

}

drivers/clocksource/sunxi_timer.c

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/sunxi_timer.h>

#include <linux/clk/sunxi.h>

#include <linux/clk-provider.h>



#define TIMER_CTL_REG		0x00

#define TIMER_CTL_ENABLE		(1 << 0)
@@ -124,7 +124,7 @@ static void __init sunxi_timer_init(void) 
	if (irq <= 0)

		panic("Can't parse IRQ");



	sunxi_init_clocks();

	of_clk_init(NULL);



	clk = of_clk_get(node, 0);

	if (IS_ERR(clk))

include/linux/clk/sunxi.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Maxime Ripard

 *

 * Maxime Ripard <maxime.ripard@free-electrons.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef __LINUX_CLK_SUNXI_H_

#define __LINUX_CLK_SUNXI_H_



void __init sunxi_init_clocks(void);



#endif