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

Commit c68ffdda authored Mar 05, 2009 by Dmitry Eremin-Solenikov Committed by Eric Miao Mar 19, 2009

[ARM] pxa: make second argument of clk_add_alias a name instead of the device



clk_add_alias is commonly called for platform devices that are not yet
registered in the device tree. Thus the clock alias is associated with
NULL device name. Fix this by passing the device name instead of just
device pointer.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>

parent d1b95607

arch/arm/mach-pxa/clock.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -87,7 +87,7 @@ void clks_register(struct clk_lookup *clks, size_t num)
	clkdev_add(&clks[i]);		clkdev_add(&clks[i]);
	}		}

	int clk_add_alias(char alias, struct device alias_dev, char *id,		int clk_add_alias(const char alias, const char alias_dev_name, char *id,
	struct device *dev)		struct device *dev)
	{		{
	struct clk *r = clk_get(dev, id);		struct clk *r = clk_get(dev, id);
	@@ -96,7 +96,7 @@ int clk_add_alias(char alias, struct device alias_dev, char *id,
	if (!r)		if (!r)
	return -ENODEV;		return -ENODEV;

	l = clkdev_alloc(r, alias, alias_dev ? dev_name(alias_dev) : NULL);		l = clkdev_alloc(r, alias, alias_dev_name);
	clk_put(r);		clk_put(r);
	if (!l)		if (!l)
	return -ENODEV;		return -ENODEV;

arch/arm/mach-pxa/clock.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -69,6 +69,6 @@ extern void clk_pxa3xx_cken_disable(struct clk *);
	#endif		#endif

	void clks_register(struct clk_lookup *clks, size_t num);		void clks_register(struct clk_lookup *clks, size_t num);
	int clk_add_alias(char alias, struct device alias_dev, char *id,		int clk_add_alias(const char alias, const char alias_name, char *id,
	struct device *dev);		struct device *dev);

arch/arm/mach-pxa/e740.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -189,7 +189,7 @@ static void __init e740_init(void)
	{		{
	pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config));		pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config));
	eseries_register_clks();		eseries_register_clks();
	clk_add_alias("CLK_CK48M", &e740_t7l66xb_device.dev,		clk_add_alias("CLK_CK48M", e740_t7l66xb_device.name,
	"UDCCLK", &pxa25x_device_udc.dev),		"UDCCLK", &pxa25x_device_udc.dev),
	eseries_get_tmio_gpios();		eseries_get_tmio_gpios();
	platform_add_devices(devices, ARRAY_SIZE(devices));		platform_add_devices(devices, ARRAY_SIZE(devices));

arch/arm/mach-pxa/e750.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -190,7 +190,7 @@ static struct platform_device *devices[] __initdata = {
	static void __init e750_init(void)		static void __init e750_init(void)
	{		{
	pxa2xx_mfp_config(ARRAY_AND_SIZE(e750_pin_config));		pxa2xx_mfp_config(ARRAY_AND_SIZE(e750_pin_config));
	clk_add_alias("CLK_CK3P6MI", &e750_tc6393xb_device.dev,		clk_add_alias("CLK_CK3P6MI", e750_tc6393xb_device.name,
	"GPIO11_CLK", NULL),		"GPIO11_CLK", NULL),
	eseries_get_tmio_gpios();		eseries_get_tmio_gpios();
	platform_add_devices(devices, ARRAY_SIZE(devices));		platform_add_devices(devices, ARRAY_SIZE(devices));

arch/arm/mach-pxa/e800.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -196,7 +196,7 @@ static struct platform_device *devices[] __initdata = {

	static void __init e800_init(void)		static void __init e800_init(void)
	{		{
	clk_add_alias("CLK_CK3P6MI", &e800_tc6393xb_device.dev,		clk_add_alias("CLK_CK3P6MI", e800_tc6393xb_device.name,
	"GPIO11_CLK", NULL),		"GPIO11_CLK", NULL),
	eseries_get_tmio_gpios();		eseries_get_tmio_gpios();
	platform_add_devices(devices, ARRAY_SIZE(devices));		platform_add_devices(devices, ARRAY_SIZE(devices));