Commit 24e44913 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:
 "SoC platform changes. Main theme this merge window:

   - The Netx platform (Netx 100/500) platform is removed by Linus
     Walleij-- the SoC doesn't have active maintainers with hardware,
     and in discussions with the vendor the agreement was that it's OK
     to remove.

   - Russell King has a series of patches that cleans up and refactors
     SA1101 and RiscPC support"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (47 commits)
  ARM: stm32: use "depends on" instead of "if" after prompt
  ARM: sa1100: convert to common clock framework
  ARM: exynos: Cleanup cppcheck shifting warning
  ARM: pxa/lubbock: remove lubbock_set_misc_wr() from global view
  ARM: exynos: Only build MCPM support if used
  arm: add missing include platform-data/atmel.h
  ARM: davinci: Use GPIO lookup table for DA850 LEDs
  ARM: OMAP2: drop explicit assembler architecture
  ARM: use arch_extension directive instead of arch argument
  ARM: imx: Switch imx7d to imx-cpufreq-dt for speed-grading
  ARM: bcm: Enable PINCTRL for ARCH_BRCMSTB
  ARM: bcm: Enable ARCH_HAS_RESET_CONTROLLER for ARCH_BRCMSTB
  ARM: riscpc: enable chained scatterlist support
  ARM: riscpc: reduce IRQ handling code
  ARM: riscpc: move RiscPC assembly files from arch/arm/lib to mach-rpc
  ARM: riscpc: parse video information from tagged list
  ARM: riscpc: add ecard quirk for Atomwide 3port serial card
  MAINTAINERS: mvebu: Add git entry
  soc: ti: pm33xx: Add a print while entering RTC only mode with DDR in self-refresh
  ARM: OMAP2+: Make some variables static
  ...
parents 31cc088a 7e8a0f10

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -1264,7 +1264,7 @@ F: include/uapi/drm/panfrost_drm.h 
ARM MFM AND FLOPPY DRIVERS

M:	Ian Molton <spyro@f2s.com>

S:	Maintained

F:	arch/arm/lib/floppydma.S

F:	arch/arm/mach-rpc/floppydma.S

F:	arch/arm/include/asm/floppy.h



ARM PMU PROFILING AND DEBUGGING
@@ -1863,6 +1863,7 @@ F: arch/arm/mach-orion5x/ 
F:	arch/arm/plat-orion/

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

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

T:	git git://git.infradead.org/linux-mvebu.git



ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support

M:	Jason Cooper <jason@lakedaemon.net>
@@ -1883,6 +1884,7 @@ F: drivers/irqchip/irq-armada-370-xp.c 
F:	drivers/irqchip/irq-mvebu-*

F:	drivers/pinctrl/mvebu/

F:	drivers/rtc/rtc-armada38x.c

T:	git git://git.infradead.org/linux-mvebu.git



ARM/Mediatek RTC DRIVER

M:	Eddie Huang <eddie.huang@mediatek.com>

arch/arm/Kconfig

+2 −12
Original line number Diff line number Diff line
@@ -377,15 +377,6 @@ config ARCH_FOOTBRIDGE 
	  Support for systems based on the DC21285 companion chip

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.



config ARCH_NETX

	bool "Hilscher NetX based"

	select ARM_VIC

	select CLKSRC_MMIO

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	help

	  This enables support for systems based on the Hilscher NetX Soc



config ARCH_IOP13XX

	bool "IOP13xx-based"

	depends on MMU
@@ -531,7 +522,7 @@ config ARCH_RPC 
	select ARCH_ACORN

	select ARCH_MAY_HAVE_PC_FDC

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_USES_GETTIMEOFFSET

	select ARM_HAS_SG_CHAIN

	select CPU_SA110

	select FIQ

	select HAVE_IDE
@@ -552,6 +543,7 @@ config ARCH_SA1100 
	select CLKSRC_MMIO

	select CLKSRC_PXA

	select TIMER_OF if OF

	select COMMON_CLK

	select CPU_FREQ

	select CPU_SA1100

	select GENERIC_CLOCKEVENTS
@@ -770,8 +762,6 @@ source "arch/arm/mach-mvebu/Kconfig" 


source "arch/arm/mach-mxs/Kconfig"



source "arch/arm/mach-netx/Kconfig"



source "arch/arm/mach-nomadik/Kconfig"



source "arch/arm/mach-npcm/Kconfig"

arch/arm/Kconfig.debug

+0 −7
Original line number Diff line number Diff line
@@ -638,13 +638,6 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  for Mediatek mt8135 based platforms on UART3.



	config DEBUG_NETX_UART

		bool "Kernel low-level debugging messages via NetX UART"

		depends on ARCH_NETX

		help

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

		  on Hilscher NetX based platforms.



	config DEBUG_NOMADIK_UART

		bool "Kernel low-level debugging messages via NOMADIK UART"

		depends on ARCH_NOMADIK

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ machine-$(CONFIG_ARCH_MXC) += imx 
machine-$(CONFIG_ARCH_MEDIATEK)		+= mediatek

machine-$(CONFIG_ARCH_MILBEAUT)		+= milbeaut

machine-$(CONFIG_ARCH_MXS)		+= mxs

machine-$(CONFIG_ARCH_NETX)		+= netx

machine-$(CONFIG_ARCH_NOMADIK)		+= nomadik

machine-$(CONFIG_ARCH_NPCM)		+= npcm

machine-$(CONFIG_ARCH_NSPIRE)		+= nspire

arch/arm/configs/netx_defconfig

deleted100644 → 0
+0 −80
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_ARCH_NETX=y

CONFIG_MACH_NXDKN=y

CONFIG_MACH_NXDB500=y

CONFIG_MACH_NXEB500HMI=y

CONFIG_PREEMPT=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttySMX0,115200"

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_NET_IPGRE=m

CONFIG_SYN_COOKIES=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m

CONFIG_NETFILTER=y

CONFIG_NET_PKTGEN=m

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PLATRAM=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_NET_NETX=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_SERIAL_NETX=y

CONFIG_SERIAL_NETX_CONSOLE=y

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FB_ARMCLCD=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_RTC_CLASS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_SHA256=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRC_CCITT=m

CONFIG_LIBCRC32C=m

CRA Git | Maintained and supported by SUSTech CRA and CCSE