Skip to content

Commit 634135a

Browse files
committed
Merge tag 'soc-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC updates from Arnd Bergmann: "There are three noteworthy updates for 32-bit arm platforms this time: - The Microchip SAMA7 family based on Cortex-A7 gets introduced, a new cousin to the older SAM9 (ARM9xx based) and SAMA5 (Cortex-A5 based) SoCs. - The ixp4xx platform (based on Intel XScale) is finally converted to device tree, and all the old board files are getting removed now. - The Cirrus Logic EP93xx platform loses support for the old MaverickCrunch FPU. Support for compiling user space applications was already removed in gcc-4.9, and the kernel support for old applications could not be built with clang ias. After confirming that there are no remaining users, removing this from the kernel seemed better than adding support for unused features to clang. There are minor updates to the aspeed, omap and samsung platforms" * tag 'soc-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (48 commits) soc: aspeed-lpc-ctrl: Fix clock cleanup in error path ARM: s3c: delete unneed local variable "delay" soc: aspeed: Re-enable FWH2AHB on AST2600 soc: aspeed: socinfo: Add AST2625 variant soc: aspeed: p2a-ctrl: Fix boundary check for mmap soc: aspeed: lpc-ctrl: Fix boundary check for mmap ARM: ixp4xx: Delete the Freecom FSG-3 boardfiles ARM: ixp4xx: Delete GTWX5715 board files ARM: ixp4xx: Delete Coyote and IXDPG425 boardfiles ARM: ixp4xx: Delete Intel reference design boardfiles ARM: ixp4xx: Delete Avila boardfiles ARM: ixp4xx: Delete the Arcom Vulcan boardfiles ARM: ixp4xx: Delete Gateway WG302v2 boardfiles ARM: ixp4xx: Delete Omicron boardfiles ARM: ixp4xx: Delete the D-Link DSM-G600 boardfiles ARM: ixp4xx: Delete NAS100D boardfiles ARM: ixp4xx: Delete NSLU2 boardfiles arm: omap2: Drop the unused OMAP_PACKAGE_* KConfig entries arm: omap2: Drop obsolete MACH_OMAP3_PANDORA entry ARM: ep93xx: remove MaverickCrunch support ...
2 parents 4cdc4cc + 51e321f commit 634135a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1129
-4769
lines changed

MAINTAINERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16545,6 +16545,12 @@ F: drivers/phy/samsung/phy-s5pv210-usb2.c
1654516545
F: drivers/phy/samsung/phy-samsung-usb2.c
1654616546
F: drivers/phy/samsung/phy-samsung-usb2.h
1654716547

16548+
SANCLOUD BEAGLEBONE ENHANCED DEVICE TREE
16549+
M: Paul Barker <[email protected]>
16550+
R: Marc Murphy <[email protected]>
16551+
S: Supported
16552+
F: arch/arm/boot/dts/am335x-sancloud*
16553+
1654816554
SC1200 WDT DRIVER
1654916555
M: Zwane Mwaikambo <[email protected]>
1655016556
S: Maintained

arch/arm/Kconfig.debug

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,14 @@ choice
193193
their output to the USART1 port on SAMV7 based
194194
machines.
195195

196+
config DEBUG_AT91_SAMA7G5_FLEXCOM3
197+
bool "Kernel low-level debugging on SAMA7G5 FLEXCOM3"
198+
select DEBUG_AT91_UART
199+
depends on SOC_SAMA7G5
200+
help
201+
Say Y here if you want kernel low-level debugging support
202+
on the FLEXCOM3 port of SAMA7G5.
203+
196204
config DEBUG_BCM2835
197205
bool "Kernel low-level debugging on BCM2835 PL011 UART"
198206
depends on ARCH_BCM2835 && ARCH_MULTI_V6
@@ -1668,6 +1676,7 @@ config DEBUG_UART_PHYS
16681676
default 0xd4017000 if DEBUG_MMP_UART2
16691677
default 0xd4018000 if DEBUG_MMP_UART3
16701678
default 0xe0000000 if DEBUG_SPEAR13XX
1679+
default 0xe1824200 if DEBUG_AT91_SAMA7G5_FLEXCOM3
16711680
default 0xe4007000 if DEBUG_HIP04_UART
16721681
default 0xe6c40000 if DEBUG_RMOBILE_SCIFA0
16731682
default 0xe6c50000 if DEBUG_RMOBILE_SCIFA1
@@ -1729,6 +1738,7 @@ config DEBUG_UART_VIRT
17291738
default 0xc8821000 if DEBUG_RV1108_UART1
17301739
default 0xc8912000 if DEBUG_RV1108_UART0
17311740
default 0xe0010fe0 if ARCH_RPC
1741+
default 0xe0824200 if DEBUG_AT91_SAMA7G5_FLEXCOM3
17321742
default 0xf0010000 if DEBUG_ASM9260_UART
17331743
default 0xf0100000 if DEBUG_DIGICOLOR_UA0
17341744
default 0xf01fb000 if DEBUG_NOMADIK_UART

arch/arm/configs/ep93xx_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
1212
# CONFIG_BLK_DEV_BSG is not set
1313
CONFIG_PARTITION_ADVANCED=y
1414
CONFIG_ARCH_EP93XX=y
15-
CONFIG_CRUNCH=y
1615
CONFIG_MACH_ADSSPHERE=y
1716
CONFIG_MACH_EDB9301=y
1817
CONFIG_MACH_EDB9302=y

