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

Commit f86c6660 authored by Thomas Abraham's avatar Thomas Abraham Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Add clkdev infrastructure 



The struct clk definition for Samsung platforms is extended to include
a instance of struct clk_lookup and a device name. When clocks are
registered using s3c24xx_register_clock function, the dev_id, con_id
and clk members are initialized with information from the struct clk
instance and struct clk_lookup member is registered.

Signed-off-by: default avatarThomas Abraham <thomas.ab@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 5822a5df

arch/arm/plat-samsung/clock.c

+6 −82
Original line number Original line Diff line number Diff line
@@ -71,74 +71,6 @@ static int clk_null_enable(struct clk *clk, int enable) 
	return 0;

	return 0;

}

}





static int dev_is_s3c_uart(struct device *dev)

{

	struct platform_device **pdev = s3c24xx_uart_devs;

	int i;

	for (i = 0; i < ARRAY_SIZE(s3c24xx_uart_devs); i++, pdev++)

		if (*pdev && dev == &(*pdev)->dev)

			return 1;

	return 0;

}



/*

 * Serial drivers call get_clock() very early, before platform bus

 * has been set up, this requires a special check to let them get

 * a proper clock

 */



static int dev_is_platform_device(struct device *dev)

{

	return dev->bus == &platform_bus_type ||

	       (dev->bus == NULL && dev_is_s3c_uart(dev));

}



/* Clock API calls */



struct clk *clk_get(struct device *dev, const char *id)

{

	struct clk *p;

	struct clk *clk = ERR_PTR(-ENOENT);

	int idno;



	if (dev == NULL || !dev_is_platform_device(dev))

		idno = -1;

	else

		idno = to_platform_device(dev)->id;



	spin_lock(&clocks_lock);



	list_for_each_entry(p, &clocks, list) {

		if (p->id == idno &&

		    strcmp(id, p->name) == 0 &&

		    try_module_get(p->owner)) {

			clk = p;

			break;

		}

	}



	/* check for the case where a device was supplied, but the

	 * clock that was being searched for is not device specific */



	if (IS_ERR(clk)) {

		list_for_each_entry(p, &clocks, list) {

			if (p->id == -1 && strcmp(id, p->name) == 0 &&

			    try_module_get(p->owner)) {

				clk = p;

				break;

			}

		}

	}



	spin_unlock(&clocks_lock);

	return clk;

}



void clk_put(struct clk *clk)

{

	module_put(clk->owner);

}



int clk_enable(struct clk *clk)

int clk_enable(struct clk *clk)

{

{

	if (IS_ERR(clk) || clk == NULL)

	if (IS_ERR(clk) || clk == NULL)
@@ -241,8 +173,6 @@ int clk_set_parent(struct clk *clk, struct clk *parent) 
	return ret;

	return ret;

}

}





EXPORT_SYMBOL(clk_get);

EXPORT_SYMBOL(clk_put);

EXPORT_SYMBOL(clk_enable);

EXPORT_SYMBOL(clk_enable);

EXPORT_SYMBOL(clk_disable);

EXPORT_SYMBOL(clk_disable);

EXPORT_SYMBOL(clk_get_rate);

EXPORT_SYMBOL(clk_get_rate);
@@ -346,14 +276,11 @@ int s3c24xx_register_clock(struct clk *clk) 
	if (clk->enable == NULL)

	if (clk->enable == NULL)

		clk->enable = clk_null_enable;

		clk->enable = clk_null_enable;





	/* add to the list of available clocks */

	/* fill up the clk_lookup structure and register it*/



	clk->lookup.dev_id = clk->devname;

	/* Quick check to see if this clock has already been registered. */

	clk->lookup.con_id = clk->name;

	BUG_ON(clk->list.prev != clk->list.next);

	clk->lookup.clk = clk;



	clkdev_add(&clk->lookup);

	spin_lock(&clocks_lock);

	list_add(&clk->list, &clocks);

	spin_unlock(&clocks_lock);





	return 0;

	return 0;

}

}
@@ -463,10 +390,7 @@ static int clk_debugfs_register_one(struct clk *c) 
	char s[255];

	char s[255];

	char *p = s;

	char *p = s;





	p += sprintf(p, "%s", c->name);

	p += sprintf(p, "%s", c->devname);



	if (c->id >= 0)

		sprintf(p, ":%d", c->id);





	d = debugfs_create_dir(s, pa ? pa->dent : clk_debugfs_root);

	d = debugfs_create_dir(s, pa ? pa->dent : clk_debugfs_root);

	if (!d)

	if (!d)

arch/arm/plat-samsung/include/plat/clock.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 
*/

*/





#include <linux/spinlock.h>

#include <linux/spinlock.h>

#include <linux/clkdev.h>





struct clk;

struct clk;
@@ -40,6 +41,7 @@ struct clk { 
	struct module        *owner;

	struct module        *owner;

	struct clk           *parent;

	struct clk           *parent;

	const char           *name;

	const char           *name;

	const char		*devname;

	int		      id;

	int		      id;

	int		      usage;

	int		      usage;

	unsigned long         rate;

	unsigned long         rate;
@@ -47,6 +49,7 @@ struct clk { 




	struct clk_ops		*ops;

	struct clk_ops		*ops;

	int		    (*enable)(struct clk *, int enable);

	int		    (*enable)(struct clk *, int enable);

	struct clk_lookup	lookup;

#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)

#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)

	struct dentry		*dent;	/* For visible tree hierarchy */

	struct dentry		*dent;	/* For visible tree hierarchy */

#endif

#endif