6 files changed, 6 insertions, 83 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 4c414af75ef0..8d197dcdd2c0 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -36,7 +36,6 @@ config ARCH_EXYNOS5
        select HAVE_ARM_SCU if SMP
        select HAVE_SMP
        select PINCTRL
-        select USB_ARCH_HAS_XHCI
        help
          Samsung EXYNOS5 (Cortex-A15) SoC based systems
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index f18be40e5b21..b2f9bb071557 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -20,6 +20,7 @@
 #include <clocksource/samsung_pwm.h>
 #include <linux/sched.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/of.h>
 #include <linux/of_fdt.h>
 #include <linux/of_irq.h>
@@ -40,7 +41,6 @@
 #include <plat/cpu.h>
 #include <plat/pm.h>
-#include <plat/regs-serial.h>
 #include "common.h"
 #include "regs-pmu.h"
@@ -404,8 +404,10 @@ static int __init exynos4_l2x0_cache_init(void)
        if (ret)
                return ret;
-        l2x0_regs_phys = virt_to_phys(&l2x0_saved_regs);
+        if (IS_ENABLED(CONFIG_S5P_SLEEP)) {
-        clean_dcache_area(&l2x0_regs_phys, sizeof(unsigned long));
+                l2x0_regs_phys = virt_to_phys(&l2x0_saved_regs);
+                clean_dcache_area(&l2x0_regs_phys, sizeof(unsigned long));
+        }
        return 0;
 }
 early_initcall(exynos4_l2x0_cache_init);
diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c
index f57cb91f02aa..93d2decc112d 100644
--- a/arch/arm/mach-exynos/cpuidle.c
+++ b/arch/arm/mach-exynos/cpuidle.c
@@ -14,6 +14,7 @@
 #include <linux/cpu_pm.h>
 #include <linux/io.h>
 #include <linux/export.h>
+#include <linux/module.h>
 #include <linux/time.h>
 #include <linux/platform_device.h>
diff --git a/arch/arm/mach-exynos/include/mach/timex.h b/arch/arm/mach-exynos/include/mach/timex.h
deleted file mode 100644
index 6d138750a708..000000000000
--- a/arch/arm/mach-exynos/include/mach/timex.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* linux/arch/arm/mach-exynos4/include/mach/timex.h
- *
- * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Copyright (c) 2003-2010 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *
- * Based on arch/arm/mach-s5p6442/include/mach/timex.h
- *
- * EXYNOS4 - time parameters
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-#ifndef __ASM_ARCH_TIMEX_H
-#define __ASM_ARCH_TIMEX_H __FILE__
-/* CLOCK_TICK_RATE needs to be evaluatable by the cpp, so making it
- * a variable is useless. It seems as long as we make our timers an
- * exact multiple of HZ, any value that makes a 1->1 correspondence
- * for the time conversion functions to/from jiffies is acceptable.
-*/
-#define CLOCK_TICK_RATE 12000000
-#endif /* __ASM_ARCH_TIMEX_H */
diff --git a/arch/arm/mach-exynos/include/mach/uncompress.h b/arch/arm/mach-exynos/include/mach/uncompress.h
deleted file mode 100644
index 5d7ce36be46f..000000000000
--- a/arch/arm/mach-exynos/include/mach/uncompress.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2010-2012 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * EXYNOS - uncompress code
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-#ifndef __ASM_ARCH_UNCOMPRESS_H
-#define __ASM_ARCH_UNCOMPRESS_H __FILE__
-#include <asm/mach-types.h>
-#include <mach/map.h>
-#include <plat/uncompress.h>
-static unsigned int __raw_readl(unsigned int ptr)
-{
-        return *((volatile unsigned int *)ptr);
-}
-static void arch_detect_cpu(void)
-{
-        u32 chip_id = __raw_readl(EXYNOS_PA_CHIPID);
-        /*
-         * product_id is bits 31:12
-         * bits 23:20 describe the exynosX family
-         * bits 27:24 describe the exynosX family in exynos5420
-         */
-        chip_id >>= 20;
-        if ((chip_id & 0x0f) == 0x5 || (chip_id & 0xf0) == 0x50)
-                uart_base = (volatile u8 *)EXYNOS5_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);
-        else
-                uart_base = (volatile u8 *)EXYNOS4_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);
-        /*
-         * For preventing FIFO overrun or infinite loop of UART console,
-         * fifo_max should be the minimum fifo size of all of the UART channels
-         */
-        fifo_mask = S5PV210_UFSTAT_TXMASK;
-        fifo_max = 15 << S5PV210_UFSTAT_TXSHIFT;
-}
-#endif /* __ASM_ARCH_UNCOMPRESS_H */
diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c
index 8fd24882f0b1..fe6570ebbdde 100644
--- a/arch/arm/mach-exynos/pm_domains.c
+++ b/arch/arm/mach-exynos/pm_domains.c
@@ -22,8 +22,6 @@
 #include <linux/of_platform.h>
 #include <linux/sched.h>
