Commit 21c2f477 authored by David Lechner's avatar David Lechner Committed by Sekhar Nori
Browse files

ARM: davinci: dm365: add new clock init using common clock framework 



This adds the new board-specific clock init in mach-davinci/dm365.c
using the new common clock framework drivers.

The #ifdefs are needed to prevent compile errors until the entire
ARCH_DAVINCI is converted.

Also clean up the #includes since we are adding some here.

Signed-off-by: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 5b19f66d

arch/arm/mach-davinci/board-dm365-evm.c

+2 −0
Original line number Diff line number Diff line
@@ -742,6 +742,8 @@ static __init void dm365_evm_init(void) 
{

	int ret;



	dm365_register_clocks();



	ret = dm365_gpio_register();

	if (ret)

		pr_warn("%s: GPIO init failed: %d\n", __func__, ret);

arch/arm/mach-davinci/davinci.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ int dm355_gpio_register(void); 
/* DM365 function declarations */

void dm365_init(void);

void dm365_init_time(void);

void dm365_register_clocks(void);

void dm365_init_asp(void);

void dm365_init_vc(void);

void dm365_init_ks(struct davinci_ks_platform_data *pdata);

arch/arm/mach-davinci/dm365.c

+44 −12
Original line number Diff line number Diff line
@@ -12,32 +12,38 @@ 
 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

#include <linux/init.h>

#include <linux/clk.h>

#include <linux/serial_8250.h>

#include <linux/platform_device.h>



#include <linux/clk-provider.h>

#include <linux/clk/davinci.h>

#include <linux/clkdev.h>

#include <linux/dma-mapping.h>

#include <linux/dmaengine.h>

#include <linux/spi/spi.h>

#include <linux/init.h>

#include <linux/platform_data/edma.h>

#include <linux/platform_data/gpio-davinci.h>

#include <linux/platform_data/keyscan-davinci.h>

#include <linux/platform_data/spi-davinci.h>

#include <linux/platform_device.h>

#include <linux/serial_8250.h>

#include <linux/spi/spi.h>



#include <asm/mach/map.h>



#include <mach/common.h>

#include <mach/cputype.h>

#include "psc.h"

#include <mach/mux.h>

#include <mach/irqs.h>

#include <mach/time.h>

#include <mach/mux.h>

#include <mach/serial.h>

#include <mach/common.h>

#include <mach/time.h>



#include "asp.h"

#include "davinci.h"

#include "clock.h"

#include "mux.h"

#include "asp.h"



#ifndef CONFIG_COMMON_CLK

#include "clock.h"

#include "psc.h"

#endif



#define DM365_REF_FREQ		24000000	/* 24 MHz on the DM365 EVM */

#define DM365_RTC_BASE			0x01c69000
@@ -54,6 +60,7 @@ 
#define DM365_EMAC_CNTRL_RAM_OFFSET	0x1000

#define DM365_EMAC_CNTRL_RAM_SIZE	0x2000



#ifndef CONFIG_COMMON_CLK

static struct pll_data pll1_data = {

	.num		= 1,

	.phys_base	= DAVINCI_PLL1_BASE,
@@ -485,7 +492,7 @@ static struct clk_lookup dm365_clks[] = { 
	CLK(NULL, "mjcp", &mjcp_clk),

	CLK(NULL, NULL, NULL),

};



#endif

/*----------------------------------------------------------------------*/



#define INTMUX		0x18
@@ -1171,8 +1178,33 @@ void __init dm365_init(void) 


void __init dm365_init_time(void)

{

#ifdef CONFIG_COMMON_CLK

	void __iomem *pll1, *pll2, *psc;

	struct clk *clk;



	clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, DM365_REF_FREQ);



	pll1 = ioremap(DAVINCI_PLL1_BASE, SZ_1K);

	dm365_pll1_init(NULL, pll1, NULL);



	pll2 = ioremap(DAVINCI_PLL2_BASE, SZ_1K);

	dm365_pll2_init(NULL, pll2, NULL);



	psc = ioremap(DAVINCI_PWR_SLEEP_CNTRL_BASE, SZ_4K);

	dm365_psc_init(NULL, psc);



	clk = clk_get(NULL, "timer0");



	davinci_timer_init(clk);

#else

	davinci_clk_init(dm365_clks);

	davinci_timer_init(&timer0_clk);

#endif

}



void __init dm365_register_clocks(void)

{

	/* all clocks are currently registered in dm365_init_time() */

}



static struct resource dm365_vpss_resources[] = {