Commit 5011bb9f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC updates from Arnd Bergmann:
 "This is mostly 32-bit code for SoC platforms, and looks smaller than
  any such branch I remember from previous kernels, as most of this is
  now handled in other subsystems for modern platforms:

   - Minor bugfixes and Kconfig updates for Tegra, Broadcom, i.MX,
     Renesas, and Samsung

   - Updates to the MAINTAINERS listing for Actions, OMAP, and Samsung

   - Samsung SoC driver updates to make them loadable modules"

* tag 'arm-soc-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  MAINTAINERS: arm: samsung: include S3C headers in platform entry
  MAINTAINERS: Add linux-actions ML for Actions Semi Arch
  ARM: s3c: irq-s3c24xx: staticize local functions
  ARM: s3c: irq-s3c24xx: include headers for missing declarations
  ARM: s3c: fix fiq for clang IAS
  ARM: imx: Remove unused IMX_GPIO_NR() macro
  soc: renesas: rcar-sysc: Mark device node OF_POPULATED after init
  ARM: OMAP2+: fix spellint typo
  MAINTAINERS: Update address for OMAP GPMC driver
  soc: renesas: rcar-sysc: Use readl_poll_timeout_atomic()
  ARM: bcm: Select BRCMSTB_L2_IRQ for bcm2835
  ARM: brcmstb: Add debug UART entry for 72116
  ARM: tegra: Don't enable unused PLLs on resume from suspend
  soc: samsung: pm_domains: Convert to regular platform driver
  soc: samsung: exynos-chipid: correct helpers __init annotation
  ARM: mach-imx: imx6ul: Print SOC revision on boot
  ARM: imx: mach-imx6ul: remove 14x14 EVK specific PHY fixup
  soc: samsung: exynos-chipid: convert to driver and merge exynos-asv
  soc: samsung: exynos-asv: handle reading revision register error
  soc: samsung: exynos-asv: don't defer early on not-supported SoCs
parents 584ce3c9 c2bd78de

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -1511,6 +1511,7 @@ ARM/ACTIONS SEMI ARCHITECTURE 
M:	Andreas Färber <afaerber@suse.de>

M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

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

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

S:	Maintained

F:	Documentation/devicetree/bindings/arm/actions.yaml

F:	Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
@@ -2382,6 +2383,8 @@ F: drivers/*/*s5pv210* 
F:	drivers/memory/samsung/

F:	drivers/soc/samsung/

F:	drivers/tty/serial/samsung*

F:	include/linux/platform_data/*s3c*

F:	include/linux/serial_s3c.h

F:	include/linux/soc/samsung/

N:	exynos

N:	s3c2410
@@ -12843,7 +12846,7 @@ S: Orphan 
F:	drivers/video/fbdev/omap/









OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT









M:	Roger Quadros <rogerq@ti.com>









M:	Roger Quadros <rogerq@kernel.org>









M:	Tony Lindgren <tony@atomide.com>









L:	linux-omap@vger.kernel.org









S:	Maintained


































arch/arm/include/debug/brcmstb.S



+16
−14






























Original line number
Diff line number
Diff line







@@ -25,6 +25,7 @@







#define SUN_TOP_CTRL_BASE_V7	REG_PHYS_ADDR_V7(0x404000)



















#define UARTA_3390		REG_PHYS_ADDR(0x40a900)









#define UARTA_72116		UARTA_7255









#define UARTA_7250		REG_PHYS_ADDR(0x40b400)









#define UARTA_7255		REG_PHYS_ADDR(0x40c000)









#define UARTA_7260		UARTA_7255










@@ -85,20 +86,21 @@ ARM_BE8(	rev	\rv, \rv )

















		/* Chip specific detection starts here */









20:		checkuart(\rp, \rv, 0x33900000, 3390)









21:		checkuart(\rp, \rv, 0x72160000, 7216)









22:		checkuart(\rp, \rv, 0x07216400, 72164)









23:		checkuart(\rp, \rv, 0x07216500, 72165)









24:		checkuart(\rp, \rv, 0x72500000, 7250)









25:		checkuart(\rp, \rv, 0x72550000, 7255)









26:		checkuart(\rp, \rv, 0x72600000, 7260)









27:		checkuart(\rp, \rv, 0x72680000, 7268)









28:		checkuart(\rp, \rv, 0x72710000, 7271)









29:		checkuart(\rp, \rv, 0x72780000, 7278)









30:		checkuart(\rp, \rv, 0x73640000, 7364)









31:		checkuart(\rp, \rv, 0x73660000, 7366)









32:		checkuart(\rp, \rv, 0x07437100, 74371)









33:		checkuart(\rp, \rv, 0x74390000, 7439)









34:		checkuart(\rp, \rv, 0x74450000, 7445)









21:		checkuart(\rp, \rv, 0x07211600, 72116)









22:		checkuart(\rp, \rv, 0x72160000, 7216)









23:		checkuart(\rp, \rv, 0x07216400, 72164)









24:		checkuart(\rp, \rv, 0x07216500, 72165)









25:		checkuart(\rp, \rv, 0x72500000, 7250)









26:		checkuart(\rp, \rv, 0x72550000, 7255)









27:		checkuart(\rp, \rv, 0x72600000, 7260)









28:		checkuart(\rp, \rv, 0x72680000, 7268)









29:		checkuart(\rp, \rv, 0x72710000, 7271)









30:		checkuart(\rp, \rv, 0x72780000, 7278)









31:		checkuart(\rp, \rv, 0x73640000, 7364)









32:		checkuart(\rp, \rv, 0x73660000, 7366)









33:		checkuart(\rp, \rv, 0x07437100, 74371)









34:		checkuart(\rp, \rv, 0x74390000, 7439)









35:		checkuart(\rp, \rv, 0x74450000, 7445)



















		/* No valid UART found */









90:		mov	\rp, #0


































arch/arm/mach-bcm/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







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







	select ARM_TIMER_SP804









	select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7









	select BCM2835_TIMER









	select BRCMSTB_L2_IRQ









	select PINCTRL









	select PINCTRL_BCM2835









	select MFD_CORE


































arch/arm/mach-exynos/Kconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -13,7 +13,6 @@ menuconfig ARCH_EXYNOS







	select ARM_GIC









	select EXYNOS_IRQ_COMBINER









	select COMMON_CLK_SAMSUNG









	select EXYNOS_ASV









	select EXYNOS_CHIPID









	select EXYNOS_THERMAL









	select EXYNOS_PMU


































arch/arm/mach-imx/hardware.h



+0
−4






























Original line number
Diff line number
Diff line







@@ -106,8 +106,4 @@







	.type = _type,							\









}



















/* There's an off-by-one between the gpio bank number and the gpiochip */









/* range e.g. GPIO_1_5 is gpio 5 under linux */









#define IMX_GPIO_NR(bank, nr)		(((bank) - 1) * 32 + (nr))



















#endif /* __ASM_ARCH_MXC_HARDWARE_H__ */