diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-08-22 05:19:37 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-08-22 05:19:41 +0300 |
| commit | 56fdaf48e78b0b4c8080892524985eba6199af97 (patch) | |
| tree | 5f10510daa519dd5607bf9dfe411ce1018900c45 /arch/arm | |
| parent | 446f0a4b33417cae69e13eeec7efef045e1e63b2 (diff) | |
| parent | 91b631c25f6a21fe70f3fbc5c54aa05e617279bd (diff) | |
| download | linux-56fdaf48e78b0b4c8080892524985eba6199af97.tar.xz | |
Merge tag 'arm-soc/for-6.6/soc' of https://github.com/Broadcom/stblinux into soc/arm
This pull request contains Broadcom platforms updates for 6.6, please
pull the following:
- Rob updates the Broadcom machine level code to use the correct DT
includes
* tag 'arm-soc/for-6.6/soc' of https://github.com/Broadcom/stblinux:
ARM: bcm: Drop unused includes
Link: https://lore.kernel.org/r/20230818164539.2871539-4-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-bcm/bcm_5301x.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-bcm/board_bcm23550.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-bcm/brcmstb.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-bcm/platsmp-brcmstb.c | 2 |
4 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-bcm/bcm_5301x.c b/arch/arm/mach-bcm/bcm_5301x.c index fe067f6cebb6..cd29496da1ea 100644 --- a/arch/arm/mach-bcm/bcm_5301x.c +++ b/arch/arm/mach-bcm/bcm_5301x.c @@ -5,8 +5,6 @@ * * Licensed under the GNU/GPL. See COPYING for details. */ -#include <linux/of_platform.h> -#include <asm/hardware/cache-l2x0.h> #include <asm/mach/arch.h> #include <asm/siginfo.h> diff --git a/arch/arm/mach-bcm/board_bcm23550.c b/arch/arm/mach-bcm/board_bcm23550.c index dd6e9cb785e0..3784b7372ad8 100644 --- a/arch/arm/mach-bcm/board_bcm23550.c +++ b/arch/arm/mach-bcm/board_bcm23550.c @@ -1,8 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only // Copyright (C) 2016 Broadcom -#include <linux/of_platform.h> - #include <asm/mach/arch.h> static const char * const bcm23550_dt_compat[] = { diff --git a/arch/arm/mach-bcm/brcmstb.c b/arch/arm/mach-bcm/brcmstb.c index 2e3385ced82a..43bc98e388bf 100644 --- a/arch/arm/mach-bcm/brcmstb.c +++ b/arch/arm/mach-bcm/brcmstb.c @@ -3,7 +3,6 @@ #include <linux/init.h> #include <linux/irqchip.h> -#include <linux/of_platform.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> diff --git a/arch/arm/mach-bcm/platsmp-brcmstb.c b/arch/arm/mach-bcm/platsmp-brcmstb.c index 8989299ebdd6..07aeda1d66a8 100644 --- a/arch/arm/mach-bcm/platsmp-brcmstb.c +++ b/arch/arm/mach-bcm/platsmp-brcmstb.c @@ -10,8 +10,8 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/jiffies.h> +#include <linux/of.h> #include <linux/of_address.h> -#include <linux/of_platform.h> #include <linux/printk.h> #include <linux/regmap.h> #include <linux/smp.h> |