Commit 38206c24 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC platform updates from Olof Johansson:
 "Most of these are for MMP (seeing a bunch of cleanups and refactorings
  for the first time in a while), and for OMAP (a bunch of cleanups and
  added support for voltage controller on OMAP4430)"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (51 commits)
  ARM: OMAP2+: Add missing put_device() call in omapdss_init_of()
  OMAP2: fixup doc comments in omap_device
  ARM: OMAP1: drop duplicated dependency on ARCH_OMAP1
  ARM: ASPEED: update default ARCH_NR_GPIO for ARCH_ASPEED
  ARM: imx: use generic function to exit coherency
  ARM: tegra: Use WFE for power-gating on Tegra30
  ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume()
  ARM: exynos: Enable exynos-asv driver for ARCH_EXYNOS
  ARM: s3c: Rename s5p_usb_phy functions
  ARM: s3c: Rename s3c64xx_spi_setname() function
  ARM: imx: Add serial number support for i.MX6/7 SoCs
  ARM: imx: Drop imx_anatop_usb_chrg_detect_disable()
  arm64: Introduce config for S32
  ARM: hisi: drop useless depend on ARCH_MULTI_V7
  arm64: realtek: Select reset controller
  ARM: shmobile: rcar-gen2: Drop legacy DT clock support
  ARM: OMAP2+: Remove duplicated include from pmic-cpcap.c
  ARM: OMAP1: ams-delta FIQ: Fix a typo ("Initiaize")
  MAINTAINERS: Add logicpd-som-lv and logicpd-torpedo to OMAP TREE
  ARM: OMAP2+: pdata-quirks: drop TI_ST/KIM support
  ...
parents d9e48dc2 ab818f09

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -2200,6 +2200,7 @@ F: Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt 
ARM/REALTEK ARCHITECTURE

M:	Andreas Färber <afaerber@suse.de>

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

L:	linux-realtek-soc@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm64/boot/dts/realtek/

F:	Documentation/devicetree/bindings/arm/realtek.yaml
@@ -11059,9 +11060,11 @@ F: drivers/media/radio/radio-miropcm20* 
MMP SUPPORT

R:	Lubomir Rintel <lkundrak@v3.sk>

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

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp.git

S:	Odd Fixes

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

F:	arch/arm/mach-mmp/

F:	linux/soc/mmp/















MMU GATHER AND TLB INVALIDATION















M:	Will Deacon <will@kernel.org>










@@ -11908,6 +11911,8 @@ F:	arch/arm/boot/dts/*am3*













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















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















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













F:	arch/arm/boot/dts/logicpd-som-lv*













F:	arch/arm/boot/dts/logicpd-torpedo*





























OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)















L:	linux-omap@vger.kernel.org

































arch/arm/Kconfig



+1
−1






























Original line number
Diff line number
Diff line








@@ -1357,7 +1357,7 @@ config ARCH_NR_GPIO













	int















	default 2048 if ARCH_SOCFPGA















	default 1024 if ARCH_BRCMSTB || ARCH_RENESAS || ARCH_TEGRA || \













		ARCH_ZYNQ













		ARCH_ZYNQ || ARCH_ASPEED















	default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \















		SOC_DRA7XX || ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210















	default 416 if ARCH_SUNXI

































arch/arm/include/asm/hardware/cache-l2x0.h



+2
−0






























Original line number
Diff line number
Diff line








@@ -118,6 +118,8 @@













#define L310_AUX_CTRL_STORE_LIMITATION		BIT(11)	/* R2P0+ */















#define L310_AUX_CTRL_EXCLUSIVE_CACHE		BIT(12)















#define L310_AUX_CTRL_ASSOCIATIVITY_16		BIT(16)













#define L310_AUX_CTRL_FWA_SHIFT			23













#define L310_AUX_CTRL_FWA_MASK			(3 << 23)















#define L310_AUX_CTRL_CACHE_REPLACE_RR		BIT(25)	/* R2P0+ */















#define L310_AUX_CTRL_NS_LOCKDOWN		BIT(26)















#define L310_AUX_CTRL_NS_INT_CTRL		BIT(27)

































arch/arm/mach-bcm/Kconfig



+3
−1






























Original line number
Diff line number
Diff line








@@ -161,6 +161,8 @@ config ARCH_BCM2835













	select GPIOLIB















	select ARM_AMBA















	select ARM_ERRATA_411920 if ARCH_MULTI_V6













	select ARM_GIC if ARCH_MULTI_V7













	select ZONE_DMA if ARCH_MULTI_V7















	select ARM_TIMER_SP804















	select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7















	select TIMER_OF









@@ -169,7 +171,7 @@ config ARCH_BCM2835













	select PINCTRL_BCM2835















	select MFD_CORE















	help













	  This enables support for the Broadcom BCM2835 and BCM2836 SoCs.













	  This enables support for the Broadcom BCM2711 and BCM283x SoCs.















	  This SoC is used in the Raspberry Pi and Roku 2 devices.































config ARCH_BCM_53573

































arch/arm/mach-bcm/Makefile



+2
−1






























Original line number
Diff line number
Diff line








@@ -42,8 +42,9 @@ obj-$(CONFIG_ARCH_BCM_MOBILE_L2_CACHE) += kona_l2_cache.o













obj-$(CONFIG_ARCH_BCM_MOBILE_SMC) += bcm_kona_smc.o































# BCM2835













obj-$(CONFIG_ARCH_BCM2835)	+= board_bcm2835.o















ifeq ($(CONFIG_ARCH_BCM2835),y)













obj-y				+= board_bcm2835.o













obj-y				+= bcm2711.o















ifeq ($(CONFIG_ARM),y)















obj-$(CONFIG_SMP)		+= platsmp.o















endif









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE