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

Commit a41842f7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux 

* 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux:
  ARM: SAMSUNG: Fixup commit 4e6d488a
  ARM: SAMSUNG: Fix build error from stale define in <plat/uncompress.h>
  ARM: SAMSUNG: Add suspend/resume support for S3C PWM driver
  ARM: S3C2440: Fix s3c2440 cpufreq compilation post move.
parents 72287446 0e17226f

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
	 * aligned and add in the offset when we load the value here.

	 * aligned and add in the offset when we load the value here.

	 */

	 */





	.macro addruart, rx

	.macro addruart, rx, rtmp

		mrc	p15, 0, \rx, c1, c0

		mrc	p15, 0, \rx, c1, c0

		tst	\rx, #1

		tst	\rx, #1

		ldreq	\rx, = S3C_PA_UART

		ldreq	\rx, = S3C_PA_UART

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
	 * aligned and add in the offset when we load the value here.

	 * aligned and add in the offset when we load the value here.

	 */

	 */





	.macro addruart, rx

	.macro addruart, rx, rtmp

		mrc	p15, 0, \rx, c1, c0

		mrc	p15, 0, \rx, c1, c0

		tst	\rx, #1

		tst	\rx, #1

		ldreq	\rx, = S3C_PA_UART

		ldreq	\rx, = S3C_PA_UART

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <mach/map.h>

#include <mach/map.h>

#include <plat/regs-serial.h>

#include <plat/regs-serial.h>





	.macro addruart, rx

	.macro addruart, rx, rtmp

		mrc	p15, 0, \rx, c1, c0

		mrc	p15, 0, \rx, c1, c0

		tst	\rx, #1

		tst	\rx, #1

		ldreq	\rx, = S3C_PA_UART

		ldreq	\rx, = S3C_PA_UART

arch/arm/plat-samsung/include/plat/uncompress.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -140,8 +140,6 @@ static void arch_decomp_error(const char *x) 
#define arch_error arch_decomp_error

#define arch_error arch_decomp_error

#endif

#endif





static void error(char *err);



#ifdef CONFIG_S3C_BOOT_UART_FORCE_FIFO

#ifdef CONFIG_S3C_BOOT_UART_FORCE_FIFO

static inline void arch_enable_uart_fifo(void)

static inline void arch_enable_uart_fifo(void)

{

{