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

Commit 592ea6bd authored by Ladislav Michl's avatar Ladislav Michl Committed by Tony Lindgren
Browse files

clocksource: timer-ti-dm: Make unexported functions static 



As dmtimer no longer exports functions, make those previously
exported static (this requires few functions to be moved around
as their prototypes were deleted).

Signed-off-by: default avatarLadislav Michl <ladis@linux-mips.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ac30751d

drivers/clocksource/timer-ti-dm.c

+115 −109
Original line number Diff line number Diff line
@@ -163,6 +163,92 @@ static int omap_dm_timer_of_set_source(struct omap_dm_timer *timer) 
	return ret;

}



static int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)

{

	int ret;

	char *parent_name = NULL;

	struct clk *parent;

	struct dmtimer_platform_data *pdata;



	if (unlikely(!timer))

		return -EINVAL;



	pdata = timer->pdev->dev.platform_data;



	if (source < 0 || source >= 3)

		return -EINVAL;



	/*

	 * FIXME: Used for OMAP1 devices only because they do not currently

	 * use the clock framework to set the parent clock. To be removed

	 * once OMAP1 migrated to using clock framework for dmtimers

	 */

	if (pdata && pdata->set_timer_src)

		return pdata->set_timer_src(timer->pdev, source);



	if (IS_ERR(timer->fclk))

		return -EINVAL;



#if defined(CONFIG_COMMON_CLK)

	/* Check if the clock has configurable parents */

	if (clk_hw_get_num_parents(__clk_get_hw(timer->fclk)) < 2)

		return 0;

#endif



	switch (source) {

	case OMAP_TIMER_SRC_SYS_CLK:

		parent_name = "timer_sys_ck";

		break;



	case OMAP_TIMER_SRC_32_KHZ:

		parent_name = "timer_32k_ck";

		break;



	case OMAP_TIMER_SRC_EXT_CLK:

		parent_name = "timer_ext_ck";

		break;

	}



	parent = clk_get(&timer->pdev->dev, parent_name);

	if (IS_ERR(parent)) {

		pr_err("%s: %s not found\n", __func__, parent_name);

		return -EINVAL;

	}



	ret = clk_set_parent(timer->fclk, parent);

	if (ret < 0)

		pr_err("%s: failed to set %s as parent\n", __func__,

			parent_name);



	clk_put(parent);



	return ret;

}



static void omap_dm_timer_enable(struct omap_dm_timer *timer)

{

	int c;



	pm_runtime_get_sync(&timer->pdev->dev);



	if (!(timer->capability & OMAP_TIMER_ALWON)) {

		if (timer->get_context_loss_count) {

			c = timer->get_context_loss_count(&timer->pdev->dev);

			if (c != timer->ctx_loss_count) {

				omap_timer_restore_context(timer);

				timer->ctx_loss_count = c;

			}

		} else {

			omap_timer_restore_context(timer);

		}

	}

}



static void omap_dm_timer_disable(struct omap_dm_timer *timer)

{

	pm_runtime_put_sync(&timer->pdev->dev);

}



static int omap_dm_timer_prepare(struct omap_dm_timer *timer)

{

	int rc;
@@ -298,16 +384,16 @@ static struct omap_dm_timer *_omap_dm_timer_request(int req_type, void *data) 
	return timer;

}



struct omap_dm_timer *omap_dm_timer_request(void)

static struct omap_dm_timer *omap_dm_timer_request(void)

{

	return _omap_dm_timer_request(REQUEST_ANY, NULL);

}



struct omap_dm_timer *omap_dm_timer_request_specific(int id)

static struct omap_dm_timer *omap_dm_timer_request_specific(int id)

{

	/* Requesting timer by ID is not supported when device tree is used */

