|
@@ -12,12 +12,12 @@
|
|
|
|
|
|
#include <linux/io.h>
|
|
#include <linux/io.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/clk.h>
|
|
-#include <linux/clk-provider.h>
|
|
|
|
#include <linux/gpio/driver.h>
|
|
#include <linux/gpio/driver.h>
|
|
#include <linux/irqdomain.h>
|
|
#include <linux/irqdomain.h>
|
|
#include <linux/irqchip/chained_irq.h>
|
|
#include <linux/irqchip/chained_irq.h>
|
|
#include <linux/export.h>
|
|
#include <linux/export.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of.h>
|
|
|
|
+#include <linux/of_clk.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/of_irq.h>
|
|
@@ -1361,7 +1361,7 @@ int sunxi_pinctrl_init_with_variant(struct platform_device *pdev,
|
|
goto gpiochip_error;
|
|
goto gpiochip_error;
|
|
}
|
|
}
|
|
|
|
|
|
- ret = of_count_phandle_with_args(node, "clocks", "#clock-cells");
|
|
|
|
|
|
+ ret = of_clk_get_parent_count(node);
|
|
clk = devm_clk_get(&pdev->dev, ret == 1 ? NULL : "apb");
|
|
clk = devm_clk_get(&pdev->dev, ret == 1 ? NULL : "apb");
|
|
if (IS_ERR(clk)) {
|
|
if (IS_ERR(clk)) {
|
|
ret = PTR_ERR(clk);
|
|
ret = PTR_ERR(clk);
|