arch/arm/include/asm/fpstate.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,6 @@ union fp_state {
7777

7878
#define FP_SIZE (sizeof(union fp_state) / sizeof(int))
7979

80-
struct crunch_state {
81-
unsigned int mvdx[16][2];
82-
unsigned int mvax[4][3];
83-
unsigned int dspsc[2];
84-
};
85-
86-
#define CRUNCH_SIZE sizeof(struct crunch_state)
87-
8880
#endif
8981

9082
#endif

arch/arm/include/asm/thread_info.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ struct thread_info {
6565
__u32 syscall; /* syscall number */
6666
__u8 used_cp[16]; /* thread used copro */
6767
unsigned long tp_value[2]; /* TLS registers */
68-
#ifdef CONFIG_CRUNCH
69-
struct crunch_state crunchstate;
70-
#endif
7168
union fp_state fpstate __attribute__((aligned(8)));
7269
union vfp_state vfpstate;
7370
#ifdef CONFIG_ARM_THUMBEE
@@ -107,11 +104,6 @@ static inline struct thread_info *current_thread_info(void)
107104
((unsigned long)(task_thread_info(tsk)->cpu_context.r7))
108105
#endif
109106

110-
extern void crunch_task_disable(struct thread_info *);
111-
extern void crunch_task_copy(struct thread_info *, void *);
112-
extern void crunch_task_restore(struct thread_info *, void *);
113-
extern void crunch_task_release(struct thread_info *);
114-
115107
extern void iwmmxt_task_disable(struct thread_info *);
116108
extern void iwmmxt_task_copy(struct thread_info *, void *);
117109
extern void iwmmxt_task_restore(struct thread_info *, void *);

arch/arm/include/asm/ucontext.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,6 @@ struct ucontext {
4343
*/
4444
#define DUMMY_MAGIC 0xb0d9ed01
4545

46-
#ifdef CONFIG_CRUNCH
47-
#define CRUNCH_MAGIC 0x5065cf03
48-
#define CRUNCH_STORAGE_SIZE (CRUNCH_SIZE + 8)
49-
50-
struct crunch_sigframe {
51-
unsigned long magic;
52-
unsigned long size;
53-
struct crunch_state storage;
54-
} __attribute__((__aligned__(8)));
55-
#endif
56-
5746
#ifdef CONFIG_IWMMXT
5847
/* iwmmxt_area is 0x98 bytes long, preceded by 8 bytes of signature */
5948
#define IWMMXT_MAGIC 0x12ef842a
@@ -92,9 +81,6 @@ struct vfp_sigframe
9281
* one of these.
9382
*/
9483
struct aux_sigframe {
95-
#ifdef CONFIG_CRUNCH
96-
struct crunch_sigframe crunch;
97-
#endif
9884
#ifdef CONFIG_IWMMXT
9985
struct iwmmxt_sigframe iwmmxt;
10086
#endif

arch/arm/include/uapi/asm/hwcap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define HWCAP_EDSP (1 << 7)
1616
#define HWCAP_JAVA (1 << 8)
1717
#define HWCAP_IWMMXT (1 << 9)
18-
#define HWCAP_CRUNCH (1 << 10)
18+
#define HWCAP_CRUNCH (1 << 10) /* Obsolete */
1919
#define HWCAP_THUMBEE (1 << 11)
2020
#define HWCAP_NEON (1 << 12)
2121
#define HWCAP_VFPv3 (1 << 13)

arch/arm/include/uapi/asm/ptrace.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#define PTRACE_GET_THREAD_AREA 22
2727
#define PTRACE_SET_SYSCALL 23
2828
/* PTRACE_SYSCALL is 24 */
29-
#define PTRACE_GETCRUNCHREGS 25
30-
#define PTRACE_SETCRUNCHREGS 26
29+
#define PTRACE_GETCRUNCHREGS 25 /* obsolete */
30+
#define PTRACE_SETCRUNCHREGS 26 /* obsolete */
3131
#define PTRACE_GETVFPREGS 27
3232
#define PTRACE_SETVFPREGS 28
3333
#define PTRACE_GETHBPREGS 29

arch/arm/kernel/asm-offsets.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ int main(void)
6363
#ifdef CONFIG_IWMMXT
6464
DEFINE(TI_IWMMXT_STATE, offsetof(struct thread_info, fpstate.iwmmxt));
6565
#endif
66-
#ifdef CONFIG_CRUNCH
67-
DEFINE(TI_CRUNCH_STATE, offsetof(struct thread_info, crunchstate));
68-
#endif
6966
#ifdef CONFIG_STACKPROTECTOR_PER_TASK
7067
DEFINE(TI_STACK_CANARY, offsetof(struct thread_info, stack_canary));
7168
#endif

arch/arm/kernel/entry-armv.S

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -618,15 +618,9 @@ call_fpe:
618618
W(b) do_fpe @ CP#1 (FPE)
619619
W(b) do_fpe @ CP#2 (FPE)
620620
ret.w lr @ CP#3
621-
#ifdef CONFIG_CRUNCH
622-
b crunch_task_enable @ CP#4 (MaverickCrunch)
623-
b crunch_task_enable @ CP#5 (MaverickCrunch)
624-
b crunch_task_enable @ CP#6 (MaverickCrunch)
625-
#else
626621
ret.w lr @ CP#4
627622
ret.w lr @ CP#5
628623
ret.w lr @ CP#6
629-
#endif
630624
ret.w lr @ CP#7
631625
ret.w lr @ CP#8
632626
ret.w lr @ CP#9

0 commit comments

Comments
 (0)