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

Commit 553228d0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-soc-4.8-2' of... 

Merge tag 'samsung-soc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Samsung mach/soc update for v4.8, part 2:
1. Endian-friendly fixes.
2. Maintainers update.

* tag 'samsung-soc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  MAINTAINERS: Extend Samsung SoC entry with S3C/S5P drivers
  ARM: SAMSUNG: Fix missing s5p_init_cpu() declaration
  ARM: EXYNOS: Fix UART address selection for DEBUG_LL
  ARM: EXYNOS: Fixup for __raw operations in suspend.c
  ARM: SAMSUNG: Fixup usage of __raw IO in PM
  ARM: EXYNOS: Fixup endian in pm/pmu
  ARM: EXYNOS: Fixups for big-endian operation
  ARM: SAMSUNG: Fixup endian issues in CPU detection
  ARM: EXYNOS: Fixup debug macros for big-endian
  ARM: s3c24xx: Sort cpufreq tables
  ARM: SAMSUNG: Fix typos

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents df92d2e3 1c03274d

MAINTAINERS

+4 −2
Original line number Diff line number Diff line
@@ -1598,8 +1598,10 @@ F: arch/arm/mach-s3c24*/ 
F:	arch/arm/mach-s3c64xx/

F:	arch/arm/mach-s5p*/

F:	arch/arm/mach-exynos*/

F:	drivers/*/*s3c2410*

F:	drivers/*/*/*s3c2410*

F:	drivers/*/*s3c24*

F:	drivers/*/*/*s3c24*

F:	drivers/*/*s3c64xx*

F:	drivers/*/*s5pv210*

F:	drivers/memory/samsung/*

F:	drivers/soc/samsung/*

F:	drivers/spi/spi-s3c*

arch/arm/include/debug/exynos.S

+5 −1
Original line number Diff line number Diff line
@@ -24,7 +24,11 @@ 
		mrc	p15, 0, \tmp, c0, c0, 0

		and	\tmp, \tmp, #0xf0

		teq	\tmp, #0xf0		@@ A15

		ldreq	\rp, =EXYNOS5_PA_UART

		beq	100f

		mrc	p15, 0, \tmp, c0, c0, 5

		and	\tmp, \tmp, #0xf00

		teq	\tmp, #0x100		@@ A15 + A7 but boot to A7

100:		ldreq	\rp, =EXYNOS5_PA_UART

		movne	\rp, #EXYNOS4_PA_UART	@@ EXYNOS4

		ldr	\rv, =S3C_VA_UART

#if CONFIG_DEBUG_S3C_UART != 0

arch/arm/include/debug/samsung.S

+8 −0
Original line number Diff line number Diff line
@@ -15,11 +15,13 @@ 


	.macro fifo_level_s5pv210 rd, rx

		ldr	\rd, [\rx, # S3C2410_UFSTAT]

ARM_BE8(rev \rd, \rd)

		and	\rd, \rd, #S5PV210_UFSTAT_TXMASK

	.endm



	.macro  fifo_full_s5pv210 rd, rx

		ldr	\rd, [\rx, # S3C2410_UFSTAT]

ARM_BE8(rev \rd, \rd)

		tst	\rd, #S5PV210_UFSTAT_TXFULL

	.endm
@@ -28,6 +30,7 @@ 


	.macro fifo_level_s3c2440 rd, rx

		ldr	\rd, [\rx, # S3C2410_UFSTAT]

ARM_BE8(rev \rd, \rd)

		and	\rd, \rd, #S3C2440_UFSTAT_TXMASK

	.endm
@@ -37,6 +40,7 @@ 


	.macro  fifo_full_s3c2440 rd, rx

		ldr	\rd, [\rx, # S3C2410_UFSTAT]

ARM_BE8(rev \rd, \rd)

		tst	\rd, #S3C2440_UFSTAT_TXFULL

	.endm
@@ -50,6 +54,7 @@ 


	.macro	busyuart, rd, rx

		ldr	\rd, [\rx, # S3C2410_UFCON]

ARM_BE8(rev \rd, \rd)

		tst	\rd, #S3C2410_UFCON_FIFOMODE	@ fifo enabled?

		beq	1001f				@

		@ FIFO enabled...
@@ -61,6 +66,7 @@ 
1001:

		@ busy waiting for non fifo

		ldr	\rd, [\rx, # S3C2410_UTRSTAT]

ARM_BE8(rev \rd, \rd)

		tst	\rd, #S3C2410_UTRSTAT_TXFE

		beq	1001b
@@ -69,6 +75,7 @@ 


	.macro	waituart,rd,rx

		ldr	\rd, [\rx, # S3C2410_UFCON]

ARM_BE8(rev \rd, \rd)

		tst	\rd, #S3C2410_UFCON_FIFOMODE	@ fifo enabled?

		beq	1001f				@

		@ FIFO enabled...
@@ -80,6 +87,7 @@ 
1001:

		@ idle waiting for non fifo

		ldr	\rd, [\rx, # S3C2410_UTRSTAT]

ARM_BE8(rev \rd, \rd)

		tst	\rd, #S3C2410_UTRSTAT_TXFE

		beq	1001b

arch/arm/mach-exynos/common.h

+2 −3
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ extern struct cpuidle_exynos_data cpuidle_coupled_exynos_data; 


extern void exynos_set_delayed_reset_assertion(bool enable);



extern void s5p_init_cpu(void __iomem *cpuid_addr);

extern unsigned int samsung_rev(void);

extern void exynos_core_restart(u32 core_id);

extern int exynos_set_boot_addr(u32 core_id, unsigned long boot_addr);
@@ -174,12 +173,12 @@ extern int exynos_get_boot_addr(u32 core_id, unsigned long *boot_addr); 


static inline void pmu_raw_writel(u32 val, u32 offset)

{

	__raw_writel(val, pmu_base_addr + offset);

	writel_relaxed(val, pmu_base_addr + offset);

}



static inline u32 pmu_raw_readl(u32 offset)

{

	return __raw_readl(pmu_base_addr + offset);

	return readl_relaxed(pmu_base_addr + offset);

}



#endif /* __ARCH_ARM_MACH_EXYNOS_COMMON_H */

arch/arm/mach-exynos/exynos.c

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



#include <mach/map.h>

#include <plat/cpu.h>



#include "common.h"

#include "mfc.h"