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

Commit 061cec92 authored by Prashant Gaikwad's avatar Prashant Gaikwad Committed by Mike Turquette
Browse files

clk: tegra: Use common of_clk_init function 



Use common of_clk_init() function for clocks initialization.

Signed-off-by: default avatarPrashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-by: default avatarThierry Reding <thierry.reding@gmail.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent 9139227d

arch/arm/mach-tegra/common.c

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

#include <linux/delay.h>

#include <linux/irqchip.h>

#include <linux/clk/tegra.h>

#include <linux/clk-provider.h>



#include <asm/hardware/cache-l2x0.h>
@@ -59,7 +59,7 @@ u32 tegra_uart_config[4] = { 
#ifdef CONFIG_OF

void __init tegra_dt_init_irq(void)

{

	tegra_clocks_init();

	of_clk_init(NULL);

	tegra_pmc_init();

	tegra_init_irq();

	irqchip_init();

drivers/clk/tegra/clk-tegra114.c

+2 −1
Original line number Diff line number Diff line
@@ -2033,7 +2033,7 @@ static void __init tegra114_clock_apply_init_table(void) 
	tegra_init_from_table(init_table, clks, clk_max);

}



void __init tegra114_clock_init(struct device_node *np)

static void __init tegra114_clock_init(struct device_node *np)

{

	struct device_node *node;

	int i;
@@ -2086,3 +2086,4 @@ void __init tegra114_clock_init(struct device_node *np) 


	tegra_cpu_car_ops = &tegra114_cpu_car_ops;

}

CLK_OF_DECLARE(tegra114, "nvidia,tegra114-car", tegra114_clock_init);

drivers/clk/tegra/clk-tegra20.c

+2 −1
Original line number Diff line number Diff line
@@ -1287,7 +1287,7 @@ static const struct of_device_id pmc_match[] __initconst = { 
	{},

};



void __init tegra20_clock_init(struct device_node *np)

static void __init tegra20_clock_init(struct device_node *np)

{

	int i;

	struct device_node *node;
@@ -1339,3 +1339,4 @@ void __init tegra20_clock_init(struct device_node *np) 


	tegra_cpu_car_ops = &tegra20_cpu_car_ops;

}

CLK_OF_DECLARE(tegra20, "nvidia,tegra20-car", tegra20_clock_init);

drivers/clk/tegra/clk-tegra30.c

+2 −1
Original line number Diff line number Diff line
@@ -1953,7 +1953,7 @@ static const struct of_device_id pmc_match[] __initconst = { 
	{},

};



void __init tegra30_clock_init(struct device_node *np)

static void __init tegra30_clock_init(struct device_node *np)

{

	struct device_node *node;

	int i;
@@ -2004,3 +2004,4 @@ void __init tegra30_clock_init(struct device_node *np) 


	tegra_cpu_car_ops = &tegra30_cpu_car_ops;

}

CLK_OF_DECLARE(tegra30, "nvidia,tegra30-car", tegra30_clock_init);

drivers/clk/tegra/clk.c

+0 −12
Original line number Diff line number Diff line
@@ -74,18 +74,6 @@ void __init tegra_init_from_table(struct tegra_clk_init_table *tbl, 
	}

}



static const struct of_device_id tegra_dt_clk_match[] = {

	{ .compatible = "nvidia,tegra20-car", .data = tegra20_clock_init },

	{ .compatible = "nvidia,tegra30-car", .data = tegra30_clock_init },

	{ .compatible = "nvidia,tegra114-car", .data = tegra114_clock_init },

	{ }

};



void __init tegra_clocks_init(void)

{

	of_clk_init(tegra_dt_clk_match);

}



tegra_clk_apply_init_table_func tegra_clk_apply_init_table;



void __init tegra_clocks_apply_init_table(void)