mirror of
https://github.com/torvalds/linux.git
synced 2024-12-21 10:31:54 +00:00
d2033f2c1d
This contains cleanups as preparation for other branches adding new features, we pulled 16 branches for 9 platforms into this one. Most notable here is the removal of support for ATAGS based OMAP4 systems. Since all OMAP4 machines are fully functional with DT based booting in 3.10, we can remove a lot of code here. Also noteworthy is Maxime Ripard's cleanup of the machine descriptors, which means we need no machine descriptors in a lot more cases and can boot additional machines by just having the respective device drivers enabled. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUdLnoGCrR//JCVInAQL5bw/+OZeE60sBJxgDAf9XEYls9t5cnLY963uE izgsyLKwwAi21Xbg/0vgGZLbpdfyd2IJa+bWXhxVTLFI43Hb0D2x1hYyMzy/fFWj gmqQ4dLYawYj+1sOirTPWDquR31mavofmMF2HVk23S6NWmNIjPk1+7Wgd46Y4vNX 7T6j4cg9HPrxQ37a6ucOuEX6+rqmFe2Q+v7qcsXkwxkVxgIC8V4MgHJmt8gGMRvB HHrY1kPBHlMJm07fLngilAfpa8G91fmgKxSfugeClyKotj7lHxno/lh/+oxMGvaJ J9memdfbYISLSvDLeH6Rib/zaC7VnSij9QtZmFtToiJ6qVVZiLFd2dpP+ccpaMGb YEvm58ayajAvb0wZMueoeKs9yW0UWCdXdkzKbhuWrwmPDjKSb9f9t1u3ons8vl+2 dOwlTex9/ijsxu1qTHMm4/EVg+NR/AwVVwiBRG9sYnfxSHkgXxPW5TF7T4d1H71v WZkXWsJKIUDQgk+2nnE4J9TvFlPyaV09yFYyiY/+DWAs9DUus8cf37nt2Wz6H1l6 THQcQDcZsPLZsSIEdzUrchdLKDZHzhkb3i8pae7TC6CySiOzj/yX2zbh9Ot538WG 2C7qzAVtyMVuAdFh0caIu0iVXqjsnJLAZGImLZQySR00aq34uXh7MsHepnhAI10q EQ1vILi4mU4= =XDJs -----END PGP SIGNATURE----- Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC cleanups from Arnd Bergmann: "This contains cleanups as preparation for other branches adding new features, we pulled 16 branches for 9 platforms into this one. Most notable here is the removal of support for ATAGS based OMAP4 systems. Since all OMAP4 machines are fully functional with DT based booting in 3.10, we can remove a lot of code here. Also noteworthy is Maxime Ripard's cleanup of the machine descriptors, which means we need no machine descriptors in a lot more cases and can boot additional machines by just having the respective device drivers enabled." * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (76 commits) ARM: picoxcell: remove .nr_irqs reference ARM: s5p64x0: avoid build warning for uncompress.h ARM: SAMSUNG: Remove unused plat/regs-watchdog.h header ARM: SAMSUNG: Remove legacy watchdog reset code ARM: SAMSUNG: Let platforms use the new watchdog reset driver ARM: SAMSUNG: Add watchdog reset driver ARM: SAMSUNG: Use local definitions of watchdog registers watchdog: s3c2410_wdt: Use local register definitions ARM: S5P64X0: Use common uncompress.h part for plat-samsung ARM: SAMSUNG: Consolidate uncompress subroutine ARM: at91: drop rm9200dk board support ARM: dts: msm: Fix merge resolution ARM: OMAP1: Remove dma.h ARM: OMAP1: Remove legacy irda.h and irda setup from board files ARM: OMAP1: Remove duplicated DMA channel definitions ARM: OMAP1: Remove McBSP DMA channel definitions ARM: OMAP2+: Remove dma.h ARM: OMAP2+: hwmod: Remove remaining DMA channel definitions ARM: OMAP2+: Remove duplicated DMA channel definitions ARM: OMAP2+: Remove AES crypto device DMA channel definitions ...
88 lines
2.0 KiB
C
88 lines
2.0 KiB
C
/*
|
|
* Defines machines for CSR SiRFprimaII
|
|
*
|
|
* Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
|
|
*
|
|
* Licensed under GPLv2 or later.
|
|
*/
|
|
|
|
#include <linux/clocksource.h>
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <asm/sizes.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_platform.h>
|
|
#include "common.h"
|
|
|
|
void __init sirfsoc_init_late(void)
|
|
{
|
|
sirfsoc_pm_init();
|
|
}
|
|
|
|
static __init void sirfsoc_init_time(void)
|
|
{
|
|
/* initialize clocking early, we want to set the OS timer */
|
|
sirfsoc_of_clk_init();
|
|
clocksource_of_init();
|
|
}
|
|
|
|
static __init void sirfsoc_map_io(void)
|
|
{
|
|
sirfsoc_map_lluart();
|
|
sirfsoc_map_scu();
|
|
}
|
|
|
|
#ifdef CONFIG_ARCH_ATLAS6
|
|
static const char *atlas6_dt_match[] __initdata = {
|
|
"sirf,atlas6",
|
|
NULL
|
|
};
|
|
|
|
DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")
|
|
/* Maintainer: Barry Song <baohua.song@csr.com> */
|
|
.nr_irqs = 128,
|
|
.map_io = sirfsoc_map_io,
|
|
.init_time = sirfsoc_init_time,
|
|
.init_late = sirfsoc_init_late,
|
|
.dt_compat = atlas6_dt_match,
|
|
.restart = sirfsoc_restart,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_PRIMA2
|
|
static const char *prima2_dt_match[] __initdata = {
|
|
"sirf,prima2",
|
|
NULL
|
|
};
|
|
|
|
DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
|
|
/* Maintainer: Barry Song <baohua.song@csr.com> */
|
|
.nr_irqs = 128,
|
|
.map_io = sirfsoc_map_io,
|
|
.init_time = sirfsoc_init_time,
|
|
.dma_zone_size = SZ_256M,
|
|
.init_late = sirfsoc_init_late,
|
|
.dt_compat = prima2_dt_match,
|
|
.restart = sirfsoc_restart,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_MARCO
|
|
static const char *marco_dt_match[] __initdata = {
|
|
"sirf,marco",
|
|
NULL
|
|
};
|
|
|
|
DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)")
|
|
/* Maintainer: Barry Song <baohua.song@csr.com> */
|
|
.smp = smp_ops(sirfsoc_smp_ops),
|
|
.map_io = sirfsoc_map_io,
|
|
.init_time = sirfsoc_init_time,
|
|
.init_late = sirfsoc_init_late,
|
|
.dt_compat = marco_dt_match,
|
|
.restart = sirfsoc_restart,
|
|
MACHINE_END
|
|
#endif
|