diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 19:35:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 19:35:10 -0400 |
commit | 57d326169e878a1a37b2bccd1cf81f6809ee67b9 (patch) | |
tree | 86ed74ae4dc2beaebce1c67b8459f1873b777d3a /arch/mips/dec/platform.c | |
parent | 7b215de3d0abbc4f6daf2efd19e8809af0564490 (diff) | |
parent | 0244756edc4b98c129e92c7061d9f383708cf786 (diff) |
Merge branch 'akpm' (patches from Andrew Morton) into next
Merge more updates from Andrew Morton:
- Most of the rest of MM.
This includes "mark remap_file_pages syscall as deprecated" but the
actual "replace remap_file_pages syscall with emulation" is held
back. I guess we'll need to work out when to pull the trigger on
that one.
- various minor cleanups to obscure filesystems
- the drivers/rtc queue
- hfsplus updates
- ufs, hpfs, fatfs, affs, reiserfs
- Documentation/
- signals
- procfs
- cpu hotplug
- lib/idr.c
- rapidio
- sysctl
- ipc updates
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (171 commits)
ufs: sb mutex merge + mutex_destroy
powerpc: update comments for generic idle conversion
cris: update comments for generic idle conversion
idle: remove cpu_idle() forward declarations
nbd: zero from and len fields in NBD_CMD_DISCONNECT.
mm: convert some level-less printks to pr_*
MAINTAINERS: adi-buildroot-devel is moderated
MAINTAINERS: add linux-api for review of API/ABI changes
mm/kmemleak-test.c: use pr_fmt for logging
fs/dlm/debug_fs.c: replace seq_printf by seq_puts
fs/dlm/lockspace.c: convert simple_str to kstr
fs/dlm/config.c: convert simple_str to kstr
mm: mark remap_file_pages() syscall as deprecated
mm: memcontrol: remove unnecessary memcg argument from soft limit functions
mm: memcontrol: clean up memcg zoneinfo lookup
mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
mm/mempool.c: update the kmemleak stack trace for mempool allocations
lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
mm: introduce kmemleak_update_trace()
mm/kmemleak.c: use %u to print ->checksum
...
Diffstat (limited to 'arch/mips/dec/platform.c')
-rw-r--r-- | arch/mips/dec/platform.c | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/arch/mips/dec/platform.c b/arch/mips/dec/platform.c new file mode 100644 index 000000000000..c7ac86af847a --- /dev/null +++ b/arch/mips/dec/platform.c | |||
@@ -0,0 +1,44 @@ | |||
1 | /* | ||
2 | * DEC platform devices. | ||
3 | * | ||
4 | * Copyright (c) 2014 Maciej W. Rozycki | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the License, or (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #include <linux/ioport.h> | ||
13 | #include <linux/kernel.h> | ||
14 | #include <linux/mc146818rtc.h> | ||
15 | #include <linux/platform_device.h> | ||
16 | |||
17 | static struct resource dec_rtc_resources[] = { | ||
18 | { | ||
19 | .name = "rtc", | ||
20 | .flags = IORESOURCE_MEM, | ||
21 | }, | ||
22 | }; | ||
23 | |||
24 | static struct cmos_rtc_board_info dec_rtc_info = { | ||
25 | .flags = CMOS_RTC_FLAGS_NOFREQ, | ||
26 | .address_space = 64, | ||
27 | }; | ||
28 | |||
29 | static struct platform_device dec_rtc_device = { | ||
30 | .name = "rtc_cmos", | ||
31 | .id = PLATFORM_DEVID_NONE, | ||
32 | .dev.platform_data = &dec_rtc_info, | ||
33 | .resource = dec_rtc_resources, | ||
34 | .num_resources = ARRAY_SIZE(dec_rtc_resources), | ||
35 | }; | ||
36 | |||
37 | static int __init dec_add_devices(void) | ||
38 | { | ||
39 | dec_rtc_resources[0].start = RTC_PORT(0); | ||
40 | dec_rtc_resources[0].end = RTC_PORT(0) + dec_kn_slot_size - 1; | ||
41 | return platform_device_register(&dec_rtc_device); | ||
42 | } | ||
43 | |||
44 | device_initcall(dec_add_devices); | ||