mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
Samsung cleanup for 3.18
- remove unused <mach/memory.h> in exynos - local <mach/regs-clock.h> for s5pv210 - cleanup boot address calculate for exynos - remove separate restart code for s3c24xx -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJUGLtMAAoJEA0Cl+kVi2xqZgsP/i4J6DJeiihnPY6YgFVRmKLY 4VJeUJahAlE1gjAG+gFKDZtfw/VgCm8VuWyJQORtVHBTgPhThnJumGuHrJUj8EQA oM9zb0CNQu+YyDY5R4af7gA6BGw0B99lmOGF3cymC+8rtin20rolXT79RQJCSLq/ kSVP1jGgHnLouGop2Up6HtrTRBAdypwxxeKlwpRSYb6+NF17TW6cOqdO514QkHtd 3ivCcd6grzH7t0DixXKBaeqOdxJeA1/t+v/1hMzmVrX4WOlLXdHq5K1Q7z+EjL6D Lqe7LZNwqJkdKS+yRaGqbnaObZwkwC1V8BEPoQvhbU9Uve2PmkIcrg4SgGA7zLtp qwfG4C1z9hooEhjhIQ6W3c+aIAKxVEGiEmnXG0w5diD2ElB+JtISIt0oftT0LuJX o+WF5r8a5hfuL3VzQlQKJehMojY0KEqkgOHWF5HTIWCsYjSKrkSq9ra3P5UrO3p6 abMseGD5bKRGEcdEWMdINb05n4Mrn+APzltswD5dftsBx+13otapleloIkmdwOSz 4YOH8ysx4HvOPz6P95rdYC1SZ+rqkOspt5eifrDP+6Q6saBahjR6AHWxKHbkkD3A w9JlY/iBlRP10W7FAaYw/cYut0nm+OVSPHyKrToUyXy5kz1R3tG+y576NjaLGMRx uDePfIZSjYo0HSVjpN7B =4HVZ -----END PGP SIGNATURE----- Merge tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup Pull "Samsung cleanup for 3.18" from Kukjin Kim: - remove unused <mach/memory.h> in exynos - local <mach/regs-clock.h> for s5pv210 - cleanup boot address calculate for exynos - remove separate restart code for s3c24xx Signed-off-by: Arnd Bergmann <arnd@arndb.de> * tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: S3C24XX: remove separate restart code ARM: EXYNOS: Do not calculate boot address twice ARM: S5PV210: move <mach/regs-clock.h> into mach-s5pv210/ ARM: EXYNOS: remove unused <mach/memory.h>
This commit is contained in:
commit
2b3a47d7a0
38 changed files with 5 additions and 137 deletions
|
@ -1,26 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
|
|
||||||
* http://www.samsung.com
|
|
||||||
*
|
|
||||||
* EXYNOS4 - Memory definitions
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __ASM_ARCH_MEMORY_H
|
|
||||||
#define __ASM_ARCH_MEMORY_H __FILE__
|
|
||||||
|
|
||||||
#define PLAT_PHYS_OFFSET UL(0x40000000)
|
|
||||||
|
|
||||||
#ifndef CONFIG_ARM_LPAE
|
|
||||||
/* Maximum of 256MiB in one bank */
|
|
||||||
#define MAX_PHYSMEM_BITS 32
|
|
||||||
#define SECTION_SIZE_BITS 28
|
|
||||||
#else
|
|
||||||
#define MAX_PHYSMEM_BITS 36
|
|
||||||
#define SECTION_SIZE_BITS 31
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_MEMORY_H */
|
|
|
@ -224,7 +224,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
||||||
ret = PTR_ERR(boot_reg);
|
ret = PTR_ERR(boot_reg);
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
__raw_writel(boot_addr, cpu_boot_reg(core_id));
|
__raw_writel(boot_addr, boot_reg);
|
||||||
}
|
}
|
||||||
|
|
||||||
call_firmware_op(cpu_boot, core_id);
|
call_firmware_op(cpu_boot, core_id);
|
||||||
|
@ -313,7 +313,7 @@ static void __init exynos_smp_prepare_cpus(unsigned int max_cpus)
|
||||||
|
|
||||||
if (IS_ERR(boot_reg))
|
if (IS_ERR(boot_reg))
|
||||||
break;
|
break;
|
||||||
__raw_writel(boot_addr, cpu_boot_reg(core_id));
|
__raw_writel(boot_addr, boot_reg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,6 @@ config CPU_S3C2410
|
||||||
select S3C2410_DMA if S3C24XX_DMA
|
select S3C2410_DMA if S3C24XX_DMA
|
||||||
select ARM_S3C2410_CPUFREQ if ARM_S3C24XX_CPUFREQ
|
select ARM_S3C2410_CPUFREQ if ARM_S3C24XX_CPUFREQ
|
||||||
select S3C2410_PM if PM
|
select S3C2410_PM if PM
|
||||||
select SAMSUNG_WDT_RESET
|
|
||||||
help
|
help
|
||||||
Support for S3C2410 and S3C2410A family from the S3C24XX line
|
Support for S3C2410 and S3C2410A family from the S3C24XX line
|
||||||
of Samsung Mobile CPUs.
|
of Samsung Mobile CPUs.
|
||||||
|
@ -76,7 +75,6 @@ config CPU_S3C2442
|
||||||
config CPU_S3C244X
|
config CPU_S3C244X
|
||||||
def_bool y
|
def_bool y
|
||||||
depends on CPU_S3C2440 || CPU_S3C2442
|
depends on CPU_S3C2440 || CPU_S3C2442
|
||||||
select SAMSUNG_WDT_RESET
|
|
||||||
|
|
||||||
config CPU_S3C2443
|
config CPU_S3C2443
|
||||||
bool "SAMSUNG S3C2443"
|
bool "SAMSUNG S3C2443"
|
||||||
|
|
|
@ -51,7 +51,6 @@
|
||||||
#include <plat/devs.h>
|
#include <plat/devs.h>
|
||||||
#include <plat/cpu-freq.h>
|
#include <plat/cpu-freq.h>
|
||||||
#include <plat/pwm-core.h>
|
#include <plat/pwm-core.h>
|
||||||
#include <plat/watchdog-reset.h>
|
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
|
@ -513,7 +512,6 @@ struct platform_device s3c2443_device_dma = {
|
||||||
void __init s3c2410_init_clocks(int xtal)
|
void __init s3c2410_init_clocks(int xtal)
|
||||||
{
|
{
|
||||||
s3c2410_common_clk_init(NULL, xtal, 0, S3C24XX_VA_CLKPWR);
|
s3c2410_common_clk_init(NULL, xtal, 0, S3C24XX_VA_CLKPWR);
|
||||||
samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -535,7 +533,6 @@ void __init s3c2416_init_clocks(int xtal)
|
||||||
void __init s3c2440_init_clocks(int xtal)
|
void __init s3c2440_init_clocks(int xtal)
|
||||||
{
|
{
|
||||||
s3c2410_common_clk_init(NULL, xtal, 1, S3C24XX_VA_CLKPWR);
|
s3c2410_common_clk_init(NULL, xtal, 1, S3C24XX_VA_CLKPWR);
|
||||||
samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -543,7 +540,6 @@ void __init s3c2440_init_clocks(int xtal)
|
||||||
void __init s3c2442_init_clocks(int xtal)
|
void __init s3c2442_init_clocks(int xtal)
|
||||||
{
|
{
|
||||||
s3c2410_common_clk_init(NULL, xtal, 2, S3C24XX_VA_CLKPWR);
|
s3c2410_common_clk_init(NULL, xtal, 2, S3C24XX_VA_CLKPWR);
|
||||||
samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,6 @@ extern int s3c2410a_init(void);
|
||||||
extern void s3c2410_map_io(void);
|
extern void s3c2410_map_io(void);
|
||||||
extern void s3c2410_init_uarts(struct s3c2410_uartcfg *cfg, int no);
|
extern void s3c2410_init_uarts(struct s3c2410_uartcfg *cfg, int no);
|
||||||
extern void s3c2410_init_clocks(int xtal);
|
extern void s3c2410_init_clocks(int xtal);
|
||||||
extern void s3c2410_restart(enum reboot_mode mode, const char *cmd);
|
|
||||||
extern void s3c2410_init_irq(void);
|
extern void s3c2410_init_irq(void);
|
||||||
#else
|
#else
|
||||||
#define s3c2410_init_clocks NULL
|
#define s3c2410_init_clocks NULL
|
||||||
|
@ -38,7 +37,6 @@ extern void s3c2412_map_io(void);
|
||||||
extern void s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no);
|
extern void s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no);
|
||||||
extern void s3c2412_init_clocks(int xtal);
|
extern void s3c2412_init_clocks(int xtal);
|
||||||
extern int s3c2412_baseclk_add(void);
|
extern int s3c2412_baseclk_add(void);
|
||||||
extern void s3c2412_restart(enum reboot_mode mode, const char *cmd);
|
|
||||||
extern void s3c2412_init_irq(void);
|
extern void s3c2412_init_irq(void);
|
||||||
#else
|
#else
|
||||||
#define s3c2412_init_clocks NULL
|
#define s3c2412_init_clocks NULL
|
||||||
|
@ -53,7 +51,6 @@ extern void s3c2416_map_io(void);
|
||||||
extern void s3c2416_init_uarts(struct s3c2410_uartcfg *cfg, int no);
|
extern void s3c2416_init_uarts(struct s3c2410_uartcfg *cfg, int no);
|
||||||
extern void s3c2416_init_clocks(int xtal);
|
extern void s3c2416_init_clocks(int xtal);
|
||||||
extern int s3c2416_baseclk_add(void);
|
extern int s3c2416_baseclk_add(void);
|
||||||
extern void s3c2416_restart(enum reboot_mode mode, const char *cmd);
|
|
||||||
extern void s3c2416_init_irq(void);
|
extern void s3c2416_init_irq(void);
|
||||||
|
|
||||||
extern struct syscore_ops s3c2416_irq_syscore_ops;
|
extern struct syscore_ops s3c2416_irq_syscore_ops;
|
||||||
|
@ -67,7 +64,6 @@ extern struct syscore_ops s3c2416_irq_syscore_ops;
|
||||||
#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442)
|
#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442)
|
||||||
extern void s3c244x_map_io(void);
|
extern void s3c244x_map_io(void);
|
||||||
extern void s3c244x_init_uarts(struct s3c2410_uartcfg *cfg, int no);
|
extern void s3c244x_init_uarts(struct s3c2410_uartcfg *cfg, int no);
|
||||||
extern void s3c244x_restart(enum reboot_mode mode, const char *cmd);
|
|
||||||
#else
|
#else
|
||||||
#define s3c244x_init_uarts NULL
|
#define s3c244x_init_uarts NULL
|
||||||
#endif
|
#endif
|
||||||
|
@ -98,7 +94,6 @@ extern void s3c2443_map_io(void);
|
||||||
extern void s3c2443_init_uarts(struct s3c2410_uartcfg *cfg, int no);
|
extern void s3c2443_init_uarts(struct s3c2410_uartcfg *cfg, int no);
|
||||||
extern void s3c2443_init_clocks(int xtal);
|
extern void s3c2443_init_clocks(int xtal);
|
||||||
extern int s3c2443_baseclk_add(void);
|
extern int s3c2443_baseclk_add(void);
|
||||||
extern void s3c2443_restart(enum reboot_mode mode, const char *cmd);
|
|
||||||
extern void s3c2443_init_irq(void);
|
extern void s3c2443_init_irq(void);
|
||||||
#else
|
#else
|
||||||
#define s3c2443_init_clocks NULL
|
#define s3c2443_init_clocks NULL
|
||||||
|
|
|
@ -42,8 +42,6 @@
|
||||||
#define S3C2443_URSTCON S3C2443_CLKREG(0x88)
|
#define S3C2443_URSTCON S3C2443_CLKREG(0x88)
|
||||||
#define S3C2443_UCLKCON S3C2443_CLKREG(0x8C)
|
#define S3C2443_UCLKCON S3C2443_CLKREG(0x8C)
|
||||||
|
|
||||||
#define S3C2443_SWRST_RESET (0x533c2443)
|
|
||||||
|
|
||||||
#define S3C2443_PLLCON_OFF (1<<24)
|
#define S3C2443_PLLCON_OFF (1<<24)
|
||||||
|
|
||||||
#define S3C2443_CLKSRC_EPLLREF_XTAL (2<<7)
|
#define S3C2443_CLKSRC_EPLLREF_XTAL (2<<7)
|
||||||
|
|
|
@ -247,5 +247,4 @@ MACHINE_START(AML_M5900, "AML_M5900")
|
||||||
.init_irq = s3c2410_init_irq,
|
.init_irq = s3c2410_init_irq,
|
||||||
.init_machine = amlm5900_init,
|
.init_machine = amlm5900_init,
|
||||||
.init_time = amlm5900_init_time,
|
.init_time = amlm5900_init_time,
|
||||||
.restart = s3c2410_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -430,5 +430,4 @@ MACHINE_START(ANUBIS, "Simtec-Anubis")
|
||||||
.init_machine = anubis_init,
|
.init_machine = anubis_init,
|
||||||
.init_irq = s3c2440_init_irq,
|
.init_irq = s3c2440_init_irq,
|
||||||
.init_time = anubis_init_time,
|
.init_time = anubis_init_time,
|
||||||
.restart = s3c244x_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -218,5 +218,4 @@ MACHINE_START(AT2440EVB, "AT2440EVB")
|
||||||
.init_machine = at2440evb_init,
|
.init_machine = at2440evb_init,
|
||||||
.init_irq = s3c2440_init_irq,
|
.init_irq = s3c2440_init_irq,
|
||||||
.init_time = at2440evb_init_time,
|
.init_time = at2440evb_init_time,
|
||||||
.restart = s3c244x_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -591,5 +591,4 @@ MACHINE_START(BAST, "Simtec-BAST")
|
||||||
.init_irq = s3c2410_init_irq,
|
.init_irq = s3c2410_init_irq,
|
||||||
.init_machine = bast_init,
|
.init_machine = bast_init,
|
||||||
.init_time = bast_init_time,
|
.init_time = bast_init_time,
|
||||||
.restart = s3c2410_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -597,5 +597,4 @@ MACHINE_START(NEO1973_GTA02, "GTA02")
|
||||||
.init_irq = s3c2442_init_irq,
|
.init_irq = s3c2442_init_irq,
|
||||||
.init_machine = gta02_machine_init,
|
.init_machine = gta02_machine_init,
|
||||||
.init_time = gta02_init_time,
|
.init_time = gta02_init_time,
|
||||||
.restart = s3c244x_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -747,5 +747,4 @@ MACHINE_START(H1940, "IPAQ-H1940")
|
||||||
.init_irq = s3c2410_init_irq,
|
.init_irq = s3c2410_init_irq,
|
||||||
.init_machine = h1940_init,
|
.init_machine = h1940_init,
|
||||||
.init_time = h1940_init_time,
|
.init_time = h1940_init_time,
|
||||||
.restart = s3c2410_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -670,5 +670,4 @@ MACHINE_START(JIVE, "JIVE")
|
||||||
.map_io = jive_map_io,
|
.map_io = jive_map_io,
|
||||||
.init_machine = jive_machine_init,
|
.init_machine = jive_machine_init,
|
||||||
.init_time = jive_init_time,
|
.init_time = jive_init_time,
|
||||||
.restart = s3c2412_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -695,5 +695,4 @@ MACHINE_START(MINI2440, "MINI2440")
|
||||||
.init_machine = mini2440_init,
|
.init_machine = mini2440_init,
|
||||||
.init_irq = s3c2440_init_irq,
|
.init_irq = s3c2440_init_irq,
|
||||||
.init_time = mini2440_init_time,
|
.init_time = mini2440_init_time,
|
||||||
.restart = s3c244x_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -599,7 +599,6 @@ MACHINE_START(N30, "Acer-N30")
|
||||||
.init_machine = n30_init,
|
.init_machine = n30_init,
|
||||||
.init_irq = s3c2410_init_irq,
|
.init_irq = s3c2410_init_irq,
|
||||||
.map_io = n30_map_io,
|
.map_io = n30_map_io,
|
||||||
.restart = s3c2410_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
||||||
MACHINE_START(N35, "Acer-N35")
|
MACHINE_START(N35, "Acer-N35")
|
||||||
|
@ -610,5 +609,4 @@ MACHINE_START(N35, "Acer-N35")
|
||||||
.init_machine = n30_init,
|
.init_machine = n30_init,
|
||||||
.init_irq = s3c2410_init_irq,
|
.init_irq = s3c2410_init_irq,
|
||||||
.map_io = n30_map_io,
|
.map_io = n30_map_io,
|
||||||
.restart = s3c2410_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -159,5 +159,4 @@ MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440")
|
||||||
.init_machine = nexcoder_init,
|
.init_machine = nexcoder_init,
|
||||||
.init_irq = s3c2440_init_irq,
|
.init_irq = s3c2440_init_irq,
|
||||||
.init_time = nexcoder_init_time,
|
.init_time = nexcoder_init_time,
|
||||||
.restart = s3c244x_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -412,5 +412,4 @@ MACHINE_START(OSIRIS, "Simtec-OSIRIS")
|
||||||
.init_irq = s3c2440_init_irq,
|
.init_irq = s3c2440_init_irq,
|
||||||
.init_machine = osiris_init,
|
.init_machine = osiris_init,
|
||||||
.init_time = osiris_init_time,
|
.init_time = osiris_init_time,
|
||||||
.restart = s3c244x_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -122,5 +122,4 @@ MACHINE_START(OTOM, "Nex Vision - Otom 1.1")
|
||||||
.init_machine = otom11_init,
|
.init_machine = otom11_init,
|
||||||
.init_irq = s3c2410_init_irq,
|
.init_irq = s3c2410_init_irq,
|
||||||
.init_time = otom11_init_time,
|
.init_time = otom11_init_time,
|
||||||
.restart = s3c2410_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -352,5 +352,4 @@ MACHINE_START(QT2410, "QT2410")
|
||||||
.init_irq = s3c2410_init_irq,
|
.init_irq = s3c2410_init_irq,
|
||||||
.init_machine = qt2410_machine_init,
|
.init_machine = qt2410_machine_init,
|
||||||
.init_time = qt2410_init_time,
|
.init_time = qt2410_init_time,
|
||||||
.restart = s3c2410_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -812,5 +812,4 @@ MACHINE_START(RX1950, "HP iPAQ RX1950")
|
||||||
.init_irq = s3c2442_init_irq,
|
.init_irq = s3c2442_init_irq,
|
||||||
.init_machine = rx1950_init_machine,
|
.init_machine = rx1950_init_machine,
|
||||||
.init_time = rx1950_init_time,
|
.init_time = rx1950_init_time,
|
||||||
.restart = s3c244x_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -215,5 +215,4 @@ MACHINE_START(RX3715, "IPAQ-RX3715")
|
||||||
.init_irq = s3c2440_init_irq,
|
.init_irq = s3c2440_init_irq,
|
||||||
.init_machine = rx3715_init_machine,
|
.init_machine = rx3715_init_machine,
|
||||||
.init_time = rx3715_init_time,
|
.init_time = rx3715_init_time,
|
||||||
.restart = s3c244x_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -51,5 +51,4 @@ DT_MACHINE_START(S3C2416_DT, "Samsung S3C2416 (Flattened Device Tree)")
|
||||||
.map_io = s3c2416_dt_map_io,
|
.map_io = s3c2416_dt_map_io,
|
||||||
.init_irq = irqchip_init,
|
.init_irq = irqchip_init,
|
||||||
.init_machine = s3c2416_dt_machine_init,
|
.init_machine = s3c2416_dt_machine_init,
|
||||||
.restart = s3c2416_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -124,5 +124,4 @@ MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switc
|
||||||
.init_irq = s3c2410_init_irq,
|
.init_irq = s3c2410_init_irq,
|
||||||
.init_machine = smdk2410_init,
|
.init_machine = smdk2410_init,
|
||||||
.init_time = smdk2410_init_time,
|
.init_time = smdk2410_init_time,
|
||||||
.restart = s3c2410_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -138,7 +138,6 @@ MACHINE_START(S3C2413, "S3C2413")
|
||||||
.map_io = smdk2413_map_io,
|
.map_io = smdk2413_map_io,
|
||||||
.init_machine = smdk2413_machine_init,
|
.init_machine = smdk2413_machine_init,
|
||||||
.init_time = samsung_timer_init,
|
.init_time = samsung_timer_init,
|
||||||
.restart = s3c2412_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
||||||
MACHINE_START(SMDK2412, "SMDK2412")
|
MACHINE_START(SMDK2412, "SMDK2412")
|
||||||
|
@ -150,7 +149,6 @@ MACHINE_START(SMDK2412, "SMDK2412")
|
||||||
.map_io = smdk2413_map_io,
|
.map_io = smdk2413_map_io,
|
||||||
.init_machine = smdk2413_machine_init,
|
.init_machine = smdk2413_machine_init,
|
||||||
.init_time = samsung_timer_init,
|
.init_time = samsung_timer_init,
|
||||||
.restart = s3c2412_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
||||||
MACHINE_START(SMDK2413, "SMDK2413")
|
MACHINE_START(SMDK2413, "SMDK2413")
|
||||||
|
@ -162,5 +160,4 @@ MACHINE_START(SMDK2413, "SMDK2413")
|
||||||
.map_io = smdk2413_map_io,
|
.map_io = smdk2413_map_io,
|
||||||
.init_machine = smdk2413_machine_init,
|
.init_machine = smdk2413_machine_init,
|
||||||
.init_time = smdk2413_init_time,
|
.init_time = smdk2413_init_time,
|
||||||
.restart = s3c2412_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -262,5 +262,4 @@ MACHINE_START(SMDK2416, "SMDK2416")
|
||||||
.map_io = smdk2416_map_io,
|
.map_io = smdk2416_map_io,
|
||||||
.init_machine = smdk2416_machine_init,
|
.init_machine = smdk2416_machine_init,
|
||||||
.init_time = smdk2416_init_time,
|
.init_time = smdk2416_init_time,
|
||||||
.restart = s3c2416_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -185,5 +185,4 @@ MACHINE_START(S3C2440, "SMDK2440")
|
||||||
.map_io = smdk2440_map_io,
|
.map_io = smdk2440_map_io,
|
||||||
.init_machine = smdk2440_machine_init,
|
.init_machine = smdk2440_machine_init,
|
||||||
.init_time = smdk2440_init_time,
|
.init_time = smdk2440_init_time,
|
||||||
.restart = s3c244x_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -150,5 +150,4 @@ MACHINE_START(SMDK2443, "SMDK2443")
|
||||||
.map_io = smdk2443_map_io,
|
.map_io = smdk2443_map_io,
|
||||||
.init_machine = smdk2443_machine_init,
|
.init_machine = smdk2443_machine_init,
|
||||||
.init_time = smdk2443_init_time,
|
.init_time = smdk2443_init_time,
|
||||||
.restart = s3c2443_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -157,5 +157,4 @@ MACHINE_START(TCT_HAMMER, "TCT_HAMMER")
|
||||||
.init_irq = s3c2410_init_irq,
|
.init_irq = s3c2410_init_irq,
|
||||||
.init_machine = tct_hammer_init,
|
.init_machine = tct_hammer_init,
|
||||||
.init_time = tct_hammer_init_time,
|
.init_time = tct_hammer_init_time,
|
||||||
.restart = s3c2410_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -340,5 +340,4 @@ MACHINE_START(VR1000, "Thorcom-VR1000")
|
||||||
.init_machine = vr1000_init,
|
.init_machine = vr1000_init,
|
||||||
.init_irq = s3c2410_init_irq,
|
.init_irq = s3c2410_init_irq,
|
||||||
.init_time = vr1000_init_time,
|
.init_time = vr1000_init_time,
|
||||||
.restart = s3c2410_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -165,5 +165,4 @@ MACHINE_START(VSTMS, "VSTMS")
|
||||||
.init_machine = vstms_init,
|
.init_machine = vstms_init,
|
||||||
.map_io = vstms_map_io,
|
.map_io = vstms_map_io,
|
||||||
.init_time = vstms_init_time,
|
.init_time = vstms_init_time,
|
||||||
.restart = s3c2412_restart,
|
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -42,7 +42,6 @@
|
||||||
#include <plat/cpu.h>
|
#include <plat/cpu.h>
|
||||||
#include <plat/devs.h>
|
#include <plat/devs.h>
|
||||||
#include <plat/pm.h>
|
#include <plat/pm.h>
|
||||||
#include <plat/watchdog-reset.h>
|
|
||||||
|
|
||||||
#include <plat/gpio-core.h>
|
#include <plat/gpio-core.h>
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
|
@ -135,15 +134,3 @@ int __init s3c2410a_init(void)
|
||||||
s3c2410_dev.bus = &s3c2410a_subsys;
|
s3c2410_dev.bus = &s3c2410a_subsys;
|
||||||
return s3c2410_init();
|
return s3c2410_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
void s3c2410_restart(enum reboot_mode mode, const char *cmd)
|
|
||||||
{
|
|
||||||
if (mode == REBOOT_SOFT) {
|
|
||||||
soft_restart(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
samsung_wdt_reset();
|
|
||||||
|
|
||||||
/* we'll take a jump through zero as a poor second */
|
|
||||||
soft_restart(0);
|
|
||||||
}
|
|
||||||
|
|
|
@ -48,9 +48,6 @@
|
||||||
#include "regs-dsc.h"
|
#include "regs-dsc.h"
|
||||||
#include "s3c2412-power.h"
|
#include "s3c2412-power.h"
|
||||||
|
|
||||||
#define S3C2412_SWRST (S3C24XX_VA_CLKPWR + 0x30)
|
|
||||||
#define S3C2412_SWRST_RESET (0x533C2412)
|
|
||||||
|
|
||||||
#ifndef CONFIG_CPU_S3C2412_ONLY
|
#ifndef CONFIG_CPU_S3C2412_ONLY
|
||||||
void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO;
|
void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO;
|
||||||
|
|
||||||
|
@ -128,26 +125,6 @@ static void s3c2412_idle(void)
|
||||||
cpu_do_idle();
|
cpu_do_idle();
|
||||||
}
|
}
|
||||||
|
|
||||||
void s3c2412_restart(enum reboot_mode mode, const char *cmd)
|
|
||||||
{
|
|
||||||
if (mode == REBOOT_SOFT)
|
|
||||||
soft_restart(0);
|
|
||||||
|
|
||||||
/* errata "Watch-dog/Software Reset Problem" specifies that
|
|
||||||
* this reset must be done with the SYSCLK sourced from
|
|
||||||
* EXTCLK instead of FOUT to avoid a glitch in the reset
|
|
||||||
* mechanism.
|
|
||||||
*
|
|
||||||
* See the watchdog section of the S3C2412 manual for more
|
|
||||||
* information on this fix.
|
|
||||||
*/
|
|
||||||
|
|
||||||
__raw_writel(0x00, S3C2412_CLKSRC);
|
|
||||||
__raw_writel(S3C2412_SWRST_RESET, S3C2412_SWRST);
|
|
||||||
|
|
||||||
mdelay(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* s3c2412_map_io
|
/* s3c2412_map_io
|
||||||
*
|
*
|
||||||
* register the standard cpu IO areas, and any passed in from the
|
* register the standard cpu IO areas, and any passed in from the
|
||||||
|
|
|
@ -81,14 +81,6 @@ static struct device s3c2416_dev = {
|
||||||
.bus = &s3c2416_subsys,
|
.bus = &s3c2416_subsys,
|
||||||
};
|
};
|
||||||
|
|
||||||
void s3c2416_restart(enum reboot_mode mode, const char *cmd)
|
|
||||||
{
|
|
||||||
if (mode == REBOOT_SOFT)
|
|
||||||
soft_restart(0);
|
|
||||||
|
|
||||||
__raw_writel(S3C2443_SWRST_RESET, S3C2443_SWRST);
|
|
||||||
}
|
|
||||||
|
|
||||||
int __init s3c2416_init(void)
|
int __init s3c2416_init(void)
|
||||||
{
|
{
|
||||||
printk(KERN_INFO "S3C2416: Initializing architecture\n");
|
printk(KERN_INFO "S3C2416: Initializing architecture\n");
|
||||||
|
|
|
@ -61,14 +61,6 @@ static struct device s3c2443_dev = {
|
||||||
.bus = &s3c2443_subsys,
|
.bus = &s3c2443_subsys,
|
||||||
};
|
};
|
||||||
|
|
||||||
void s3c2443_restart(enum reboot_mode mode, const char *cmd)
|
|
||||||
{
|
|
||||||
if (mode == REBOOT_SOFT)
|
|
||||||
soft_restart(0);
|
|
||||||
|
|
||||||
__raw_writel(S3C2443_SWRST_RESET, S3C2443_SWRST);
|
|
||||||
}
|
|
||||||
|
|
||||||
int __init s3c2443_init(void)
|
int __init s3c2443_init(void)
|
||||||
{
|
{
|
||||||
printk("S3C2443: Initialising architecture\n");
|
printk("S3C2443: Initialising architecture\n");
|
||||||
|
|
|
@ -42,7 +42,6 @@
|
||||||
#include <plat/cpu.h>
|
#include <plat/cpu.h>
|
||||||
#include <plat/pm.h>
|
#include <plat/pm.h>
|
||||||
#include <plat/nand-core.h>
|
#include <plat/nand-core.h>
|
||||||
#include <plat/watchdog-reset.h>
|
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "regs-dsc.h"
|
#include "regs-dsc.h"
|
||||||
|
@ -137,14 +136,3 @@ struct syscore_ops s3c244x_pm_syscore_ops = {
|
||||||
.suspend = s3c244x_suspend,
|
.suspend = s3c244x_suspend,
|
||||||
.resume = s3c244x_resume,
|
.resume = s3c244x_resume,
|
||||||
};
|
};
|
||||||
|
|
||||||
void s3c244x_restart(enum reboot_mode mode, const char *cmd)
|
|
||||||
{
|
|
||||||
if (mode == REBOOT_SOFT)
|
|
||||||
soft_restart(0);
|
|
||||||
|
|
||||||
samsung_wdt_reset();
|
|
||||||
|
|
||||||
/* we'll take a jump through zero as a poor second */
|
|
||||||
soft_restart(0);
|
|
||||||
}
|
|
||||||
|
|
|
@ -24,9 +24,8 @@
|
||||||
|
|
||||||
#include <plat/pm-common.h>
|
#include <plat/pm-common.h>
|
||||||
|
|
||||||
#include <mach/regs-clock.h>
|
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
#include "regs-clock.h"
|
||||||
|
|
||||||
static struct sleep_save s5pv210_core_save[] = {
|
static struct sleep_save s5pv210_core_save[] = {
|
||||||
/* Clock ETC */
|
/* Clock ETC */
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
/* linux/arch/arm/mach-s5pv210/include/mach/regs-clock.h
|
/*
|
||||||
*
|
|
||||||
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
|
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
|
||||||
* http://www.samsung.com/
|
* http://www.samsung.com/
|
||||||
*
|
*
|
|
@ -18,9 +18,9 @@
|
||||||
#include <asm/system_misc.h>
|
#include <asm/system_misc.h>
|
||||||
|
|
||||||
#include <plat/map-base.h>
|
#include <plat/map-base.h>
|
||||||
#include <mach/regs-clock.h>
|
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
#include "regs-clock.h"
|
||||||
|
|
||||||
static int __init s5pv210_fdt_map_sys(unsigned long node, const char *uname,
|
static int __init s5pv210_fdt_map_sys(unsigned long node, const char *uname,
|
||||||
int depth, void *data)
|
int depth, void *data)
|
||||||
|
|
Loading…
Reference in a new issue