Commit 8790fade authored by Russell King (Oracle)'s avatar Russell King (Oracle)
Browse files

Merge branches 'misc' and 'fixes' into for-next

parents c17d8847 f54e8634

arch/arm/mach-davinci/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/vfp/vfpmodule.c

+18 −0
Original line number Diff line number Diff line
@@ -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 = {