Commit c68ffdda authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Eric Miao

[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: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent d1b95607
...@@ -87,7 +87,7 @@ void clks_register(struct clk_lookup *clks, size_t num) ...@@ -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, ...@@ -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;
......
...@@ -69,6 +69,6 @@ extern void clk_pxa3xx_cken_disable(struct clk *); ...@@ -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);
...@@ -189,7 +189,7 @@ static void __init e740_init(void) ...@@ -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));
......
...@@ -190,7 +190,7 @@ static struct platform_device *devices[] __initdata = { ...@@ -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));
......
...@@ -196,7 +196,7 @@ static struct platform_device *devices[] __initdata = { ...@@ -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));
......
...@@ -919,7 +919,7 @@ static void __init tosa_init(void) ...@@ -919,7 +919,7 @@ static void __init tosa_init(void)
pxa2xx_set_spi_info(2, &pxa_ssp_master_info); pxa2xx_set_spi_info(2, &pxa_ssp_master_info);
spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
clk_add_alias("CLK_CK3P6MI", &tc6393xb_device.dev, "GPIO11_CLK", NULL); clk_add_alias("CLK_CK3P6MI", tc6393xb_device.name, "GPIO11_CLK", NULL);
platform_add_devices(devices, ARRAY_SIZE(devices)); platform_add_devices(devices, ARRAY_SIZE(devices));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment