diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-08-03 14:59:38 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-08-03 14:59:38 +0400 |
commit | d30a0d839a5a282e43353fee53d5dc70db5eceda (patch) | |
tree | 189a91615be3174a9ff8b20937359d11298433af /drivers/clk/mxs/clk-imx23.c | |
parent | fcfb7866af9a5d0280b7e51dd772990c636b7dec (diff) | |
parent | 988aec3de5f0fa848f26fbf64f9e83364d6b3c25 (diff) | |
download | linux-d30a0d839a5a282e43353fee53d5dc70db5eceda.tar.xz |
Merge branch 'topic/next' into for-next
Diffstat (limited to 'drivers/clk/mxs/clk-imx23.c')
-rw-r--r-- | drivers/clk/mxs/clk-imx23.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/mxs/clk-imx23.c b/drivers/clk/mxs/clk-imx23.c index db2391c054ee..844043ad0fe4 100644 --- a/drivers/clk/mxs/clk-imx23.c +++ b/drivers/clk/mxs/clk-imx23.c @@ -106,7 +106,7 @@ static struct clk_lookup lcdif_lookups[] = { static struct clk_lookup gpmi_lookups[] = { { .dev_id = "imx23-gpmi-nand", }, - { .dev_id = "8000c000.gpmi", }, + { .dev_id = "8000c000.gpmi-nand", }, }; static const char *sel_pll[] __initconst = { "pll", "ref_xtal", }; @@ -189,6 +189,7 @@ int __init mx23_clocks_init(void) } clk_register_clkdev(clks[clk32k], NULL, "timrot"); + clk_register_clkdev(clks[pwm], NULL, "80064000.pwm"); clk_register_clkdevs(clks[hbus], hbus_lookups, ARRAY_SIZE(hbus_lookups)); clk_register_clkdevs(clks[xbus], xbus_lookups, ARRAY_SIZE(xbus_lookups)); clk_register_clkdevs(clks[uart], uart_lookups, ARRAY_SIZE(uart_lookups)); |