dfc1ebe766
Both platforms had some initial device tree support, but this adds much more to actually make it usable. This is where the really nasty conflicts in the samsung platform start, due to some files getting moved around and combined in the 'restart' branch that has already gone into mainline through Russell's tree. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIVAwUATwtUpWCrR//JCVInAQI7bhAA1Q8MXyQ3EwLKMWX2p0vmbb29Nugoq0Y3 u9pBlCqiz0zw/jccPWASCgVgMVYguZLuhvMRCO8Q1D4l3ljcTt7qhtN6lBAESz2N OTTaNU2T84Um2Watm7VAQrnLcJMhxd/wFV06lmE62SgxwIVzyqxo4sr3KB3S5Qyj W3q5wRLuc5pC293HkWSNpLj3nfcKFF2oHOFpEAC5AS/C5S38Eu/T9y4FSUGvoTq4 u7xlZT11uZUTRfvkRQUTOXkh9I0Fk0JuwUpUkqhgvM4jD0Ehs60/702CX4mPAoVd +BFUI23QNSof6O04rUxEzOSt1ZNg4Le+pQZ3vUcOvi539Npq+VgzDU+yo7uzNtYv c22VJihvS9GY2s7ynmmCE6Rgw17B3VOMMy1cBbQEET2V2GwgU9lQLx2eR/bUrOGq ewcTCqgFFWVugsGsn0wM0BiPZAJ+FddXon3w3X09BM0v5a6O6q0aUAQiJnGqDgUE ZLHhYRoL87r2TU6J+3iutK3sDHQrvHkGAZdXX3H5hVWdfLWqnwGgLjT/NpBeUaWc g6nut7pFgVDCD4q4JUCa99XykgKGWRtSHAuHmJQsdZ24PzpXmse3etVZTCYwr7t6 BM3zrozoecQbGTRwZKGb9poOKd7g7xJ7125770GqYgTeX+BnBcA2lIEDAkEKsLBR GaxJggw32Q0= =XY2N -----END PGP SIGNATURE----- Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Device tree conversions for samsung and tegra Both platforms had some initial device tree support, but this adds much more to actually make it usable. * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits) ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN ARM: EXYNOS: Add Exynos4 device tree enabled board file rtc: rtc-s3c: Add device tree support input: samsung-keypad: Add device tree support ARM: S5PV210: Modify platform data for pl330 driver ARM: S5PC100: Modify platform data for pl330 driver ARM: S5P64x0: Modify platform data for pl330 driver ARM: EXYNOS: Add a alias for pdma clocks ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers DMA: PL330: Add device tree support ARM: EXYNOS: Modify platform data for pl330 driver DMA: PL330: Infer transfer direction from transfer request instead of platform data DMA: PL330: move filter function into driver serial: samsung: Fix build for non-Exynos4210 devices serial: samsung: add device tree support serial: samsung: merge probe() function from all SoC specific extensions serial: samsung: merge all SoC specific port reset functions ARM: SAMSUNG: register uart clocks to clock lookup list serial: samsung: remove all uses of get_clksrc and set_clksrc ... Fix up fairly trivial conflicts in arch/arm/mach-s3c2440/clock.c and drivers/tty/serial/Kconfig both due to just adding code close to changes.
206 lines
4.7 KiB
C
206 lines
4.7 KiB
C
/* linux/arch/arm/mach-s3c2410/s3c2410.c
|
|
*
|
|
* Copyright (c) 2003-2005 Simtec Electronics
|
|
* Ben Dooks <ben@simtec.co.uk>
|
|
*
|
|
* http://www.simtec.co.uk/products/EB2410ITX/
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#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/clk.h>
|
|
#include <linux/device.h>
|
|
#include <linux/syscore_ops.h>
|
|
#include <linux/serial_core.h>
|
|
#include <linux/platform_device.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/irq.h>
|
|
|
|
#include <plat/cpu-freq.h>
|
|
|
|
#include <mach/regs-clock.h>
|
|
#include <plat/regs-serial.h>
|
|
|
|
#include <plat/s3c2410.h>
|
|
#include <plat/cpu.h>
|
|
#include <plat/devs.h>
|
|
#include <plat/clock.h>
|
|
#include <plat/pll.h>
|
|
#include <plat/pm.h>
|
|
#include <plat/watchdog-reset.h>
|
|
|
|
#include <plat/gpio-core.h>
|
|
#include <plat/gpio-cfg.h>
|
|
#include <plat/gpio-cfg-helpers.h>
|
|
|
|
/* Initial IO mappings */
|
|
|
|
static struct map_desc s3c2410_iodesc[] __initdata = {
|
|
IODESC_ENT(CLKPWR),
|
|
IODESC_ENT(TIMER),
|
|
IODESC_ENT(WATCHDOG),
|
|
};
|
|
|
|
/* our uart devices */
|
|
|
|
/* uart registration process */
|
|
|
|
void __init s3c2410_init_uarts(struct s3c2410_uartcfg *cfg, int no)
|
|
{
|
|
s3c24xx_init_uartdevs("s3c2410-uart", s3c2410_uart_resources, cfg, no);
|
|
}
|
|
|
|
/* s3c2410_map_io
|
|
*
|
|
* register the standard cpu IO areas, and any passed in from the
|
|
* machine specific initialisation.
|
|
*/
|
|
|
|
void __init s3c2410_map_io(void)
|
|
{
|
|
s3c24xx_gpiocfg_default.set_pull = s3c24xx_gpio_setpull_1up;
|
|
s3c24xx_gpiocfg_default.get_pull = s3c24xx_gpio_getpull_1up;
|
|
|
|
iotable_init(s3c2410_iodesc, ARRAY_SIZE(s3c2410_iodesc));
|
|
}
|
|
|
|
void __init_or_cpufreq s3c2410_setup_clocks(void)
|
|
{
|
|
struct clk *xtal_clk;
|
|
unsigned long tmp;
|
|
unsigned long xtal;
|
|
unsigned long fclk;
|
|
unsigned long hclk;
|
|
unsigned long pclk;
|
|
|
|
xtal_clk = clk_get(NULL, "xtal");
|
|
xtal = clk_get_rate(xtal_clk);
|
|
clk_put(xtal_clk);
|
|
|
|
/* now we've got our machine bits initialised, work out what
|
|
* clocks we've got */
|
|
|
|
fclk = s3c24xx_get_pll(__raw_readl(S3C2410_MPLLCON), xtal);
|
|
|
|
tmp = __raw_readl(S3C2410_CLKDIVN);
|
|
|
|
/* work out clock scalings */
|
|
|
|
hclk = fclk / ((tmp & S3C2410_CLKDIVN_HDIVN) ? 2 : 1);
|
|
pclk = hclk / ((tmp & S3C2410_CLKDIVN_PDIVN) ? 2 : 1);
|
|
|
|
/* print brieft summary of clocks, etc */
|
|
|
|
printk("S3C2410: core %ld.%03ld MHz, memory %ld.%03ld MHz, peripheral %ld.%03ld MHz\n",
|
|
print_mhz(fclk), print_mhz(hclk), print_mhz(pclk));
|
|
|
|
/* initialise the clocks here, to allow other things like the
|
|
* console to use them
|
|
*/
|
|
|
|
s3c24xx_setup_clocks(fclk, hclk, pclk);
|
|
}
|
|
|
|
/* fake ARMCLK for use with cpufreq, etc. */
|
|
|
|
static struct clk s3c2410_armclk = {
|
|
.name = "armclk",
|
|
.parent = &clk_f,
|
|
.id = -1,
|
|
};
|
|
|
|
static struct clk_lookup s3c2410_clk_lookup[] = {
|
|
CLKDEV_INIT(NULL, "clk_uart_baud0", &clk_p),
|
|
CLKDEV_INIT(NULL, "clk_uart_baud1", &s3c24xx_uclk),
|
|
};
|
|
|
|
void __init s3c2410_init_clocks(int xtal)
|
|
{
|
|
s3c24xx_register_baseclocks(xtal);
|
|
s3c2410_setup_clocks();
|
|
s3c2410_baseclk_add();
|
|
s3c24xx_register_clock(&s3c2410_armclk);
|
|
clkdev_add_table(s3c2410_clk_lookup, ARRAY_SIZE(s3c2410_clk_lookup));
|
|
}
|
|
|
|
struct bus_type s3c2410_subsys = {
|
|
.name = "s3c2410-core",
|
|
.dev_name = "s3c2410-core",
|
|
};
|
|
|
|
/* Note, we would have liked to name this s3c2410-core, but we cannot
|
|
* register two subsystems with the same name.
|
|
*/
|
|
struct bus_type s3c2410a_subsys = {
|
|
.name = "s3c2410a-core",
|
|
.dev_name = "s3c2410a-core",
|
|
};
|
|
|
|
static struct device s3c2410_dev = {
|
|
.bus = &s3c2410_subsys,
|
|
};
|
|
|
|
/* 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 s3c2410 based system)
|
|
* as a driver which may support both 2410 and 2440 may try and use it.
|
|
*/
|
|
|
|
static int __init s3c2410_core_init(void)
|
|
{
|
|
return subsys_system_register(&s3c2410_subsys, NULL);
|
|
}
|
|
|
|
core_initcall(s3c2410_core_init);
|
|
|
|
static int __init s3c2410a_core_init(void)
|
|
{
|
|
return subsys_system_register(&s3c2410a_subsys, NULL);
|
|
}
|
|
|
|
core_initcall(s3c2410a_core_init);
|
|
|
|
int __init s3c2410_init(void)
|
|
{
|
|
printk("S3C2410: Initialising architecture\n");
|
|
|
|
#ifdef CONFIG_PM
|
|
register_syscore_ops(&s3c2410_pm_syscore_ops);
|
|
#endif
|
|
register_syscore_ops(&s3c24xx_irq_syscore_ops);
|
|
|
|
return device_register(&s3c2410_dev);
|
|
}
|
|
|
|
int __init s3c2410a_init(void)
|
|
{
|
|
s3c2410_dev.bus = &s3c2410a_subsys;
|
|
return s3c2410_init();
|
|
}
|
|
|
|
void s3c2410_restart(char mode, const char *cmd)
|
|
{
|
|
if (mode == 's') {
|
|
soft_restart(0);
|
|
}
|
|
|
|
arch_wdt_reset();
|
|
|
|
/* we'll take a jump through zero as a poor second */
|
|
soft_restart(0);
|
|
}
|