Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: Ensure struct sys_device is declared in plat/pm.h
ARM: S5PV310: Cleanup System MMU
ARM: S5PV310: Add support System MMU on SMDKV310
+17
-46
+1
arch/arm/mach-s5pv310/Kconfig
+1
arch/arm/mach-s5pv310/Kconfig
-2
arch/arm/mach-s5pv310/include/mach/map.h
-2
arch/arm/mach-s5pv310/include/mach/map.h
···
124
124
#define S5PV310_PA_SYSMMU_TV 0x12E20000
125
125
#define S5PV310_PA_SYSMMU_MFC_L 0x13620000
126
126
#define S5PV310_PA_SYSMMU_MFC_R 0x13630000
127
-
#define S5PV310_SYSMMU_TOTAL_IPNUM 16
128
-
#define S5P_SYSMMU_TOTAL_IPNUM S5PV310_SYSMMU_TOTAL_IPNUM
129
127
130
128
/* compatibiltiy defines. */
131
129
#define S3C_PA_UART S5PV310_PA_UART
+4
-1
arch/arm/mach-s5pv310/include/mach/sysmmu.h
+4
-1
arch/arm/mach-s5pv310/include/mach/sysmmu.h
···
13
13
#ifndef __ASM_ARM_ARCH_SYSMMU_H
14
14
#define __ASM_ARM_ARCH_SYSMMU_H __FILE__
15
15
16
+
#define S5PV310_SYSMMU_TOTAL_IPNUM 16
17
+
#define S5P_SYSMMU_TOTAL_IPNUM S5PV310_SYSMMU_TOTAL_IPNUM
18
+
16
19
enum s5pv310_sysmmu_ips {
17
20
SYSMMU_MDMA,
18
21
SYSMMU_SSS,
···
35
32
SYSMMU_MFC_R,
36
33
};
37
34
38
-
static char *sysmmu_ips_name[S5P_SYSMMU_TOTAL_IPNUM] = {
35
+
static char *sysmmu_ips_name[S5PV310_SYSMMU_TOTAL_IPNUM] = {
39
36
"SYSMMU_MDMA" ,
40
37
"SYSMMU_SSS" ,
41
38
"SYSMMU_FIMC0" ,
+8
-16
arch/arm/plat-s5p/Kconfig
+8
-16
arch/arm/plat-s5p/Kconfig
···
37
37
help
38
38
Common code for the GPIO interrupts (other than external interrupts.)
39
39
40
+
comment "System MMU"
41
+
42
+
config S5P_SYSTEM_MMU
43
+
bool "S5P SYSTEM MMU"
44
+
depends on ARCH_S5PV310
45
+
help
46
+
Say Y here if you want to enable System MMU
47
+
40
48
config S5P_DEV_FIMC0
41
49
bool
42
50
help
···
74
66
bool
75
67
help
76
68
Compile in platform device definitions for MIPI-CSIS channel 1
77
-
78
-
menuconfig S5P_SYSMMU
79
-
bool "SYSMMU support"
80
-
depends on ARCH_S5PV310
81
-
help
82
-
This is a System MMU driver for Samsung ARM based Soc.
83
-
84
-
if S5P_SYSMMU
85
-
86
-
config S5P_SYSMMU_DEBUG
87
-
bool "Enables debug messages"
88
-
depends on S5P_SYSMMU
89
-
help
90
-
This enables SYSMMU driver debug massages.
91
-
92
-
endif
+1
-1
arch/arm/plat-s5p/Makefile
+1
-1
arch/arm/plat-s5p/Makefile
···
19
19
obj-y += irq.o
20
20
obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o
21
21
obj-$(CONFIG_S5P_GPIO_INT) += irq-gpioint.o
22
+
obj-$(CONFIG_S5P_SYSTEM_MMU) += sysmmu.o
22
23
obj-$(CONFIG_PM) += pm.o
23
24
obj-$(CONFIG_PM) += irq-pm.o
24
25
···
31
30
obj-$(CONFIG_S5P_DEV_ONENAND) += dev-onenand.o
32
31
obj-$(CONFIG_S5P_DEV_CSIS0) += dev-csis0.o
33
32
obj-$(CONFIG_S5P_DEV_CSIS1) += dev-csis1.o
34
-
obj-$(CONFIG_S5P_SYSMMU) += sysmmu.o
-23
arch/arm/plat-s5p/include/plat/sysmmu.h
-23
arch/arm/plat-s5p/include/plat/sysmmu.h
···
1
-
/* linux/arch/arm/plat-s5p/include/plat/sysmmu.h
2
-
*
3
-
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
4
-
* http://www.samsung.com/
5
-
*
6
-
* Samsung sysmmu driver
7
-
*
8
-
* This program is free software; you can redistribute it and/or modify
9
-
* it under the terms of the GNU General Public License version 2 as
10
-
* published by the Free Software Foundation.
11
-
*/
12
-
13
-
#ifndef __ASM_PLAT_S5P_SYSMMU_H
14
-
#define __ASM_PLAT_S5P_SYSMMU_H __FILE__
15
-
16
-
/* debug macro */
17
-
#ifdef CONFIG_S5P_SYSMMU_DEBUG
18
-
#define sysmmu_debug(fmt, arg...) printk(KERN_INFO "[%s] " fmt, __func__, ## arg)
19
-
#else
20
-
#define sysmmu_debug(fmt, arg...) do { } while (0)
21
-
#endif
22
-
23
-
#endif /* __ASM_PLAT_S5P_SYSMMU_H */
+1
-3
arch/arm/plat-s5p/sysmmu.c
+1
-3
arch/arm/plat-s5p/sysmmu.c
···
16
16
#include <mach/regs-sysmmu.h>
17
17
#include <mach/sysmmu.h>
18
18
19
-
#include <plat/sysmmu.h>
20
-
21
19
struct sysmmu_controller s5p_sysmmu_cntlrs[S5P_SYSMMU_TOTAL_IPNUM];
22
20
23
21
void s5p_sysmmu_register(struct sysmmu_controller *sysmmuconp)
···
121
123
: "=r" (pg) : : "cc"); \
122
124
pg &= ~0x3fff;
123
125
124
-
sysmmu_debug("CP15 TTBR0 : 0x%x\n", pg);
126
+
printk(KERN_INFO "%s: CP15 TTBR0 : 0x%x\n", __func__, pg);
125
127
126
128
/* Set sysmmu page table base address */
127
129
__raw_writel(pg, sysmmuconp->regs + S5P_PT_BASE_ADDR);