Commit e233cc59 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm-soc-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC updates from Arnd Bergmann:
 "The updates for arch/arm/mach-* platform code this time are mainly
  minor cleanups.

  Most notably, the DaVinci DM644x/DM646x SoC support gets removed. This
  was also scheduled for later removal early next year, but Linus
  Walleij asked for having them removed earlier to avoid problems for
  the GPIO subsystem"

* tag 'arm-soc-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (38 commits)
  ARM: at91: setup outer cache .write_sec() callback if needed
  ARM: at91: add sam_linux_is_optee_available() function
  ARM: Marvell: Update PCIe fixup
  ARM: bcmbca: Include full family name in Kconfig
  ARM: bcm: NSP: Removed forced thermal selection
  ARM: debug: bcmbca: Replace ARCH_BCM_63XX with ARCH_BCMBCA
  arm: bcmbca: Add BCMBCA sub platforms
  arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA
  MAINTAINERS: Move BCM63138 to bcmbca arch entry
  ARM: shmobile: rcar-gen2: Increase refcount for new reference
  ARM: davinci: Delete DM646x board files
  ARM: davinci: Delete DM644x board files
  firmware: xilinx: Add TF_A_PM_REGISTER_SGI SMC call
  cpufreq: zynq: Fix refcount leak in zynq_get_revision
  ARM: OMAP2+: Kconfig: Fix indentation
  ARM: OMAP2+: Fix refcount leak in omap3xxx_prm_late_init
  ARM: OMAP2+: pdata-quirks: Fix refcount leak bug
  ARM: OMAP2+: display: Fix refcount leak bug
  ARM: OMAP2+: Fix refcount leak in omapdss_init_of
  ARM: imx25: support silicon revision 1.2
  ...
parents 9de1f9c8 755d0ebc

MAINTAINERS

+15 −10
Original line number Diff line number Diff line
@@ -3875,15 +3875,28 @@ BROADCOM BCMBCA ARM ARCHITECTURE 
M:	William Zhang <william.zhang@broadcom.com>

M:	Anand Gore <anand.gore@broadcom.com>

M:	Kursad Oney <kursad.oney@broadcom.com>

M:	Florian Fainelli <f.fainelli@gmail.com>

R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

T:	git git://github.com/broadcom/stblinux.git

F:	Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml

F:	arch/arm/boot/dts/bcm47622.dtsi

F:	arch/arm/boot/dts/bcm947622.dts

F:	arch/arm64/boot/dts/broadcom/bcmbca/*

N:	bcmbca

N:	bcm[9]?47622

N:	bcm[9]?4912

N:	bcm[9]?63138

N:	bcm[9]?63146

N:	bcm[9]?63148

N:	bcm[9]?63158

N:	bcm[9]?63178

N:	bcm[9]?6756

N:	bcm[9]?6813

N:	bcm[9]?6846

N:	bcm[9]?6855

N:	bcm[9]?6856

N:	bcm[9]?6858

N:	bcm[9]?6878









BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE









M:	Florian Fainelli <f.fainelli@gmail.com>








@@ -3959,14 +3972,6 @@ S:	Maintained







F:	arch/arm/boot/dts/bcm47189*









F:	arch/arm/boot/dts/bcm53573*

















BROADCOM BCM63XX ARM ARCHITECTURE









M:	Florian Fainelli <f.fainelli@gmail.com>









R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









T:	git git://github.com/broadcom/stblinux.git









N:	bcm63xx

















BROADCOM BCM63XX/BCM33XX UDC DRIVER









M:	Kevin Cernekee <cernekee@gmail.com>









L:	linux-usb@vger.kernel.org
































arch/arm/Kconfig.debug



+1
−1






























Original line number
Diff line number
Diff line







@@ -271,7 +271,7 @@ choice

















	config DEBUG_BCM63XX_UART









		bool "Kernel low-level debugging on BCM63XX UART"









		depends on ARCH_BCM_63XX









		depends on ARCH_BCMBCA



















	config DEBUG_BERLIN_UART









		bool "Marvell Berlin SoC Debug UART"
































arch/arm/mach-at91/sam_secure.c



+6
−0






























Original line number
Diff line number
Diff line







@@ -27,6 +27,12 @@ struct arm_smccc_res sam_smccc_call(u32 fn, u32 arg0, u32 arg1)







	return res;









}



















bool sam_linux_is_optee_available(void)









{









	/* If optee has been detected, then we are running in normal world */









	return optee_available;









}



















void __init sam_secure_init(void)









{









	struct device_node *np;
































arch/arm/mach-at91/sam_secure.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -14,5 +14,6 @@

















void __init sam_secure_init(void);









struct arm_smccc_res sam_smccc_call(u32 fn, u32 arg0, u32 arg1);









bool sam_linux_is_optee_available(void);



















#endif /* SAM_SECURE_H */
























arch/arm/mach-at91/sama5.c



+15
−1






























Original line number
Diff line number
Diff line







@@ -9,13 +9,27 @@







#include <linux/of.h>









#include <linux/of_platform.h>



















#include <asm/hardware/cache-l2x0.h>









#include <asm/mach/arch.h>









#include <asm/mach/map.h>









#include <asm/outercache.h>









#include <asm/system_misc.h>



















#include "generic.h"









#include "sam_secure.h"



















static void sama5_l2c310_write_sec(unsigned long val, unsigned reg)









{









	/* OP-TEE configures the L2 cache and does not allow modifying it yet */









}



















static void __init sama5_secure_cache_init(void)









{









	sam_secure_init();









	if (sam_linux_is_optee_available())









		outer_cache.write_sec = sama5_l2c310_write_sec;









}



















static void __init sama5_dt_device_init(void)









{









	of_platform_default_populate(NULL, NULL, NULL);








@@ -48,7 +62,6 @@ MACHINE_END







static void __init sama5d2_init(void)









{









	of_platform_default_populate(NULL, NULL, NULL);









	sam_secure_init();









	sama5d2_pm_init();









}


















@@ -60,6 +73,7 @@ static const char *const sama5d2_compat[] __initconst = {







DT_MACHINE_START(sama5d2, "Atmel SAMA5")









	/* Maintainer: Atmel */









	.init_machine	= sama5d2_init,









	.init_early	= sama5_secure_cache_init,









	.dt_compat	= sama5d2_compat,









	.l2c_aux_mask	= ~0UL,









MACHINE_END