Unverified Commit 56fdaf48 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 446f0a4b 91b631c2

arch/arm/mach-bcm/bcm_5301x.c

+0 −2
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-bcm/board_bcm23550.c

+0 −2
Original line number Diff line number Diff line 
// 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[] = {

arch/arm/mach-bcm/brcmstb.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-bcm/platsmp-brcmstb.c

+1 −1
Original line number Diff line number Diff line
@@ -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>