mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'clks' into devel
This commit is contained in:
commit
112243034c
13 changed files with 65 additions and 271 deletions
|
|
@ -692,7 +692,7 @@ static int pl010_probe(struct amba_device *dev, void *id)
|
|||
goto free;
|
||||
}
|
||||
|
||||
uap->clk = clk_get(&dev->dev, "UARTCLK");
|
||||
uap->clk = clk_get(&dev->dev, NULL);
|
||||
if (IS_ERR(uap->clk)) {
|
||||
ret = PTR_ERR(uap->clk);
|
||||
goto unmap;
|
||||
|
|
|
|||
|
|
@ -756,7 +756,7 @@ static int pl011_probe(struct amba_device *dev, void *id)
|
|||
goto free;
|
||||
}
|
||||
|
||||
uap->clk = clk_get(&dev->dev, "UARTCLK");
|
||||
uap->clk = clk_get(&dev->dev, NULL);
|
||||
if (IS_ERR(uap->clk)) {
|
||||
ret = PTR_ERR(uap->clk);
|
||||
goto unmap;
|
||||
|
|
|
|||
Loading…
Reference in a new issue