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

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

davinci: Add base address and timer flexibility 



The davinci timer code currently hardcodes the timer register
base addresses, the timer irq numbers, and the timers to use
for clock events and clocksource.  This won't work for some
a new SoC so put those values into the soc_info structure
and set them up in the SoC-specific files.

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

arch/arm/mach-davinci/devices.c

+47 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <mach/mux.h>

#include <mach/edma.h>

#include <mach/mmc.h>

#include <mach/time.h>



#define DAVINCI_I2C_BASE	     0x01C21000

#define DAVINCI_MMCSD0_BASE	     0x01E10000
@@ -235,6 +236,52 @@ static void davinci_init_wdt(void) 


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



struct davinci_timer_instance davinci_timer_instance[2] = {

	{

		.base		= IO_ADDRESS(DAVINCI_TIMER0_BASE),

		.bottom_irq	= IRQ_TINT0_TINT12,

		.top_irq	= IRQ_TINT0_TINT34,

	},

	{

		.base		= IO_ADDRESS(DAVINCI_TIMER1_BASE),

		.bottom_irq	= IRQ_TINT1_TINT12,

		.top_irq	= IRQ_TINT1_TINT34,

	},

};



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



#if defined(CONFIG_TI_DAVINCI_EMAC) || defined(CONFIG_TI_DAVINCI_EMAC_MODULE)



void davinci_init_emac(struct emac_platform_data *pdata)

{

	DECLARE_MAC_BUF(buf);



	if (cpu_is_davinci_dm644x())

		dm644x_init_emac(pdata);

	else if (cpu_is_davinci_dm646x())

		dm646x_init_emac(pdata);



	/* if valid MAC exists, don't re-register */

	if (is_valid_ether_addr(pdata->mac_addr))

		return;

	else {

		/* Use random MAC if none passed */

		random_ether_addr(pdata->mac_addr);



		printk(KERN_WARNING "%s: using random MAC addr: %s\n",

		       __func__, print_mac(buf, pdata->mac_addr));

	}

}



#else



void davinci_init_emac(struct emac_platform_data *unused) {}



#endif



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



static int __init davinci_init_devices(void)

