mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge remote-tracking branch 'agust/next' into next
<< Switch mpc512x to the common clock framework and adapt mpc512x drivers to use the new clock driver. Old PPC_CLOCK code is removed entirely since there are no users any more. >>
This commit is contained in:
commit
e9a371100d
22 changed files with 1840 additions and 1094 deletions
|
|
@ -731,7 +731,7 @@ static int mpc5121_nfc_probe(struct platform_device *op)
|
|||
of_node_put(rootnode);
|
||||
|
||||
/* Enable NFC clock */
|
||||
clk = devm_clk_get(dev, "nfc_clk");
|
||||
clk = devm_clk_get(dev, "ipg");
|
||||
if (IS_ERR(clk)) {
|
||||
dev_err(dev, "Unable to acquire NFC clock!\n");
|
||||
retval = PTR_ERR(clk);
|
||||
|
|
|
|||
Loading…
Reference in a new issue