Commit 634135a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 4cdc4cc2 51e321fe

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -16545,6 +16545,12 @@ F: drivers/phy/samsung/phy-s5pv210-usb2.c 
F:	drivers/phy/samsung/phy-samsung-usb2.c

F:	drivers/phy/samsung/phy-samsung-usb2.h









SANCLOUD BEAGLEBONE ENHANCED DEVICE TREE









M:	Paul Barker <paul.barker@sancloud.com>









R:	Marc Murphy <marc.murphy@sancloud.com>









S:	Supported









F:	arch/arm/boot/dts/am335x-sancloud*

















SC1200 WDT DRIVER









M:	Zwane Mwaikambo <zwanem@gmail.com>









S:	Maintained
































arch/arm/Kconfig.debug



+10
−0






























Original line number
Diff line number
Diff line







@@ -193,6 +193,14 @@ choice







		  their output to the USART1 port on SAMV7 based









		  machines.



















	config DEBUG_AT91_SAMA7G5_FLEXCOM3









		bool "Kernel low-level debugging on SAMA7G5 FLEXCOM3"









		select DEBUG_AT91_UART









		depends on SOC_SAMA7G5









		help









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









		  on the FLEXCOM3 port of SAMA7G5.



















	config DEBUG_BCM2835









		bool "Kernel low-level debugging on BCM2835 PL011 UART"









		depends on ARCH_BCM2835 && ARCH_MULTI_V6








@@ -1668,6 +1676,7 @@ config DEBUG_UART_PHYS







	default 0xd4017000 if DEBUG_MMP_UART2









	default 0xd4018000 if DEBUG_MMP_UART3









	default 0xe0000000 if DEBUG_SPEAR13XX









	default 0xe1824200 if DEBUG_AT91_SAMA7G5_FLEXCOM3









	default 0xe4007000 if DEBUG_HIP04_UART









	default 0xe6c40000 if DEBUG_RMOBILE_SCIFA0









	default 0xe6c50000 if DEBUG_RMOBILE_SCIFA1








@@ -1729,6 +1738,7 @@ config DEBUG_UART_VIRT







	default 0xc8821000 if DEBUG_RV1108_UART1









	default 0xc8912000 if DEBUG_RV1108_UART0









	default 0xe0010fe0 if ARCH_RPC









	default 0xe0824200 if DEBUG_AT91_SAMA7G5_FLEXCOM3









	default 0xf0010000 if DEBUG_ASM9260_UART









	default 0xf0100000 if DEBUG_DIGICOLOR_UA0









	default 0xf01fb000 if DEBUG_NOMADIK_UART
































arch/arm/configs/ep93xx_defconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -12,7 +12,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y







# CONFIG_BLK_DEV_BSG is not set









CONFIG_PARTITION_ADVANCED=y









CONFIG_ARCH_EP93XX=y









CONFIG_CRUNCH=y









CONFIG_MACH_ADSSPHERE=y









CONFIG_MACH_EDB9301=y









CONFIG_MACH_EDB9302=y
































arch/arm/include/asm/fpstate.h



+0
−8






























Original line number
Diff line number
Diff line







@@ -77,14 +77,6 @@ union fp_state {

















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



















struct crunch_state {









	unsigned int	mvdx[16][2];









	unsigned int	mvax[4][3];









	unsigned int	dspsc[2];









};



















#define CRUNCH_SIZE	sizeof(struct crunch_state)



















#endif



















#endif
























arch/arm/include/asm/thread_info.h



+0
−8






























Original line number
Diff line number
Diff line







@@ -65,9 +65,6 @@ struct thread_info {







	__u32			syscall;	/* syscall number */









	__u8			used_cp[16];	/* thread used copro */









	unsigned long		tp_value[2];	/* TLS registers */









#ifdef CONFIG_CRUNCH









	struct crunch_state	crunchstate;









#endif









	union fp_state		fpstate __attribute__((aligned(8)));









	union vfp_state		vfpstate;









#ifdef CONFIG_ARM_THUMBEE








@@ -107,11 +104,6 @@ static inline struct thread_info *current_thread_info(void)







	((unsigned long)(task_thread_info(tsk)->cpu_context.r7))









#endif



















extern void crunch_task_disable(struct thread_info *);









extern void crunch_task_copy(struct thread_info *, void *);









extern void crunch_task_restore(struct thread_info *, void *);









extern void crunch_task_release(struct thread_info *);



















extern void iwmmxt_task_disable(struct thread_info *);









extern void iwmmxt_task_copy(struct thread_info *, void *);









extern void iwmmxt_task_restore(struct thread_info *, void *);