-#include <plat/devs.h>
 #include "regs-pmu.h"
 /*

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 4c414af75ef0..8d197dcdd2c0 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig
@@ -36,7 +36,6 @@ config ARCH_EXYNOS5
36	select HAVE_ARM_SCU if SMP	36	select HAVE_ARM_SCU if SMP
37	select HAVE_SMP	37	select HAVE_SMP
38	select PINCTRL	38	select PINCTRL
39	select USB_ARCH_HAS_XHCI
40	help	39	help
41	Samsung EXYNOS5 (Cortex-A15) SoC based systems	40	Samsung EXYNOS5 (Cortex-A15) SoC based systems
42		41


diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index f18be40e5b21..b2f9bb071557 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c
@@ -20,6 +20,7 @@
20	#include <clocksource/samsung_pwm.h>	20	#include <clocksource/samsung_pwm.h>
21	#include <linux/sched.h>	21	#include <linux/sched.h>
22	#include <linux/serial_core.h>	22	#include <linux/serial_core.h>
		23	#include <linux/serial_s3c.h>
23	#include <linux/of.h>	24	#include <linux/of.h>
24	#include <linux/of_fdt.h>	25	#include <linux/of_fdt.h>
25	#include <linux/of_irq.h>	26	#include <linux/of_irq.h>
@@ -40,7 +41,6 @@
40		41
41	#include <plat/cpu.h>	42	#include <plat/cpu.h>
42	#include <plat/pm.h>	43	#include <plat/pm.h>
43	#include <plat/regs-serial.h>
44		44
45	#include "common.h"	45	#include "common.h"
46	#include "regs-pmu.h"	46	#include "regs-pmu.h"
@@ -404,8 +404,10 @@ static int __init exynos4_l2x0_cache_init(void)
404	if (ret)	404	if (ret)
405	return ret;	405	return ret;
406		406
407	l2x0_regs_phys = virt_to_phys(&l2x0_saved_regs);	407	if (IS_ENABLED(CONFIG_S5P_SLEEP)) {
408	clean_dcache_area(&l2x0_regs_phys, sizeof(unsigned long));	408	l2x0_regs_phys = virt_to_phys(&l2x0_saved_regs);
		409	clean_dcache_area(&l2x0_regs_phys, sizeof(unsigned long));
		410	}
409	return 0;	411	return 0;
410	}	412	}
411	early_initcall(exynos4_l2x0_cache_init);	413	early_initcall(exynos4_l2x0_cache_init);


diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index f57cb91f02aa..93d2decc112d 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c
@@ -14,6 +14,7 @@
14	#include <linux/cpu_pm.h>	14	#include <linux/cpu_pm.h>
15	#include <linux/io.h>	15	#include <linux/io.h>
16	#include <linux/export.h>	16	#include <linux/export.h>
		17	#include <linux/module.h>
17	#include <linux/time.h>	18	#include <linux/time.h>
18	#include <linux/platform_device.h>	19	#include <linux/platform_device.h>
19		20


diff --git a/arch/arm/mach-exynos/include/mach/timex.h b/arch/arm/mach-exynos/include/mach/timex.h deleted file mode 100644 index 6d138750a708..000000000000 --- a/arch/arm/mach-exynos/include/mach/timex.h +++ /dev/null
@@ -1,29 +0,0 @@
1	/* linux/arch/arm/mach-exynos4/include/mach/timex.h
2	*
3	* Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
4	* http://www.samsung.com
5	*
6	* Copyright (c) 2003-2010 Simtec Electronics
7	* Ben Dooks <ben@simtec.co.uk>
8	*
9	* Based on arch/arm/mach-s5p6442/include/mach/timex.h
10	*
11	* EXYNOS4 - time parameters
12	*
13	* This program is free software; you can redistribute it and/or modify
14	* it under the terms of the GNU General Public License version 2 as
15	* published by the Free Software Foundation.
16	*/
17
18	#ifndef __ASM_ARCH_TIMEX_H
19	#define __ASM_ARCH_TIMEX_H __FILE__
20
21	/* CLOCK_TICK_RATE needs to be evaluatable by the cpp, so making it
22	* a variable is useless. It seems as long as we make our timers an
23	* exact multiple of HZ, any value that makes a 1->1 correspondence
24	* for the time conversion functions to/from jiffies is acceptable.
25	*/
26
27	#define CLOCK_TICK_RATE 12000000
28
29	#endif /* __ASM_ARCH_TIMEX_H */


diff --git a/arch/arm/mach-exynos/include/mach/uncompress.h b/arch/arm/mach-exynos/include/mach/uncompress.h deleted file mode 100644 index 5d7ce36be46f..000000000000 --- a/arch/arm/mach-exynos/include/mach/uncompress.h +++ /dev/null
@@ -1,48 +0,0 @@
1	/*
2	* Copyright (c) 2010-2012 Samsung Electronics Co., Ltd.
3	* http://www.samsung.com
4	*
5	* EXYNOS - uncompress code
6	*
7	* This program is free software; you can redistribute it and/or modify
8	* it under the terms of the GNU General Public License version 2 as
9	* published by the Free Software Foundation.
10	*/
11
12	#ifndef __ASM_ARCH_UNCOMPRESS_H
13	#define __ASM_ARCH_UNCOMPRESS_H __FILE__
14
15	#include <asm/mach-types.h>
16
17	#include <mach/map.h>
18	#include <plat/uncompress.h>
19
20	static unsigned int __raw_readl(unsigned int ptr)
21	{
22	return ((volatile unsigned int )ptr);
23	}
24
25	static void arch_detect_cpu(void)
26	{
27	u32 chip_id = __raw_readl(EXYNOS_PA_CHIPID);
28
29	/*
30	* product_id is bits 31:12
31	* bits 23:20 describe the exynosX family
32	* bits 27:24 describe the exynosX family in exynos5420
33	*/
34	chip_id >>= 20;
35
36	if ((chip_id & 0x0f) == 0x5 \|\| (chip_id & 0xf0) == 0x50)
37	uart_base = (volatile u8 )EXYNOS5_PA_UART + (S3C_UART_OFFSET CONFIG_S3C_LOWLEVEL_UART_PORT);
38	else
39	uart_base = (volatile u8 )EXYNOS4_PA_UART + (S3C_UART_OFFSET CONFIG_S3C_LOWLEVEL_UART_PORT);
40
41	/*
42	* For preventing FIFO overrun or infinite loop of UART console,
43	* fifo_max should be the minimum fifo size of all of the UART channels
44	*/
45	fifo_mask = S5PV210_UFSTAT_TXMASK;
46	fifo_max = 15 << S5PV210_UFSTAT_TXSHIFT;
47	}
48	#endif /* __ASM_ARCH_UNCOMPRESS_H */


diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c index 8fd24882f0b1..fe6570ebbdde 100644 --- a/arch/arm/mach-exynos/pm_domains.c +++ b/arch/arm/mach-exynos/pm_domains.c
@@ -22,8 +22,6 @@
22	#include <linux/of_platform.h>	22	#include <linux/of_platform.h>
23	#include <linux/sched.h>	23	#include <linux/sched.h>
24		24
25	#include <plat/devs.h>
26
27	#include "regs-pmu.h"	25	#include "regs-pmu.h"
28		26
29	/*	27	/*