mirror of
https://github.com/torvalds/linux.git
synced 2024-12-21 02:21:36 +00:00
0195c00244
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIVAwUAT3NKzROxKuMESys7AQKElw/+JyDxJSlj+g+nymkx8IVVuU8CsEwNLgRk
8KEnRfLhGtkXFLSJYWO6jzGo16F8Uqli1PdMFte/wagSv0285/HZaKlkkBVHdJ/m
u40oSjgT013bBh6MQ0Oaf8pFezFUiQB5zPOA9QGaLVGDLXCmgqUgd7exaD5wRIwB
ZmyItjZeAVnDfk1R+ZiNYytHAi8A5wSB+eFDCIQYgyulA1Igd1UnRtx+dRKbvc/m
rWQ6KWbZHIdvP1ksd8wHHkrlUD2pEeJ8glJLsZUhMm/5oMf/8RmOCvmo8rvE/qwl
eDQ1h4cGYlfjobxXZMHqAN9m7Jg2bI946HZjdb7/7oCeO6VW3FwPZ/Ic75p+wp45
HXJTItufERYk6QxShiOKvA+QexnYwY0IT5oRP4DrhdVB/X9cl2MoaZHC+RbYLQy+
/5VNZKi38iK4F9AbFamS7kd0i5QszA/ZzEzKZ6VMuOp3W/fagpn4ZJT1LIA3m4A9
Q0cj24mqeyCfjysu0TMbPtaN+Yjeu1o1OFRvM8XffbZsp5bNzuTDEvviJ2NXw4vK
4qUHulhYSEWcu9YgAZXvEWDEM78FXCkg2v/CrZXH5tyc95kUkMPcgG+QZBB5wElR
FaOKpiC/BuNIGEf02IZQ4nfDxE90QwnDeoYeV+FvNj9UEOopJ5z5bMPoTHxm4cCD
NypQthI85pc=
=G9mT
-----END PGP SIGNATURE-----
Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system
Pull "Disintegrate and delete asm/system.h" from David Howells:
"Here are a bunch of patches to disintegrate asm/system.h into a set of
separate bits to relieve the problem of circular inclusion
dependencies.
I've built all the working defconfigs from all the arches that I can
and made sure that they don't break.
The reason for these patches is that I recently encountered a circular
dependency problem that came about when I produced some patches to
optimise get_order() by rewriting it to use ilog2().
This uses bitops - and on the SH arch asm/bitops.h drags in
asm-generic/get_order.h by a circuituous route involving asm/system.h.
The main difficulty seems to be asm/system.h. It holds a number of
low level bits with no/few dependencies that are commonly used (eg.
memory barriers) and a number of bits with more dependencies that
aren't used in many places (eg. switch_to()).
These patches break asm/system.h up into the following core pieces:
(1) asm/barrier.h
Move memory barriers here. This already done for MIPS and Alpha.
(2) asm/switch_to.h
Move switch_to() and related stuff here.
(3) asm/exec.h
Move arch_align_stack() here. Other process execution related bits
could perhaps go here from asm/processor.h.
(4) asm/cmpxchg.h
Move xchg() and cmpxchg() here as they're full word atomic ops and
frequently used by atomic_xchg() and atomic_cmpxchg().
(5) asm/bug.h
Move die() and related bits.
(6) asm/auxvec.h
Move AT_VECTOR_SIZE_ARCH here.
Other arch headers are created as needed on a per-arch basis."
Fixed up some conflicts from other header file cleanups and moving code
around that has happened in the meantime, so David's testing is somewhat
weakened by that. We'll find out anything that got broken and fix it..
* tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits)
Delete all instances of asm/system.h
Remove all #inclusions of asm/system.h
Add #includes needed to permit the removal of asm/system.h
Move all declarations of free_initmem() to linux/mm.h
Disintegrate asm/system.h for OpenRISC
Split arch_align_stack() out from asm-generic/system.h
Split the switch_to() wrapper out of asm-generic/system.h
Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h
Create asm-generic/barrier.h
Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h
Disintegrate asm/system.h for Xtensa
Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]
Disintegrate asm/system.h for Tile
Disintegrate asm/system.h for Sparc
Disintegrate asm/system.h for SH
Disintegrate asm/system.h for Score
Disintegrate asm/system.h for S390
Disintegrate asm/system.h for PowerPC
Disintegrate asm/system.h for PA-RISC
Disintegrate asm/system.h for MN10300
...
150 lines
3.9 KiB
C
150 lines
3.9 KiB
C
/* linux/arch/arm/mach-s3c2416/s3c2416.c
|
|
*
|
|
* Copyright (c) 2009 Yauhen Kharuzhy <jekhor@gmail.com>,
|
|
* as part of OpenInkpot project
|
|
* Copyright (c) 2009 Promwad Innovation Company
|
|
* Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
|
|
*
|
|
* Samsung S3C2416 Mobile CPU support
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/types.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/list.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/init.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/serial_core.h>
|
|
#include <linux/device.h>
|
|
#include <linux/syscore_ops.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/io.h>
|
|
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/irq.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/proc-fns.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/system_misc.h>
|
|
|
|
#include <mach/regs-s3c2443-clock.h>
|
|
|
|
#include <plat/gpio-core.h>
|
|
#include <plat/gpio-cfg.h>
|
|
#include <plat/gpio-cfg-helpers.h>
|
|
#include <plat/s3c2416.h>
|
|
#include <plat/devs.h>
|
|
#include <plat/cpu.h>
|
|
#include <plat/sdhci.h>
|
|
#include <plat/pm.h>
|
|
|
|
#include <plat/iic-core.h>
|
|
#include <plat/fb-core.h>
|
|
#include <plat/nand-core.h>
|
|
#include <plat/adc-core.h>
|
|
#include <plat/rtc-core.h>
|
|
|
|
static struct map_desc s3c2416_iodesc[] __initdata = {
|
|
IODESC_ENT(WATCHDOG),
|
|
IODESC_ENT(CLKPWR),
|
|
IODESC_ENT(TIMER),
|
|
};
|
|
|
|
struct bus_type s3c2416_subsys = {
|
|
.name = "s3c2416-core",
|
|
.dev_name = "s3c2416-core",
|
|
};
|
|
|
|
static struct device s3c2416_dev = {
|
|
.bus = &s3c2416_subsys,
|
|
};
|
|
|
|
void s3c2416_restart(char mode, const char *cmd)
|
|
{
|
|
if (mode == 's')
|
|
soft_restart(0);
|
|
|
|
__raw_writel(S3C2443_SWRST_RESET, S3C2443_SWRST);
|
|
}
|
|
|
|
int __init s3c2416_init(void)
|
|
{
|
|
printk(KERN_INFO "S3C2416: Initializing architecture\n");
|
|
|
|
/* change WDT IRQ number */
|
|
s3c_device_wdt.resource[1].start = IRQ_S3C2443_WDT;
|
|
s3c_device_wdt.resource[1].end = IRQ_S3C2443_WDT;
|
|
|
|
/* the i2c devices are directly compatible with s3c2440 */
|
|
s3c_i2c0_setname("s3c2440-i2c");
|
|
s3c_i2c1_setname("s3c2440-i2c");
|
|
|
|
s3c_fb_setname("s3c2443-fb");
|
|
|
|
s3c_adc_setname("s3c2416-adc");
|
|
s3c_rtc_setname("s3c2416-rtc");
|
|
|
|
#ifdef CONFIG_PM
|
|
register_syscore_ops(&s3c2416_pm_syscore_ops);
|
|
#endif
|
|
register_syscore_ops(&s3c24xx_irq_syscore_ops);
|
|
|
|
return device_register(&s3c2416_dev);
|
|
}
|
|
|
|
void __init s3c2416_init_uarts(struct s3c2410_uartcfg *cfg, int no)
|
|
{
|
|
s3c24xx_init_uartdevs("s3c2440-uart", s3c2410_uart_resources, cfg, no);
|
|
|
|
s3c_nand_setname("s3c2412-nand");
|
|
}
|
|
|
|
/* s3c2416_map_io
|
|
*
|
|
* register the standard cpu IO areas, and any passed in from the
|
|
* machine specific initialisation.
|
|
*/
|
|
|
|
void __init s3c2416_map_io(void)
|
|
{
|
|
s3c24xx_gpiocfg_default.set_pull = samsung_gpio_setpull_updown;
|
|
s3c24xx_gpiocfg_default.get_pull = samsung_gpio_getpull_updown;
|
|
|
|
/* initialize device information early */
|
|
s3c2416_default_sdhci0();
|
|
s3c2416_default_sdhci1();
|
|
|
|
iotable_init(s3c2416_iodesc, ARRAY_SIZE(s3c2416_iodesc));
|
|
}
|
|
|
|
/* need to register the subsystem before we actually register the device, and
|
|
* we also need to ensure that it has been initialised before any of the
|
|
* drivers even try to use it (even if not on an s3c2416 based system)
|
|
* as a driver which may support both 2443 and 2440 may try and use it.
|
|
*/
|
|
|
|
static int __init s3c2416_core_init(void)
|
|
{
|
|
return subsys_system_register(&s3c2416_subsys, NULL);
|
|
}
|
|
|
|
core_initcall(s3c2416_core_init);
|