Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9dd3865 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-arm-soc' into for-next

parents 27a513ca 2678bb9f

arch/arm/boot/dts/exynos5260-xyref5260.dts

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
	broken-cd;

	bypass-smu;

	cap-mmc-highspeed;

	supports-hs200-mode; /* 200 Mhz */

	supports-hs200-mode; /* 200 MHz */

	card-detect-delay = <200>;

	samsung,dw-mshc-ciu-div = <3>;

	samsung,dw-mshc-sdr-timing = <0 4>;

arch/arm/boot/dts/omap3-cm-t3517.dts

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 


	otg_drv_vbus: pinmux_otg_drv_vbus {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x2210, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_50Mhz_clk.usb0_drvvbus */

			OMAP3_CORE1_IOPAD(0x2210, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_50MHz_clk.usb0_drvvbus */

		>;

	};

arch/arm/include/asm/suspend.h

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ struct sleep_save_sp { 
};



extern void cpu_resume(void);

extern void cpu_resume_arm(void);

extern int cpu_suspend(unsigned long, int (*)(unsigned long));



#endif

arch/arm/kernel/sleep.S

+14 −0
Original line number Diff line number Diff line
@@ -118,6 +118,16 @@ ENDPROC(cpu_resume_after_mmu) 


	.text

	.align



#ifdef CONFIG_MMU

	.arm

ENTRY(cpu_resume_arm)

 THUMB(	adr	r9, BSYM(1f)	)	@ Kernel is entered in ARM.

 THUMB(	bx	r9		)	@ If this is a Thumb-2 kernel,

 THUMB(	.thumb			)	@ switch to Thumb now.

 THUMB(1:			)

#endif



ENTRY(cpu_resume)

ARM_BE8(setend be)			@ ensure we are in BE mode

#ifdef CONFIG_ARM_VIRT_EXT
@@ -150,6 +160,10 @@ THUMB( mov sp, r2 ) 
THUMB(	bx	r3			)

ENDPROC(cpu_resume)



#ifdef CONFIG_MMU

ENDPROC(cpu_resume_arm)

#endif



	.align 2

_sleep_save_sp:

	.long	sleep_save_sp - .

arch/arm/mach-bcm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -43,5 +43,5 @@ obj-$(CONFIG_ARCH_BCM_63XX) := bcm63xx.o 
ifeq ($(CONFIG_ARCH_BRCMSTB),y)

CFLAGS_platsmp-brcmstb.o	+= -march=armv7-a

obj-y				+= brcmstb.o

obj-$(CONFIG_SMP)		+= headsmp-brcmstb.o platsmp-brcmstb.o

obj-$(CONFIG_SMP)		+= platsmp-brcmstb.o

endif