diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-25 20:30:31 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-25 20:30:31 -0700 |
commit | 27a24cfa04c6f041c0191847d047f25e5627cd63 (patch) | |
tree | c5377af546f914cc9ca665fd00c825204d61ef35 /drivers/clk | |
parent | 6b3f7b5c2221c7a4fe715ea4fd479b6d07bbcbb5 (diff) | |
parent | b59cc200ac025aca597fb21862c1c9e667f2eff2 (diff) | |
download | linux-stable-27a24cfa04c6f041c0191847d047f25e5627cd63.tar.gz linux-stable-27a24cfa04c6f041c0191847d047f25e5627cd63.tar.bz2 linux-stable-27a24cfa04c6f041c0191847d047f25e5627cd63.zip |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dma fixes from Vinod Koul:
"We have two patches from Andy & Rafael fixing the Lynxpoint dma"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
ACPI / LPSS: register clock device for Lynxpoint DMA properly
dma: acpi-dma: parse CSRT to extract additional resources
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/x86/clk-lpt.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/clk/x86/clk-lpt.c b/drivers/clk/x86/clk-lpt.c index 5cf4f4686406..4f45eee9e33b 100644 --- a/drivers/clk/x86/clk-lpt.c +++ b/drivers/clk/x86/clk-lpt.c @@ -15,22 +15,29 @@ #include <linux/clk-provider.h> #include <linux/err.h> #include <linux/module.h> +#include <linux/platform_data/clk-lpss.h> #include <linux/platform_device.h> #define PRV_CLOCK_PARAMS 0x800 static int lpt_clk_probe(struct platform_device *pdev) { + struct lpss_clk_data *drvdata; struct clk *clk; + drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); + if (!drvdata) + return -ENOMEM; + /* LPSS free running clock */ - clk = clk_register_fixed_rate(&pdev->dev, "lpss_clk", NULL, CLK_IS_ROOT, - 100000000); + drvdata->name = "lpss_clk"; + clk = clk_register_fixed_rate(&pdev->dev, drvdata->name, NULL, + CLK_IS_ROOT, 100000000); if (IS_ERR(clk)) return PTR_ERR(clk); - /* Shared DMA clock */ - clk_register_clkdev(clk, "hclk", "INTL9C60.0.auto"); + drvdata->clk = clk; + platform_set_drvdata(pdev, drvdata); return 0; } |