Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32
* 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32:
unicore32: using generic-y format for one line asm-generic files
unicore32: change PERCPU to PERCPU_SECTION
unicore32: add KBUILD_DEFCONFIG with unicore32_defconfig (old debug_defconfig)
unicore32: change zImage physical address, though it's PIC codes
unicore32: move rtc-puv3.c to drivers/rtc directory
+79
-60
+1
MAINTAINERS
+1
MAINTAINERS
-4
arch/unicore32/Kconfig
-4
arch/unicore32/Kconfig
+2
-36
arch/unicore32/Makefile
+2
-36
arch/unicore32/Makefile
···
40
40
41
41
libs-y += arch/unicore32/lib/
42
42
43
-
ASM_GENERATED_DIR := $(srctree)/arch/unicore32/include/generated
44
-
LINUXINCLUDE += -I$(ASM_GENERATED_DIR)
45
-
46
-
ASM_GENERIC_HEADERS := atomic.h auxvec.h
47
-
ASM_GENERIC_HEADERS += bitsperlong.h bug.h bugs.h
48
-
ASM_GENERIC_HEADERS += cputime.h current.h
49
-
ASM_GENERIC_HEADERS += device.h div64.h
50
-
ASM_GENERIC_HEADERS += emergency-restart.h errno.h
51
-
ASM_GENERIC_HEADERS += fb.h fcntl.h ftrace.h futex.h
52
-
ASM_GENERIC_HEADERS += hardirq.h hw_irq.h
53
-
ASM_GENERIC_HEADERS += ioctl.h ioctls.h ipcbuf.h irq_regs.h
54
-
ASM_GENERIC_HEADERS += kdebug.h kmap_types.h
55
-
ASM_GENERIC_HEADERS += local.h
56
-
ASM_GENERIC_HEADERS += mman.h module.h msgbuf.h
57
-
ASM_GENERIC_HEADERS += param.h parport.h percpu.h poll.h posix_types.h
58
-
ASM_GENERIC_HEADERS += resource.h
59
-
ASM_GENERIC_HEADERS += scatterlist.h sections.h segment.h sembuf.h serial.h
60
-
ASM_GENERIC_HEADERS += setup.h shmbuf.h shmparam.h
61
-
ASM_GENERIC_HEADERS += siginfo.h signal.h sizes.h
62
-
ASM_GENERIC_HEADERS += socket.h sockios.h stat.h statfs.h swab.h syscalls.h
63
-
ASM_GENERIC_HEADERS += termbits.h termios.h topology.h types.h
64
-
ASM_GENERIC_HEADERS += ucontext.h unaligned.h user.h
65
-
ASM_GENERIC_HEADERS += vga.h
66
-
ASM_GENERIC_HEADERS += xor.h
67
-
68
-
archprepare:
69
-
ifneq ($(ASM_GENERATED_DIR), $(wildcard $(ASM_GENERATED_DIR)))
70
-
$(Q)mkdir -p $(ASM_GENERATED_DIR)/asm
71
-
$(Q)$(foreach a, $(ASM_GENERIC_HEADERS), \
72
-
echo '#include <asm-generic/$a>' \
73
-
> $(ASM_GENERATED_DIR)/asm/$a; )
74
-
endif
75
-
76
43
boot := arch/unicore32/boot
77
44
78
-
# Default target when executing plain make
45
+
# Default defconfig and target when executing plain make
46
+
KBUILD_DEFCONFIG := $(ARCH)_defconfig
79
47
KBUILD_IMAGE := zImage
80
48
81
49
all: $(KBUILD_IMAGE)
82
50
83
51
zImage Image uImage: vmlinux
84
52
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
85
-
86
-
MRPROPER_DIRS += $(ASM_GENERATED_DIR)
87
53
88
54
archclean:
89
55
$(Q)$(MAKE) $(clean)=$(boot)
+1
-1
arch/unicore32/boot/compressed/Makefile
+1
-1
arch/unicore32/boot/compressed/Makefile
···
59
59
# We now have a PIC decompressor implementation. Decompressors running
60
60
# from RAM should not define ZTEXTADDR. Decompressors running directly
61
61
# from ROM or Flash must define ZTEXTADDR (preferably via the config)
62
-
ZTEXTADDR := 0
62
+
ZTEXTADDR := 0x03000000
63
63
ZBSSADDR := ALIGN(4)
64
64
65
65
SEDFLAGS_lds = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
+4
-4
arch/unicore32/configs/debug_defconfig
arch/unicore32/configs/unicore32_defconfig
+4
-4
arch/unicore32/configs/debug_defconfig
arch/unicore32/configs/unicore32_defconfig
···
1
1
### General setup
2
2
CONFIG_EXPERIMENTAL=y
3
-
CONFIG_LOCALVERSION="-debug"
3
+
CONFIG_LOCALVERSION="-unicore32"
4
4
CONFIG_SWAP=y
5
5
CONFIG_SYSVIPC=y
6
6
CONFIG_POSIX_MQUEUE=y
···
64
64
CONFIG_I2C_EEPROM_AT24=n
65
65
CONFIG_LCD_BACKLIGHT=n
66
66
67
-
CONFIG_PUV3_RTC=y
68
67
CONFIG_PUV3_UMAL=y
69
68
CONFIG_PUV3_MUSB=n
70
69
CONFIG_PUV3_AC97=n
···
166
167
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
167
168
168
169
# Real Time Clock
169
-
CONFIG_RTC_LIB=m
170
-
CONFIG_RTC_CLASS=m
170
+
CONFIG_RTC_LIB=y
171
+
CONFIG_RTC_CLASS=y
172
+
CONFIG_RTC_DRV_PUV3=y
171
173
172
174
### File systems
173
175
CONFIG_EXT2_FS=m
+59
arch/unicore32/include/asm/Kbuild
+59
arch/unicore32/include/asm/Kbuild
···
1
1
include include/asm-generic/Kbuild.asm
2
2
3
+
generic-y += atomic.h
4
+
generic-y += auxvec.h
5
+
generic-y += bitsperlong.h
6
+
generic-y += bug.h
7
+
generic-y += bugs.h
8
+
generic-y += cputime.h
9
+
generic-y += current.h
10
+
generic-y += device.h
11
+
generic-y += div64.h
12
+
generic-y += emergency-restart.h
13
+
generic-y += errno.h
14
+
generic-y += fb.h
15
+
generic-y += fcntl.h
16
+
generic-y += ftrace.h
17
+
generic-y += futex.h
18
+
generic-y += hardirq.h
19
+
generic-y += hw_irq.h
20
+
generic-y += ioctl.h
21
+
generic-y += ioctls.h
22
+
generic-y += ipcbuf.h
23
+
generic-y += irq_regs.h
24
+
generic-y += kdebug.h
25
+
generic-y += kmap_types.h
26
+
generic-y += local.h
27
+
generic-y += mman.h
28
+
generic-y += module.h
29
+
generic-y += msgbuf.h
30
+
generic-y += param.h
31
+
generic-y += parport.h
32
+
generic-y += percpu.h
33
+
generic-y += poll.h
34
+
generic-y += posix_types.h
35
+
generic-y += resource.h
36
+
generic-y += scatterlist.h
37
+
generic-y += sections.h
38
+
generic-y += segment.h
39
+
generic-y += sembuf.h
40
+
generic-y += serial.h
41
+
generic-y += setup.h
42
+
generic-y += shmbuf.h
43
+
generic-y += shmparam.h
44
+
generic-y += siginfo.h
45
+
generic-y += signal.h
46
+
generic-y += sizes.h
47
+
generic-y += socket.h
48
+
generic-y += sockios.h
49
+
generic-y += stat.h
50
+
generic-y += statfs.h
51
+
generic-y += swab.h
52
+
generic-y += syscalls.h
53
+
generic-y += termbits.h
54
+
generic-y += termios.h
55
+
generic-y += topology.h
56
+
generic-y += types.h
57
+
generic-y += ucontext.h
58
+
generic-y += unaligned.h
59
+
generic-y += user.h
60
+
generic-y += vga.h
61
+
generic-y += xor.h
-1
arch/unicore32/kernel/Makefile
-1
arch/unicore32/kernel/Makefile
+1
-13
arch/unicore32/kernel/rtc.c
drivers/rtc/rtc-puv3.c
+1
-13
arch/unicore32/kernel/rtc.c
drivers/rtc/rtc-puv3.c
···
1
1
/*
2
-
* linux/arch/unicore32/kernel/rtc.c
3
-
*
4
-
* Code specific to PKUnity SoC and UniCore ISA
2
+
* RTC driver code specific to PKUnity SoC and UniCore ISA
5
3
*
6
4
* Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
7
5
* Copyright (C) 2001-2010 Guan Xuetao
···
34
36
static DEFINE_SPINLOCK(puv3_rtc_pie_lock);
35
37
36
38
/* IRQ Handlers */
37
-
38
39
static irqreturn_t puv3_rtc_alarmirq(int irq, void *id)
39
40
{
40
41
struct rtc_device *rdev = id;
···
86
89
}
87
90
88
91
/* Time read/write */
89
-
90
92
static int puv3_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
91
93
{
92
94
rtc_time_to_tm(readl(RTC_RCNR), rtc_tm);
···
192
196
struct rtc_device *rtc_dev = platform_get_drvdata(pdev);
193
197
194
198
/* do not clear AIE here, it may be needed for wake */
195
-
196
199
puv3_rtc_setpie(dev, 0);
197
200
free_irq(puv3_rtc_alarmno, rtc_dev);
198
201
free_irq(puv3_rtc_tickno, rtc_dev);
···
213
218
writel(readl(RTC_RTSR) & ~RTC_RTSR_HZE, RTC_RTSR);
214
219
} else {
215
220
/* re-enable the device, and check it is ok */
216
-
217
221
if ((readl(RTC_RTSR) & RTC_RTSR_HZE) == 0) {
218
222
dev_info(&pdev->dev, "rtc disabled, re-enabling\n");
219
223
writel(readl(RTC_RTSR) | RTC_RTSR_HZE, RTC_RTSR);
···
245
251
pr_debug("%s: probe=%p\n", __func__, pdev);
246
252
247
253
/* find the IRQs */
248
-
249
254
puv3_rtc_tickno = platform_get_irq(pdev, 1);
250
255
if (puv3_rtc_tickno < 0) {
251
256
dev_err(&pdev->dev, "no irq for rtc tick\n");
···
261
268
puv3_rtc_tickno, puv3_rtc_alarmno);
262
269
263
270
/* get the memory region */
264
-
265
271
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
266
272
if (res == NULL) {
267
273
dev_err(&pdev->dev, "failed to get memory region resource\n");
···
280
288
puv3_rtc_enable(pdev, 1);
281
289
282
290
/* register RTC and exit */
283
-
284
291
rtc = rtc_device_register("pkunity", &pdev->dev, &puv3_rtcops,
285
292
THIS_MODULE);
286
293
···
305
314
}
306
315
307
316
#ifdef CONFIG_PM
308
-
309
-
/* RTC Power management control */
310
317
311
318
static int ticnt_save;
312
319
···
357
368
MODULE_DESCRIPTION("RTC Driver for the PKUnity v3 chip");
358
369
MODULE_AUTHOR("Hu Dongliang");
359
370
MODULE_LICENSE("GPL v2");
360
-
+1
-1
arch/unicore32/kernel/vmlinux.lds.S
+1
-1
arch/unicore32/kernel/vmlinux.lds.S
+9
drivers/rtc/Kconfig
+9
drivers/rtc/Kconfig
···
1051
1051
Enable support for the Linux driver side of the Tilera
1052
1052
hypervisor's real-time clock interface.
1053
1053
1054
+
config RTC_DRV_PUV3
1055
+
tristate "PKUnity v3 RTC support"
1056
+
depends on ARCH_PUV3
1057
+
help
1058
+
This enables support for the RTC in the PKUnity-v3 SoCs.
1059
+
1060
+
This drive can also be built as a module. If so, the module
1061
+
will be called rtc-puv3.
1062
+
1054
1063
endif # RTC_CLASS
+1
drivers/rtc/Makefile
+1
drivers/rtc/Makefile
···
78
78
obj-$(CONFIG_RTC_DRV_PL030) += rtc-pl030.o
79
79
obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o
80
80
obj-$(CONFIG_RTC_DRV_PS3) += rtc-ps3.o
81
+
obj-$(CONFIG_RTC_DRV_PUV3) += rtc-puv3.o
81
82
obj-$(CONFIG_RTC_DRV_PXA) += rtc-pxa.o
82
83
obj-$(CONFIG_RTC_DRV_R9701) += rtc-r9701.o
83
84
obj-$(CONFIG_RTC_DRV_RP5C01) += rtc-rp5c01.o