{

	/* please keep these calls, and their implementations above,

arch/arm/mach-davinci/dm355.c

+14 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <mach/psc.h>

#include <mach/mux.h>

#include <mach/irqs.h>

#include <mach/time.h>

#include <mach/common.h>



#include "clock.h"
@@ -616,6 +617,18 @@ static void __iomem *dm355_psc_bases[] = { 
	IO_ADDRESS(DAVINCI_PWR_SLEEP_CNTRL_BASE),

};



/*

 * T0_BOT: Timer 0, bottom:  clockevent source for hrtimers

 * T0_TOP: Timer 0, top   :  clocksource for generic timekeeping

 * T1_BOT: Timer 1, bottom:  (used by DSP in TI DSPLink code)

 * T1_TOP: Timer 1, top   :  <unused>

 */

struct davinci_timer_info dm355_timer_info = {

	.timers		= davinci_timer_instance,

	.clockevent_id	= T0_BOT,

	.clocksource_id	= T0_TOP,

};



static struct davinci_soc_info davinci_soc_info_dm355 = {

	.io_desc		= dm355_io_desc,

	.io_desc_num		= ARRAY_SIZE(dm355_io_desc),
@@ -632,6 +645,7 @@ static struct davinci_soc_info davinci_soc_info_dm355 = { 
	.intc_type		= DAVINCI_INTC_TYPE_AINTC,

	.intc_irq_prios		= dm355_default_priorities,

	.intc_irq_num		= DAVINCI_N_AINTC_IRQ,

	.timer_info		= &dm355_timer_info,

};



void __init dm355_init(void)

arch/arm/mach-davinci/dm644x.c

+14 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <mach/irqs.h>

#include <mach/psc.h>

#include <mach/mux.h>

#include <mach/time.h>

#include <mach/common.h>



#include "clock.h"
@@ -559,6 +560,18 @@ static void __iomem *dm644x_psc_bases[] = { 
	IO_ADDRESS(DAVINCI_PWR_SLEEP_CNTRL_BASE),

};



/*

 * T0_BOT: Timer 0, bottom:  clockevent source for hrtimers

 * T0_TOP: Timer 0, top   :  clocksource for generic timekeeping

 * T1_BOT: Timer 1, bottom:  (used by DSP in TI DSPLink code)

 * T1_TOP: Timer 1, top   :  <unused>

 */

struct davinci_timer_info dm644x_timer_info = {

	.timers		= davinci_timer_instance,

	.clockevent_id	= T0_BOT,

	.clocksource_id	= T0_TOP,

};



static struct davinci_soc_info davinci_soc_info_dm644x = {

	.io_desc		= dm644x_io_desc,

	.io_desc_num		= ARRAY_SIZE(dm644x_io_desc),
@@ -575,6 +588,7 @@ static struct davinci_soc_info davinci_soc_info_dm644x = { 
	.intc_type		= DAVINCI_INTC_TYPE_AINTC,

	.intc_irq_prios 	= dm644x_default_priorities,

	.intc_irq_num		= DAVINCI_N_AINTC_IRQ,

	.timer_info		= &dm644x_timer_info,

};



void __init dm644x_init(void)

arch/arm/mach-davinci/dm646x.c

+14 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <mach/irqs.h>

#include <mach/psc.h>

#include <mach/mux.h>

#include <mach/time.h>

#include <mach/common.h>



#include "clock.h"
@@ -538,6 +539,18 @@ static void __iomem *dm646x_psc_bases[] = { 
	IO_ADDRESS(DAVINCI_PWR_SLEEP_CNTRL_BASE),

};



/*

 * T0_BOT: Timer 0, bottom:  clockevent source for hrtimers

 * T0_TOP: Timer 0, top   :  clocksource for generic timekeeping

 * T1_BOT: Timer 1, bottom:  (used by DSP in TI DSPLink code)

 * T1_TOP: Timer 1, top   :  <unused>

 */

struct davinci_timer_info dm646x_timer_info = {

	.timers		= davinci_timer_instance,

	.clockevent_id	= T0_BOT,

	.clocksource_id	= T0_TOP,

};



static struct davinci_soc_info davinci_soc_info_dm646x = {

	.io_desc		= dm646x_io_desc,

	.io_desc_num		= ARRAY_SIZE(dm646x_io_desc),
@@ -554,6 +567,7 @@ static struct davinci_soc_info davinci_soc_info_dm646x = { 
	.intc_type		= DAVINCI_INTC_TYPE_AINTC,

	.intc_irq_prios		= dm646x_default_priorities,

	.intc_irq_num		= DAVINCI_N_AINTC_IRQ,

	.timer_info		= &dm646x_timer_info,

};



void __init dm646x_init(void)

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

+13 −0
Original line number Diff line number Diff line
@@ -25,6 +25,18 @@ extern void setup_usb(unsigned mA, unsigned potpgt_msec); 
/* parameters describe VBUS sourcing for host mode */

extern void setup_usb(unsigned mA, unsigned potpgt_msec);



struct davinci_timer_instance {

	void __iomem	*base;

	u32		bottom_irq;

	u32		top_irq;

};



struct davinci_timer_info {

	struct davinci_timer_instance	*timers;

	unsigned int			clockevent_id;

	unsigned int			clocksource_id;

};



/* SoC specific init support */

struct davinci_soc_info {

	struct map_desc			*io_desc;
@@ -44,6 +56,7 @@ struct davinci_soc_info { 
	int				intc_type;

	u8				*intc_irq_prios;

	unsigned long			intc_irq_num;

	struct davinci_timer_info	*timer_info;

};



extern struct davinci_soc_info davinci_soc_info;