Commit 1135ec00 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC updates from Arnd Bergmann:
 "These are all minor bug fixes and cleanups to code in arch/arm and
  arch/arm64 that is specific to one SoC, updating Kconfig symbols, the
  MAINTAINERS file, and removing some dead code"

* tag 'soc-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  arm64: exynos: Enable Exynos Multi-Core Timer driver
  ARM: ixp4xx: remove unused header file pata_ixp4xx_cf.h
  ARM: ixp4xx: remove dead configs CPU_IXP43X and CPU_IXP46X
  MAINTAINERS: Add Florian as BCM5301X and BCM53573 maintainer
  ARM: samsung: Remove HAVE_S3C2410_I2C and use direct dependencies
  ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART
  ARM: imx: remove dead left-over from i.MX{27,31,35} removal
  ARM: s3c: add one more "fallthrough" statement in Jive
  ARM: s3c: include header for prototype of s3c2410_modify_misccr
  ARM: shmobile: rcar-gen2: Add missing of_node_put()
parents df0cc57e fe47ec5f

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -3636,6 +3636,7 @@ F: drivers/net/ethernet/broadcom/bcm4908_enet.* 
F:	drivers/net/ethernet/broadcom/unimac.h









BROADCOM BCM5301X ARM ARCHITECTURE









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









M:	Hauke Mehrtens <hauke@hauke-m.de>









M:	Rafał Miłecki <zajec5@gmail.com>









M:	bcm-kernel-feedback-list@broadcom.com








@@ -3647,6 +3648,7 @@ F:	arch/arm/boot/dts/bcm953012*







F:	arch/arm/mach-bcm/bcm_5301x.c

















BROADCOM BCM53573 ARM ARCHITECTURE









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









M:	Rafał Miłecki <rafal@milecki.pl>









L:	bcm-kernel-feedback-list@broadcom.com









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
































arch/arm/Kconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -479,7 +479,6 @@ config ARCH_S3C24XX







	select GPIO_SAMSUNG









	select GPIOLIB









	select GENERIC_IRQ_MULTI_HANDLER









	select HAVE_S3C2410_I2C if I2C









	select NEED_MACH_IO_H









	select S3C2410_WATCHDOG









	select SAMSUNG_ATAGS
































arch/arm/Kconfig.debug



+7
−7






























Original line number
Diff line number
Diff line







@@ -410,12 +410,12 @@ choice







		  Say Y here if you want kernel low-level debugging support









		  on i.MX25.



















	config DEBUG_IMX21_IMX27_UART









		bool "i.MX21 and i.MX27 Debug UART"









		depends on SOC_IMX21 || SOC_IMX27









	config DEBUG_IMX27_UART









		bool "i.MX27 Debug UART"









		depends on SOC_IMX27









		help









		  Say Y here if you want kernel low-level debugging support









		  on i.MX21 or i.MX27.









		  on i.MX27.



















	config DEBUG_IMX28_UART









		bool "i.MX28 Debug UART"








@@ -1481,7 +1481,7 @@ config DEBUG_IMX_UART_PORT







	int "i.MX Debug UART Port Selection"









	depends on DEBUG_IMX1_UART || \









		   DEBUG_IMX25_UART || \









		   DEBUG_IMX21_IMX27_UART || \









		   DEBUG_IMX27_UART || \









		   DEBUG_IMX31_UART || \









		   DEBUG_IMX35_UART || \









		   DEBUG_IMX50_UART || \








@@ -1540,7 +1540,7 @@ config DEBUG_LL_INCLUDE







	default "debug/icedcc.S" if DEBUG_ICEDCC









	default "debug/imx.S" if DEBUG_IMX1_UART || \









				 DEBUG_IMX25_UART || \









				 DEBUG_IMX21_IMX27_UART || \









				 DEBUG_IMX27_UART || \









				 DEBUG_IMX31_UART || \









				 DEBUG_IMX35_UART || \









				 DEBUG_IMX50_UART || \
































arch/arm/include/debug/imx-uart.h



+9
−9






























Original line number
Diff line number
Diff line







@@ -11,13 +11,6 @@







#define IMX1_UART_BASE_ADDR(n)	IMX1_UART##n##_BASE_ADDR









#define IMX1_UART_BASE(n)	IMX1_UART_BASE_ADDR(n)



















#define IMX21_UART1_BASE_ADDR	0x1000a000









#define IMX21_UART2_BASE_ADDR	0x1000b000









#define IMX21_UART3_BASE_ADDR	0x1000c000









#define IMX21_UART4_BASE_ADDR	0x1000d000









#define IMX21_UART_BASE_ADDR(n)	IMX21_UART##n##_BASE_ADDR









#define IMX21_UART_BASE(n)	IMX21_UART_BASE_ADDR(n)



















#define IMX25_UART1_BASE_ADDR	0x43f90000









#define IMX25_UART2_BASE_ADDR	0x43f94000









#define IMX25_UART3_BASE_ADDR	0x5000c000








@@ -26,6 +19,13 @@







#define IMX25_UART_BASE_ADDR(n)	IMX25_UART##n##_BASE_ADDR









#define IMX25_UART_BASE(n)	IMX25_UART_BASE_ADDR(n)



















#define IMX27_UART1_BASE_ADDR	0x1000a000









#define IMX27_UART2_BASE_ADDR	0x1000b000









#define IMX27_UART3_BASE_ADDR	0x1000c000









#define IMX27_UART4_BASE_ADDR	0x1000d000









#define IMX27_UART_BASE_ADDR(n)	IMX27_UART##n##_BASE_ADDR









#define IMX27_UART_BASE(n)	IMX27_UART_BASE_ADDR(n)



















#define IMX31_UART1_BASE_ADDR	0x43f90000









#define IMX31_UART2_BASE_ADDR	0x43f94000









#define IMX31_UART3_BASE_ADDR	0x5000c000








@@ -112,10 +112,10 @@

















#ifdef CONFIG_DEBUG_IMX1_UART









#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX1)









#elif defined(CONFIG_DEBUG_IMX21_IMX27_UART)









#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX21)









#elif defined(CONFIG_DEBUG_IMX25_UART)









#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX25)









#elif defined(CONFIG_DEBUG_IMX27_UART)









#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX27)









#elif defined(CONFIG_DEBUG_IMX31_UART)









#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX31)









#elif defined(CONFIG_DEBUG_IMX35_UART)
































arch/arm/mach-exynos/Kconfig



+0
−1






























Original line number
Diff line number
Diff line







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







	select GPIOLIB









	select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5









	select HAVE_ARM_SCU if SMP









	select HAVE_S3C2410_I2C if I2C









	select PINCTRL









	select PINCTRL_EXYNOS









	select PM_GENERIC_DOMAINS if PM