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

Commit 66e0c399 authored by Mark A. Greer's avatar Mark A. Greer Committed by Kevin Hilman
Browse files

davinci: Add clock init call to common init routine 



All of the davinci SoCs need to call davinci_clk_init() so
put the call in the common init routine.

Signed-off-by: default avatarMark A. Greer <mgreer@mvista.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent b9ab1279

arch/arm/mach-davinci/common.c

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include <mach/common.h>

#include <mach/cputype.h>



#include "clock.h"



struct davinci_soc_info davinci_soc_info;

EXPORT_SYMBOL(davinci_soc_info);
@@ -75,6 +77,13 @@ void __init davinci_common_init(struct davinci_soc_info *soc_info) 
	davinci_soc_info.cpu_id = dip->cpu_id;

	pr_info("DaVinci %s variant 0x%x\n", dip->name, dip->variant);



	if (davinci_soc_info.cpu_clks) {

		ret = davinci_clk_init(davinci_soc_info.cpu_clks);



		if (ret != 0)

			goto err;

	}



	return;



err:

arch/arm/mach-davinci/dm355.c

+1 −1
Original line number Diff line number Diff line
@@ -551,12 +551,12 @@ static struct davinci_soc_info davinci_soc_info_dm355 = { 
	.jtag_id_base		= IO_ADDRESS(0x01c40028),

	.ids			= dm355_ids,

	.ids_num		= ARRAY_SIZE(dm355_ids),

	.cpu_clks		= dm355_clks,

};



void __init dm355_init(void)

{

	davinci_common_init(&davinci_soc_info_dm355);

	davinci_clk_init(dm355_clks);

	davinci_mux_register(dm355_pins, ARRAY_SIZE(dm355_pins));;

}

arch/arm/mach-davinci/dm644x.c

+1 −1
Original line number Diff line number Diff line
@@ -491,12 +491,12 @@ static struct davinci_soc_info davinci_soc_info_dm644x = { 
	.jtag_id_base		= IO_ADDRESS(0x01c40028),

	.ids			= dm644x_ids,

	.ids_num		= ARRAY_SIZE(dm644x_ids),

	.cpu_clks		= dm644x_clks,

};



void __init dm644x_init(void)

{

	davinci_common_init(&davinci_soc_info_dm644x);

	davinci_clk_init(dm644x_clks);

	davinci_mux_register(dm644x_pins, ARRAY_SIZE(dm644x_pins));

}

arch/arm/mach-davinci/dm646x.c

+1 −1
Original line number Diff line number Diff line
@@ -471,12 +471,12 @@ static struct davinci_soc_info davinci_soc_info_dm646x = { 
	.jtag_id_base		= IO_ADDRESS(0x01c40028),

	.ids			= dm646x_ids,

	.ids_num		= ARRAY_SIZE(dm646x_ids),

	.cpu_clks		= dm646x_clks,

};



void __init dm646x_init(void)

{

	davinci_common_init(&davinci_soc_info_dm646x);

	davinci_clk_init(dm646x_clks);

	davinci_mux_register(dm646x_pins, ARRAY_SIZE(dm646x_pins));

}

arch/arm/mach-davinci/include/mach/common.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ struct davinci_soc_info { 
	void __iomem			*jtag_id_base;

	struct davinci_id		*ids;

	unsigned long			ids_num;

	struct davinci_clk		*cpu_clks;

};



extern struct davinci_soc_info davinci_soc_info;