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

Commit 243e0954 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'msm-core' of... 

Merge branch 'msm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup

* 'msm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
  ARM: msm: fix compilation flags for MSM_SCM (part 2)
  arch/arm/mach-msm: linux/gpio.h included twice
  ARM: msm: Drop useless teq from DEBUG_LL support
parents eb9eef61 26e87b13

arch/arm/mach-msm/board-msm7x30.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/gpio.h>

#include <linux/kernel.h>

#include <linux/irq.h>

#include <linux/gpio.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/io.h>

arch/arm/mach-msm/board-qsd8x50.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/gpio.h>

#include <linux/kernel.h>

#include <linux/irq.h>

#include <linux/gpio.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/usb/msm_hsusb.h>

arch/arm/mach-msm/include/mach/debug-macro.S

+1 −2
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ 
	@ Write the 1 character to UARTDM_TF

	str	\rd, [\rx, #0x70]

#else

	teq	\rx, #0

	strne	\rd, [\rx, #0x0C]

	str	\rd, [\rx, #0x0C]

#endif

	.endm

arch/arm/mach-msm/scm.c

+3 −0
Original line number Diff line number Diff line
@@ -282,6 +282,9 @@ u32 scm_get_version(void) 
			__asmeq("%1", "r1")

			__asmeq("%2", "r0")

			__asmeq("%3", "r1")

#ifdef REQUIRES_SEC

			".arch_extension sec\n"

#endif

			"smc	#0	@ switch to secure world\n"

			: "=r" (r0), "=r" (r1)

			: "r" (r0), "r" (r1)