diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-08-12 11:32:50 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-08-12 11:32:51 +0300 |
| commit | 61029e2b37403a536928cccbce438c1d8c2c5b20 (patch) | |
| tree | 8cfde690ad8f6c83d120a9c3c9c676dc4b2cdd78 | |
| parent | 5df5b2e04749164dfb27d870c734136ea5ccf229 (diff) | |
| parent | 96a49448c4777940b16eecdfc61f935fa380d864 (diff) | |
| download | linux-61029e2b37403a536928cccbce438c1d8c2c5b20.tar.xz | |
Merge tag 'at91-soc-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/arm
AT91 SoC updates for 6.6:
It contains:
- explicitly include correct DT includes from Rob
- one cleanup which removes unused extern declaration on atmel_tcb.h
* tag 'at91-soc-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: at91: Remove unused extern declarations
ARM: at91: Explicitly include correct DT includes
soc: microchip: Explicitly include correct DT includes
Link: https://lore.kernel.org/r/20230804044118.231478-1-claudiu.beznea@tuxon.dev
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-at91/pm.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/samv7.c | 7 | ||||
| -rw-r--r-- | drivers/soc/atmel/sfr.c | 1 | ||||
| -rw-r--r-- | drivers/soc/microchip/mpfs-sys-controller.c | 2 | ||||
| -rw-r--r-- | include/soc/at91/atmel_tcb.h | 3 |
5 files changed, 2 insertions, 12 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 437dd0352fd4..1a26af0fabc7 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -12,6 +12,7 @@ #include <linux/of.h> #include <linux/of_fdt.h> #include <linux/of_platform.h> +#include <linux/platform_device.h> #include <linux/parser.h> #include <linux/suspend.h> diff --git a/arch/arm/mach-at91/samv7.c b/arch/arm/mach-at91/samv7.c index 28f998f0fba5..22d00005ec09 100644 --- a/arch/arm/mach-at91/samv7.c +++ b/arch/arm/mach-at91/samv7.c @@ -5,14 +5,7 @@ * Copyright (C) 2013 Atmel, * 2016 Andras Szemzo <szemzo.andras@gmail.com> */ -#include <linux/of.h> -#include <linux/of_platform.h> -#include <linux/of_address.h> -#include <linux/slab.h> #include <asm/mach/arch.h> -#include <asm/mach/map.h> -#include <asm/system_misc.h> -#include "generic.h" static const char *const samv7_dt_board_compat[] __initconst = { "atmel,samv7", diff --git a/drivers/soc/atmel/sfr.c b/drivers/soc/atmel/sfr.c index 0525eef49d1a..cc94ca1b494c 100644 --- a/drivers/soc/atmel/sfr.c +++ b/drivers/soc/atmel/sfr.c @@ -10,7 +10,6 @@ #include <linux/nvmem-provider.h> #include <linux/random.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/regmap.h> diff --git a/drivers/soc/microchip/mpfs-sys-controller.c b/drivers/soc/microchip/mpfs-sys-controller.c index 216d9f4ea0ce..fbcd5fd24d7c 100644 --- a/drivers/soc/microchip/mpfs-sys-controller.c +++ b/drivers/soc/microchip/mpfs-sys-controller.c @@ -13,7 +13,7 @@ #include <linux/module.h> #include <linux/jiffies.h> #include <linux/interrupt.h> -#include <linux/of_platform.h> +#include <linux/of.h> #include <linux/mailbox_client.h> #include <linux/platform_device.h> #include <soc/microchip/mpfs.h> diff --git a/include/soc/at91/atmel_tcb.h b/include/soc/at91/atmel_tcb.h index 1d7071dc0bca..26b56a07bd1f 100644 --- a/include/soc/at91/atmel_tcb.h +++ b/include/soc/at91/atmel_tcb.h @@ -77,9 +77,6 @@ struct atmel_tc { bool allocated; }; -extern struct atmel_tc *atmel_tc_alloc(unsigned block); -extern void atmel_tc_free(struct atmel_tc *tc); - /* platform-specific ATMEL_TC_TIMER_CLOCKx divisors (0 means 32KiHz) */ extern const u8 atmel_tc_divisors[5]; |