Merge tag 'v2021.01-rc5' into next

[platform/kernel/u-boot.git] / drivers / clk / clk_stm32h7.c

diff --git a/drivers/clk/clk_stm32h7.c b/drivers/clk/clk_stm32h7.c
index 5516b48..0171fe8 100644 (file)
--- a/drivers/clk/clk_stm32h7.c
+++ b/drivers/clk/clk_stm32h7.c
@@ -1,17 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
- * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Author(s): Patrice Chotard, <patrice.chotard@foss.st.com> for STMicroelectronics.
  */
 
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <log.h>
 #include <regmap.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <dm/root.h>
+#include <linux/bitops.h>
 
 #include <dt-bindings/clock/stm32h7-clks.h>
 
@@ -867,6 +868,6 @@ U_BOOT_DRIVER(stm32h7_clk) = {
        .id                     = UCLASS_CLK,
        .ops                    = &stm32_clk_ops,
        .probe                  = stm32_clk_probe,
-       .priv_auto_alloc_size   = sizeof(struct stm32_clk),
+       .priv_auto      = sizeof(struct stm32_clk),
        .flags                  = DM_FLAG_PRE_RELOC,
 };