2 files changed, 3 insertions, 3 deletions

diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 5591ea71a8d1..df695313f975 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -541,7 +541,7 @@ struct clk_gpio {
 
 extern const struct clk_ops clk_gpio_gate_ops;
 struct clk *clk_register_gpio_gate(struct device *dev, const char *name,
-                const char *parent_name, struct gpio_desc *gpio,
+                const char *parent_name, unsigned gpio, bool active_low,
                 unsigned long flags);
 
 void of_gpio_clk_gate_setup(struct device_node *node);
diff --git a/include/linux/clk/at91_pmc.h b/include/linux/clk/at91_pmc.h
index c8e3b3d1eded..7669f7618f39 100644
--- a/include/linux/clk/at91_pmc.h
+++ b/include/linux/clk/at91_pmc.h
@@ -20,10 +20,10 @@
 extern void __iomem *at91_pmc_base;
 
 #define at91_pmc_read(field) \
-        __raw_readl(at91_pmc_base + field)
+        readl_relaxed(at91_pmc_base + field)
 
 #define at91_pmc_write(field, value) \
-        __raw_writel(value, at91_pmc_base + field)
+        writel_relaxed(value, at91_pmc_base + field)
 #else
 .extern at91_pmc_base
 #endif