diff options
author | Tom Rini <trini@konsulko.com> | 2021-02-15 08:19:40 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-02-15 10:16:45 -0500 |
commit | 2ae80437fbe0181184ae4b188b89629b902702c6 (patch) | |
tree | 846f70a5df9c80ef76284c39f0da58b8c3eba96f /drivers/clk | |
parent | 76b7936e6f781c86b0d3159f67f1506d01c196ce (diff) | |
parent | 401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (diff) |
Merge branch '2021-02-02-drop-asm_global_data-when-unused'
- Merge the patch to take <asm/global_data.h> out of <common.h>
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/altera/clk-agilex.c | 1 | ||||
-rw-r--r-- | drivers/clk/altera/clk-arria10.c | 1 | ||||
-rw-r--r-- | drivers/clk/aspeed/clk_ast2500.c | 1 | ||||
-rw-r--r-- | drivers/clk/aspeed/clk_ast2600.c | 1 | ||||
-rw-r--r-- | drivers/clk/at91/compat.c | 1 | ||||
-rw-r--r-- | drivers/clk/at91/pmc.c | 3 | ||||
-rw-r--r-- | drivers/clk/clk-uclass.c | 1 | ||||
-rw-r--r-- | drivers/clk/clk_octeon.c | 1 | ||||
-rw-r--r-- | drivers/clk/clk_pic32.c | 1 | ||||
-rw-r--r-- | drivers/clk/clk_stm32mp1.c | 1 | ||||
-rw-r--r-- | drivers/clk/clk_zynq.c | 1 | ||||
-rw-r--r-- | drivers/clk/mpc83xx_clk.c | 1 | ||||
-rw-r--r-- | drivers/clk/renesas/clk-rcar-gen2.c | 1 | ||||
-rw-r--r-- | drivers/clk/renesas/clk-rcar-gen3.c | 1 | ||||
-rw-r--r-- | drivers/clk/rockchip/clk_px30.c | 1 | ||||
-rw-r--r-- | drivers/clk/rockchip/clk_rk3288.c | 1 | ||||
-rw-r--r-- | drivers/clk/rockchip/clk_rk3308.c | 1 | ||||
-rw-r--r-- | drivers/clk/rockchip/clk_rk3399.c | 1 | ||||
-rw-r--r-- | drivers/clk/rockchip/clk_rv1108.c | 1 | ||||
-rw-r--r-- | drivers/clk/ti/clk.c | 1 |
20 files changed, 20 insertions, 2 deletions
diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c index bac1d98e19..cca6d67412 100644 --- a/drivers/clk/altera/clk-agilex.c +++ b/drivers/clk/altera/clk-agilex.c @@ -5,6 +5,7 @@ #include <common.h> #include <log.h> +#include <asm/global_data.h> #include <asm/io.h> #include <clk-uclass.h> #include <dm.h> diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c index 1812152d56..578597a16e 100644 --- a/drivers/clk/altera/clk-arria10.c +++ b/drivers/clk/altera/clk-arria10.c @@ -13,6 +13,7 @@ #include <dm/lists.h> #include <dm/util.h> #include <linux/bitops.h> +#include <asm/global_data.h> #include <asm/arch/clock_manager.h> diff --git a/drivers/clk/aspeed/clk_ast2500.c b/drivers/clk/aspeed/clk_ast2500.c index a090671625..97f00f505d 100644 --- a/drivers/clk/aspeed/clk_ast2500.c +++ b/drivers/clk/aspeed/clk_ast2500.c @@ -7,6 +7,7 @@ #include <clk-uclass.h> #include <dm.h> #include <log.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/arch/scu_ast2500.h> #include <dm/lists.h> diff --git a/drivers/clk/aspeed/clk_ast2600.c b/drivers/clk/aspeed/clk_ast2600.c index f72d384047..acb7eca741 100644 --- a/drivers/clk/aspeed/clk_ast2600.c +++ b/drivers/clk/aspeed/clk_ast2600.c @@ -10,6 +10,7 @@ #include <dm/lists.h> #include <linux/delay.h> #include <asm/arch/scu_ast2600.h> +#include <asm/global_data.h> #include <dt-bindings/clock/ast2600-clock.h> #include <dt-bindings/reset/ast2600-reset.h> diff --git a/drivers/clk/at91/compat.c b/drivers/clk/at91/compat.c index dfdc3a6a92..b2bfb529cc 100644 --- a/drivers/clk/at91/compat.c +++ b/drivers/clk/at91/compat.c @@ -9,6 +9,7 @@ #include <common.h> #include <clk-uclass.h> #include <dm.h> +#include <asm/global_data.h> #include <dm/device_compat.h> #include <dm/lists.h> #include <dm/util.h> diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c index 660e231921..1fa42d728b 100644 --- a/drivers/clk/at91/pmc.c +++ b/drivers/clk/at91/pmc.c @@ -4,10 +4,9 @@ * Wenyou.Yang <wenyou.yang@atmel.com> */ +#include <common.h> #include <asm/io.h> #include <clk-uclass.h> -#include <common.h> - #include "pmc.h" static int at91_clk_of_xlate(struct clk *clk, struct ofnode_phandle_args *args) diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index d5c4e3cbe5..b87288da7a 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -20,6 +20,7 @@ #include <linux/bug.h> #include <linux/clk-provider.h> #include <linux/err.h> +#include <asm/global_data.h> static inline const struct clk_ops *clk_dev_ops(struct udevice *dev) { diff --git a/drivers/clk/clk_octeon.c b/drivers/clk/clk_octeon.c index ce274549da..fa50265184 100644 --- a/drivers/clk/clk_octeon.c +++ b/drivers/clk/clk_octeon.c @@ -5,6 +5,7 @@ #include <clk-uclass.h> #include <dm.h> +#include <asm/global_data.h> #include <dt-bindings/clock/octeon-clock.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c index 5a10d4640d..ef06a7fb9f 100644 --- a/drivers/clk/clk_pic32.c +++ b/drivers/clk/clk_pic32.c @@ -10,6 +10,7 @@ #include <div64.h> #include <time.h> #include <wait_bit.h> +#include <asm/global_data.h> #include <dm/lists.h> #include <asm/io.h> #include <linux/bitops.h> diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c index 8a5bdcb11d..848e33f4e8 100644 --- a/drivers/clk/clk_stm32mp1.c +++ b/drivers/clk/clk_stm32mp1.c @@ -17,6 +17,7 @@ #include <time.h> #include <vsprintf.h> #include <asm/arch/sys_proto.h> +#include <asm/global_data.h> #include <dm/device_compat.h> #include <dt-bindings/clock/stm32mp1-clks.h> #include <dt-bindings/clock/stm32mp1-clksrc.h> diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c index bf32d8317a..3e3320900d 100644 --- a/drivers/clk/clk_zynq.c +++ b/drivers/clk/clk_zynq.c @@ -11,6 +11,7 @@ #include <clk-uclass.h> #include <dm.h> #include <log.h> +#include <asm/global_data.h> #include <dm/device_compat.h> #include <dm/lists.h> #include <errno.h> diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c index c5ced1f132..0255ccaf8a 100644 --- a/drivers/clk/mpc83xx_clk.c +++ b/drivers/clk/mpc83xx_clk.c @@ -11,6 +11,7 @@ #include <dm.h> #include <log.h> #include <vsprintf.h> +#include <asm/global_data.h> #include <dm/lists.h> #include <dt-bindings/clk/mpc83xx-clk.h> #include <asm/arch/soc.h> diff --git a/drivers/clk/renesas/clk-rcar-gen2.c b/drivers/clk/renesas/clk-rcar-gen2.c index 16da10c8dd..b423c9414b 100644 --- a/drivers/clk/renesas/clk-rcar-gen2.c +++ b/drivers/clk/renesas/clk-rcar-gen2.c @@ -15,6 +15,7 @@ #include <dm.h> #include <errno.h> #include <log.h> +#include <asm/global_data.h> #include <asm/io.h> #include <dt-bindings/clock/renesas-cpg-mssr.h> diff --git a/drivers/clk/renesas/clk-rcar-gen3.c b/drivers/clk/renesas/clk-rcar-gen3.c index 30a101fe86..3223becd75 100644 --- a/drivers/clk/renesas/clk-rcar-gen3.c +++ b/drivers/clk/renesas/clk-rcar-gen3.c @@ -16,6 +16,7 @@ #include <errno.h> #include <log.h> #include <wait_bit.h> +#include <asm/global_data.h> #include <asm/io.h> #include <linux/bitops.h> diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c index a2a5939d4b..6b746f4c65 100644 --- a/drivers/clk/rockchip/clk_px30.c +++ b/drivers/clk/rockchip/clk_px30.c @@ -14,6 +14,7 @@ #include <asm/arch-rockchip/clock.h> #include <asm/arch-rockchip/cru_px30.h> #include <asm/arch-rockchip/hardware.h> +#include <asm/global_data.h> #include <asm/io.h> #include <dm/device-internal.h> #include <dm/lists.h> diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c index 6226d55658..221a5bd400 100644 --- a/drivers/clk/rockchip/clk_rk3288.c +++ b/drivers/clk/rockchip/clk_rk3288.c @@ -14,6 +14,7 @@ #include <malloc.h> #include <mapmem.h> #include <syscon.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/arch-rockchip/clock.h> #include <asm/arch-rockchip/cru.h> diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c index a05efcfbab..5a838b9e9a 100644 --- a/drivers/clk/rockchip/clk_rk3308.c +++ b/drivers/clk/rockchip/clk_rk3308.c @@ -11,6 +11,7 @@ #include <log.h> #include <malloc.h> #include <syscon.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/arch/cru_rk3308.h> #include <asm/arch-rockchip/clock.h> diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c index 55ebac7057..f8cbda4455 100644 --- a/drivers/clk/rockchip/clk_rk3399.c +++ b/drivers/clk/rockchip/clk_rk3399.c @@ -18,6 +18,7 @@ #include <asm/arch-rockchip/clock.h> #include <asm/arch-rockchip/cru.h> #include <asm/arch-rockchip/hardware.h> +#include <asm/global_data.h> #include <dm/device-internal.h> #include <dm/lists.h> #include <dt-bindings/clock/rk3399-cru.h> diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c index 1e22db0cb7..555155b16d 100644 --- a/drivers/clk/rockchip/clk_rv1108.c +++ b/drivers/clk/rockchip/clk_rv1108.c @@ -12,6 +12,7 @@ #include <log.h> #include <malloc.h> #include <syscon.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/arch-rockchip/clock.h> #include <asm/arch-rockchip/cru_rv1108.h> diff --git a/drivers/clk/ti/clk.c b/drivers/clk/ti/clk.c index e44b90ad6a..c999df213a 100644 --- a/drivers/clk/ti/clk.c +++ b/drivers/clk/ti/clk.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <fdtdec.h> #include <asm/io.h> #include "clk.h" |