Skip to content

Commit 61029e2

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 5df5b2e + 96a4944 commit 61029e2

File tree

5 files changed

+2
-12
lines changed

5 files changed

+2
-12
lines changed

arch/arm/mach-at91/pm.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <linux/of.h>
1313
#include <linux/of_fdt.h>
1414
#include <linux/of_platform.h>
15+
#include <linux/platform_device.h>
1516
#include <linux/parser.h>
1617
#include <linux/suspend.h>
1718

arch/arm/mach-at91/samv7.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@
55
* Copyright (C) 2013 Atmel,
66
* 2016 Andras Szemzo <[email protected]>
77
*/
8-
#include <linux/of.h>
9-
#include <linux/of_platform.h>
10-
#include <linux/of_address.h>
11-
#include <linux/slab.h>
128
#include <asm/mach/arch.h>
13-
#include <asm/mach/map.h>
14-
#include <asm/system_misc.h>
15-
#include "generic.h"
169

1710
static const char *const samv7_dt_board_compat[] __initconst = {
1811
"atmel,samv7",

drivers/soc/atmel/sfr.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <linux/nvmem-provider.h>
1111
#include <linux/random.h>
1212
#include <linux/of.h>
13-
#include <linux/of_device.h>
1413
#include <linux/platform_device.h>
1514
#include <linux/regmap.h>
1615

drivers/soc/microchip/mpfs-sys-controller.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <linux/module.h>
1414
#include <linux/jiffies.h>
1515
#include <linux/interrupt.h>
16-
#include <linux/of_platform.h>
16+
#include <linux/of.h>
1717
#include <linux/mailbox_client.h>
1818
#include <linux/platform_device.h>
1919
#include <soc/microchip/mpfs.h>

include/soc/at91/atmel_tcb.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@ struct atmel_tc {
7777
bool allocated;
7878
};
7979

80-
extern struct atmel_tc *atmel_tc_alloc(unsigned block);
81-
extern void atmel_tc_free(struct atmel_tc *tc);
82-
8380
/* platform-specific ATMEL_TC_TIMER_CLOCKx divisors (0 means 32KiHz) */
8481
extern const u8 atmel_tc_divisors[5];
8582

0 commit comments

Comments
 (0)