	if (of_have_populated_dt()) {

		pr_warn("%s: Please use omap_dm_timer_request_by_cap/node()\n",

		pr_warn("%s: Please use omap_dm_timer_request_by_node()\n",

			__func__);

		return NULL;

	}
@@ -336,7 +422,7 @@ struct omap_dm_timer *omap_dm_timer_request_by_cap(u32 cap) 
 * Request a timer based upon a device node pointer. Returns pointer to

 * timer handle on success and a NULL pointer on failure.

 */

struct omap_dm_timer *omap_dm_timer_request_by_node(struct device_node *np)

static struct omap_dm_timer *omap_dm_timer_request_by_node(struct device_node *np)

{

	if (!np)

		return NULL;
@@ -344,7 +430,7 @@ struct omap_dm_timer *omap_dm_timer_request_by_node(struct device_node *np) 
	return _omap_dm_timer_request(REQUEST_BY_NODE, np);

}



int omap_dm_timer_free(struct omap_dm_timer *timer)

static int omap_dm_timer_free(struct omap_dm_timer *timer)

{

	if (unlikely(!timer))

		return -EINVAL;
@@ -356,30 +442,6 @@ int omap_dm_timer_free(struct omap_dm_timer *timer) 
	return 0;

}



void omap_dm_timer_enable(struct omap_dm_timer *timer)

{

	int c;



	pm_runtime_get_sync(&timer->pdev->dev);



	if (!(timer->capability & OMAP_TIMER_ALWON)) {

		if (timer->get_context_loss_count) {

			c = timer->get_context_loss_count(&timer->pdev->dev);

			if (c != timer->ctx_loss_count) {

				omap_timer_restore_context(timer);

				timer->ctx_loss_count = c;

			}

		} else {

			omap_timer_restore_context(timer);

		}

	}

}



void omap_dm_timer_disable(struct omap_dm_timer *timer)

{

	pm_runtime_put_sync(&timer->pdev->dev);

}



int omap_dm_timer_get_irq(struct omap_dm_timer *timer)

{

	if (timer)
@@ -389,6 +451,12 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer) 


#if defined(CONFIG_ARCH_OMAP1)

#include <mach/hardware.h>



static struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)

{

	return NULL;

}



/**

 * omap_dm_timer_modify_idlect_mask - Check if any running timers use ARMXOR

 * @inputmask: current value of idlect mask
@@ -424,7 +492,7 @@ __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask) 


#else



struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)

static struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)

{

	if (timer && !IS_ERR(timer->fclk))

		return timer->fclk;
@@ -451,7 +519,7 @@ int omap_dm_timer_trigger(struct omap_dm_timer *timer) 
	return 0;

}



int omap_dm_timer_start(struct omap_dm_timer *timer)

static int omap_dm_timer_start(struct omap_dm_timer *timer)

{

	u32 l;
@@ -471,7 +539,7 @@ int omap_dm_timer_start(struct omap_dm_timer *timer) 
	return 0;

}



int omap_dm_timer_stop(struct omap_dm_timer *timer)

static int omap_dm_timer_stop(struct omap_dm_timer *timer)

{

	unsigned long rate = 0;
@@ -494,69 +562,7 @@ int omap_dm_timer_stop(struct omap_dm_timer *timer) 
	return 0;

}



int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)

{

	int ret;

	char *parent_name = NULL;

	struct clk *parent;

	struct dmtimer_platform_data *pdata;



	if (unlikely(!timer))

		return -EINVAL;



	pdata = timer->pdev->dev.platform_data;



	if (source < 0 || source >= 3)

		return -EINVAL;



	/*

	 * FIXME: Used for OMAP1 devices only because they do not currently

	 * use the clock framework to set the parent clock. To be removed

	 * once OMAP1 migrated to using clock framework for dmtimers

	 */

	if (pdata && pdata->set_timer_src)

		return pdata->set_timer_src(timer->pdev, source);



	if (IS_ERR(timer->fclk))

		return -EINVAL;



#if defined(CONFIG_COMMON_CLK)

	/* Check if the clock has configurable parents */

	if (clk_hw_get_num_parents(__clk_get_hw(timer->fclk)) < 2)

		return 0;

#endif



	switch (source) {

	case OMAP_TIMER_SRC_SYS_CLK:

		parent_name = "timer_sys_ck";

		break;



	case OMAP_TIMER_SRC_32_KHZ:

		parent_name = "timer_32k_ck";

		break;



	case OMAP_TIMER_SRC_EXT_CLK:

		parent_name = "timer_ext_ck";

		break;

	}



	parent = clk_get(&timer->pdev->dev, parent_name);

	if (IS_ERR(parent)) {

		pr_err("%s: %s not found\n", __func__, parent_name);

		return -EINVAL;

	}



	ret = clk_set_parent(timer->fclk, parent);

	if (ret < 0)

		pr_err("%s: failed to set %s as parent\n", __func__,

			parent_name);



	clk_put(parent);



	return ret;

}



int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload,

static int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload,

				  unsigned int load)

