diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-01-05 14:14:42 +0100 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-01-05 14:14:42 +0100 |
| commit | 8790fade1a19caf714ba1d91ce1fdceb9f2067f2 (patch) | |
| tree | 0b933fb6ae78b2c7489f3d154457bd022966f9ee /arch/arm | |
| parent | ARM: 9331/1: ARM/dma-mapping: replace kzalloc() and vzalloc() with kvzalloc() (diff) | |
| parent | ARM: 9330/1: davinci: also select PINCTRL (diff) | |
| download | linux-8790fade1a19caf714ba1d91ce1fdceb9f2067f2.tar.xz linux-8790fade1a19caf714ba1d91ce1fdceb9f2067f2.zip | |
Merge branches 'misc' and 'fixes' into for-next
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-davinci/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/vfp/vfpmodule.c | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 4316e1370627..1c8bf56982e5 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -10,6 +10,7 @@ menuconfig ARCH_DAVINCI select PM_GENERIC_DOMAINS_OF if PM && OF select REGMAP_MMIO select RESET_CONTROLLER + select PINCTRL select PINCTRL_SINGLE if ARCH_DAVINCI diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 7e8773a2d99d..b68efe643a12 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -800,6 +800,24 @@ static struct undef_hook neon_support_hook[] = {{ .cpsr_mask = PSR_T_BIT, .cpsr_val = PSR_T_BIT, .fn = vfp_support_entry, +}, { + .instr_mask = 0xff000800, + .instr_val = 0xfc000800, + .cpsr_mask = 0, + .cpsr_val = 0, + .fn = vfp_support_entry, +}, { + .instr_mask = 0xff000800, + .instr_val = 0xfd000800, + .cpsr_mask = 0, + .cpsr_val = 0, + .fn = vfp_support_entry, +}, { + .instr_mask = 0xff000800, + .instr_val = 0xfe000800, + .cpsr_mask = 0, + .cpsr_val = 0, + .fn = vfp_support_entry, }}; static struct undef_hook vfp_support_hook = { |