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
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-bcm/bcm63xx_smp.c
Simple merge

diff --cc arch/arm/mach-davinci/board-da850-evm.c
Simple merge

diff --cc arch/arm/mach-highbank/smc.S
Simple merge

diff --cc arch/arm/mach-imx/cpuidle-imx6q.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx7d.c
Simple merge

diff --cc arch/arm/mach-keystone/smc.S
Simple merge

diff --cc arch/arm/mach-omap2/omap-headsmp.S
Simple merge

diff --cc arch/arm/mach-omap2/omap-smc.S
Simple merge

diff --cc arch/arm/mach-omap2/sleep44xx.S
Simple merge

diff --cc arch/arm/mach-pxa/include/mach/lubbock.h
Simple merge

diff --cc arch/arm/mach-pxa/lubbock.c
Simple merge

diff --cc arch/arm/mach-rpc/dma.c
Simple merge

diff --cc arch/arm/mach-rpc/ecard-loader.S
index 0000000000000000000000000000000000000000,e6057fa851bbf28288eabf24d4aeb7a0ce5914a2..eb8ac0412da6186011b05e074dd3c1cb37e71de3
mode 000000,100644..100644
--- /dev/null
--- 2/arch/arm/mach-rpc/ecard-loader.S
+++ b/arch/arm/mach-rpc/ecard-loader.S
@@@ -1,0 -1,44 +1,40 @@@
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License version 2 as
 - * published by the Free Software Foundation.
 - *
++/* SPDX-License-Identifier: GPL-2.0-only */
+ /*
+  *  linux/arch/arm/lib/ecard.S
+  *
+  *  Copyright (C) 1995, 1996 Russell King
+  *
 - *
+  * 27/03/03 Ian Molton Clean up CONFIG_CPU
+  */
+ #include <linux/linkage.h>
+ #include <asm/assembler.h>
+ 
+ #define CPSR2SPSR(rt) \
+               mrs     rt, cpsr; \
+               msr     spsr_cxsf, rt
+ 
+ @ Purpose: call an expansion card loader to read bytes.
+ @ Proto  : char read_loader(int offset, char *card_base, char *loader);
+ @ Returns: byte read
+ 
+ ENTRY(ecard_loader_read)
+               stmfd   sp!, {r4 - r12, lr}
+               mov     r11, r1
+               mov     r1, r0
+               CPSR2SPSR(r0)
+               mov     lr, pc
+               mov     pc, r2
+               ldmfd   sp!, {r4 - r12, pc}
+ 
+ @ Purpose: call an expansion card loader to reset the card
+ @ Proto  : void read_loader(int card_base, char *loader);
+ @ Returns: byte read
+ 
+ ENTRY(ecard_loader_reset)
+               stmfd   sp!, {r4 - r12, lr}
+               mov     r11, r0
+               CPSR2SPSR(r0)
+               mov     lr, pc
+               add     pc, r1, #8
+               ldmfd   sp!, {r4 - r12, pc}
+ 

diff --cc arch/arm/mach-rpc/ecard.c
Simple merge

diff --cc arch/arm/mach-rpc/floppydma.S
index 0000000000000000000000000000000000000000,de68d3b343e30a47aaa3963ccf4f981b2e557598..6698b83050dc2c4f1a1b3b34ec67287f97e2c4c1
mode 000000,100644..100644
--- /dev/null
--- 2/arch/arm/mach-rpc/floppydma.S
+++ b/arch/arm/mach-rpc/floppydma.S
@@@ -1,0 -1,32 +1,29 @@@
 - *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License version 2 as
 - * published by the Free Software Foundation.
++/* SPDX-License-Identifier: GPL-2.0-only */
+ /*
+  *  linux/arch/arm/lib/floppydma.S
+  *
+  *  Copyright (C) 1995, 1996 Russell King
+  */
+ #include <linux/linkage.h>
+ #include <asm/assembler.h>
+               .text
+ 
+               .global floppy_fiqin_end
+ ENTRY(floppy_fiqin_start)
+               subs    r9, r9, #1
+               ldrbgt  r12, [r11, #-4]
+               ldrble  r12, [r11], #0
+               strb    r12, [r10], #1
+               subs    pc, lr, #4
+ floppy_fiqin_end:
+ 
+               .global floppy_fiqout_end
+ ENTRY(floppy_fiqout_start)
+               subs    r9, r9, #1
+               ldrbge  r12, [r10], #1
+               movlt   r12, #0
+               strble  r12, [r11], #0
+               subsle  pc, lr, #4
+               strb    r12, [r11, #-4]
+               subs    pc, lr, #4
+ floppy_fiqout_end:

diff --cc arch/arm/mach-rpc/include/mach/uncompress.h
Simple merge

diff --cc arch/arm/mach-rpc/io-acorn.S
index 0000000000000000000000000000000000000000,69719bad674ddc8bce50dc3e4880b0ac7d138217..b9082a2a2a01436784ff3d34161dbc83bfefa750
mode 000000,100644..100644
--- /dev/null
--- 2/arch/arm/mach-rpc/io-acorn.S
+++ b/arch/arm/mach-rpc/io-acorn.S
@@@ -1,0 -1,32 +1,28 @@@
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License version 2 as
 - * published by the Free Software Foundation.
 - *
++/* SPDX-License-Identifier: GPL-2.0-only */
+ /*
+  *  linux/arch/arm/lib/io-acorn.S
+  *
+  *  Copyright (C) 1995, 1996 Russell King
+  *
 - *
+  * 27/03/03 Ian Molton Clean up CONFIG_CPU
+  */
+ #include <linux/linkage.h>
+ #include <linux/kern_levels.h>
+ #include <asm/assembler.h>
+ 
+               .text
+               .align
+ 
+ .Liosl_warning:
+               .ascii  KERN_WARNING "insl/outsl not implemented, called from %08lX\0"
+               .align
+ 
+ /*
+  * These make no sense on Acorn machines.
+  * Print a warning message.
+  */
+ ENTRY(insl)
+ ENTRY(outsl)
+               adr     r0, .Liosl_warning
+               mov     r1, lr
+               b       printk

diff --cc arch/arm/mach-rpc/time.c
Simple merge

diff --cc arch/arm/mach-sa1100/assabet.c
Simple merge

diff --cc arch/arm/mach-sa1100/badge4.c
Simple merge

diff --cc arch/arm/mach-sa1100/h3xxx.c
Simple merge

diff --cc arch/arm/mach-sa1100/hackkit.c
Simple merge

diff --cc arch/arm/mach-stm32/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig.platforms
Simple merge

diff --cc drivers/tty/serial/Kconfig
Simple merge