{

	u32 l;
@@ -609,8 +615,7 @@ int omap_dm_timer_set_load_start(struct omap_dm_timer *timer, int autoreload, 
	timer->context.tcrr = load;

	return 0;

}



int omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable,

static int omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable,

				   unsigned int match)

{

	u32 l;
@@ -634,7 +639,7 @@ int omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable, 
	return 0;

}



int omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on,

static int omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on,

				 int toggle, int trigger)

{

	u32 l;
@@ -659,7 +664,8 @@ int omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on, 
	return 0;

}



int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler)

static int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer,

					int prescaler)

{

	u32 l;
@@ -681,7 +687,7 @@ int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler) 
	return 0;

}



int omap_dm_timer_set_int_enable(struct omap_dm_timer *timer,

static int omap_dm_timer_set_int_enable(struct omap_dm_timer *timer,

					unsigned int value)

{

	if (unlikely(!timer))
@@ -704,7 +710,7 @@ int omap_dm_timer_set_int_enable(struct omap_dm_timer *timer, 
 *

 * Disables the specified timer interrupts for a timer.

 */

int omap_dm_timer_set_int_disable(struct omap_dm_timer *timer, u32 mask)

static int omap_dm_timer_set_int_disable(struct omap_dm_timer *timer, u32 mask)

{

	u32 l = mask;
@@ -727,7 +733,7 @@ int omap_dm_timer_set_int_disable(struct omap_dm_timer *timer, u32 mask) 
	return 0;

}



unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer)

static unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer)

{

	unsigned int l;
@@ -741,7 +747,7 @@ unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer) 
	return l;

}



int omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value)

static int omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value)

{

	if (unlikely(!timer || pm_runtime_suspended(&timer->pdev->dev)))

		return -EINVAL;
@@ -751,7 +757,7 @@ int omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value) 
	return 0;

}



unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer)

static unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer)

{

	if (unlikely(!timer || pm_runtime_suspended(&timer->pdev->dev))) {

		pr_err("%s: timer not iavailable or enabled.\n", __func__);
@@ -761,7 +767,7 @@ unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer) 
	return __omap_dm_timer_read_counter(timer, timer->posted);

}



int omap_dm_timer_write_counter(struct omap_dm_timer *timer, unsigned int value)

static int omap_dm_timer_write_counter(struct omap_dm_timer *timer, unsigned int value)

{

	if (unlikely(!timer || pm_runtime_suspended(&timer->pdev->dev))) {

		pr_err("%s: timer not available or enabled.\n", __func__);

include/clocksource/timer-ti-dm.h

+0 −33
Original line number Diff line number Diff line
@@ -119,46 +119,13 @@ struct omap_dm_timer { 
};



int omap_dm_timer_reserve_systimer(int id);

struct omap_dm_timer *omap_dm_timer_request(void);

struct omap_dm_timer *omap_dm_timer_request_specific(int timer_id);

struct omap_dm_timer *omap_dm_timer_request_by_cap(u32 cap);

struct omap_dm_timer *omap_dm_timer_request_by_node(struct device_node *np);

int omap_dm_timer_free(struct omap_dm_timer *timer);

void omap_dm_timer_enable(struct omap_dm_timer *timer);

void omap_dm_timer_disable(struct omap_dm_timer *timer);



int omap_dm_timer_get_irq(struct omap_dm_timer *timer);



u32 omap_dm_timer_modify_idlect_mask(u32 inputmask);



#ifndef CONFIG_ARCH_OMAP1

struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer);

#else

static inline

struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)

{

	return NULL;

}

#endif



int omap_dm_timer_trigger(struct omap_dm_timer *timer);

int omap_dm_timer_start(struct omap_dm_timer *timer);

int omap_dm_timer_stop(struct omap_dm_timer *timer);



int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source);

int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload, unsigned int value);

int omap_dm_timer_set_load_start(struct omap_dm_timer *timer, int autoreload, unsigned int value);

int omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable, unsigned int match);

int omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on, int toggle, int trigger);

int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler);



int omap_dm_timer_set_int_enable(struct omap_dm_timer *timer, unsigned int value);

int omap_dm_timer_set_int_disable(struct omap_dm_timer *timer, u32 mask);



unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer);

int omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value);

unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer);

int omap_dm_timer_write_counter(struct omap_dm_timer *timer, unsigned int value);



int omap_dm_timers_active(void);