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 ...
This commit is contained in:
@@ -31,7 +31,6 @@ else
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_ARCH_RPC),y)
|
||||
lib-y += ecard.o io-acorn.o floppydma.o
|
||||
AFLAGS_delay-loop.o += -march=armv4
|
||||
endif
|
||||
|
||||
|
@@ -1,40 +0,0 @@
|
||||
/* 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}
|
||||
|
@@ -1,29 +0,0 @@
|
||||
/* 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:
|
@@ -1,28 +0,0 @@
|
||||
/* 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
|
Reference in New Issue
Block a user