Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 baa95883 编写于 作者: R Russell King
浏览文件
操作

ARM: restart: omap: use new restart hook 

Hook these platforms restart code into the new restart hook rather
than using arch_reset().
Acked-by: NTony Lindgren <tony@atomide.com>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
上级 35b47a40
隐藏空白更改
内联 并排
Showing with 59 addition and 13 deletion
arch/arm/mach-omap1/board-ams-delta.c
浏览文件 @ baa95883
......@@ -386,6 +386,7 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)")
.init_irq = omap1_init_irq,
.init_machine = ams_delta_init,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
EXPORT_SYMBOL(ams_delta_latch1_write);
......
arch/arm/mach-omap1/board-fsample.c
浏览文件 @ baa95883
......@@ -390,4 +390,5 @@ MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample")
.init_irq = omap1_init_irq,
.init_machine = omap_fsample_init,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
arch/arm/mach-omap1/board-generic.c
浏览文件 @ baa95883
......@@ -89,4 +89,5 @@ MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
.init_irq = omap1_init_irq,
.init_machine = omap_generic_init,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
arch/arm/mach-omap1/board-h2.c
浏览文件 @ baa95883
......@@ -456,4 +456,5 @@ MACHINE_START(OMAP_H2, "TI-H2")
.init_irq = omap1_init_irq,
.init_machine = h2_init,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
arch/arm/mach-omap1/board-h3.c
浏览文件 @ baa95883
......@@ -444,4 +444,5 @@ MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")
.init_irq = omap1_init_irq,
.init_machine = h3_init,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
arch/arm/mach-omap1/board-htcherald.c
浏览文件 @ baa95883
......@@ -610,4 +610,5 @@ MACHINE_START(HERALD, "HTC Herald")
.init_irq = omap1_init_irq,
.init_machine = htcherald_init,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
arch/arm/mach-omap1/board-innovator.c
浏览文件 @ baa95883
......@@ -460,4 +460,5 @@ MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
.init_irq = omap1_init_irq,
.init_machine = innovator_init,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
arch/arm/mach-omap1/board-nokia770.c
浏览文件 @ baa95883
......@@ -259,4 +259,5 @@ MACHINE_START(NOKIA770, "Nokia 770")
.init_irq = omap1_init_irq,
.init_machine = omap_nokia770_init,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
arch/arm/mach-omap1/board-osk.c
浏览文件 @ baa95883
......@@ -578,4 +578,5 @@ MACHINE_START(OMAP_OSK, "TI-OSK")
.init_irq = omap1_init_irq,
.init_machine = osk_init,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
arch/arm/mach-omap1/board-palmte.c
浏览文件 @ baa95883
......@@ -270,4 +270,5 @@ MACHINE_START(OMAP_PALMTE, "OMAP310 based Palm Tungsten E")
.init_irq = omap1_init_irq,
.init_machine = omap_palmte_init,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
arch/arm/mach-omap1/board-palmtt.c
浏览文件 @ baa95883
......@@ -317,4 +317,5 @@ MACHINE_START(OMAP_PALMTT, "OMAP1510 based Palm Tungsten|T")
.init_irq = omap1_init_irq,
.init_machine = omap_palmtt_init,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
arch/arm/mach-omap1/board-palmz71.c
浏览文件 @ baa95883
......@@ -334,4 +334,5 @@ MACHINE_START(OMAP_PALMZ71, "OMAP310 based Palm Zire71")
.init_irq = omap1_init_irq,
.init_machine = omap_palmz71_init,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
arch/arm/mach-omap1/board-perseus2.c
浏览文件 @ baa95883
......@@ -352,4 +352,5 @@ MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")
.init_irq = omap1_init_irq,
.init_machine = omap_perseus2_init,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
arch/arm/mach-omap1/board-sx1.c
浏览文件 @ baa95883
......@@ -416,4 +416,5 @@ MACHINE_START(SX1, "OMAP310 based Siemens SX1")
.init_irq = omap1_init_irq,
.init_machine = omap_sx1_init,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
arch/arm/mach-omap1/board-voiceblue.c
浏览文件 @ baa95883
......@@ -28,7 +28,6 @@
#include <linux/export.h>
#include <mach/hardware.h>
#include <mach/system.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
......@@ -221,7 +220,7 @@ void voiceblue_wdt_ping(void)
gpio_set_value(0, wdt_gpio_state);
}
static void voiceblue_reset(char mode, const char *cmd)
static void voiceblue_restart(char mode, const char *cmd)
{
/*
* Workaround for 5912/1611b bug mentioned in sprz209d.pdf p. 28
......@@ -285,8 +284,6 @@ static void __init voiceblue_init(void)
* (it is connected through invertor) */
omap_writeb(0x00, OMAP_LPG1_LCR);
omap_writeb(0x00, OMAP_LPG1_PMR); /* Disable clock */
arch_reset = voiceblue_reset;
}
MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910")
......@@ -298,4 +295,5 @@ MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910")
.init_irq = omap1_init_irq,
.init_machine = voiceblue_init,
.timer = &omap1_timer,
.restart = voiceblue_restart,
MACHINE_END
arch/arm/mach-omap1/common.h
浏览文件 @ baa95883
......@@ -54,6 +54,7 @@ static inline void omap16xx_map_io(void)
void omap1_init_early(void);
void omap1_init_irq(void);
void omap1_restart(char, const char *);
extern struct sys_timer omap1_timer;
extern bool omap_32k_timer_init(void);
......
arch/arm/mach-omap1/reset.c
浏览文件 @ baa95883
......@@ -5,10 +5,9 @@
#include <linux/io.h>
#include <mach/hardware.h>
#include <mach/system.h>
#include <plat/prcm.h>
void omap1_arch_reset(char mode, const char *cmd)
void omap1_restart(char mode, const char *cmd)
{
/*
* Workaround for 5912/1611b bug mentioned in sprz209d.pdf p. 28
......@@ -21,5 +20,3 @@ void omap1_arch_reset(char mode, const char *cmd)
omap_writew(1, ARM_RSTCT1);
}
void (*arch_reset)(char, const char *) = omap1_arch_reset;
arch/arm/mach-omap2/board-2430sdp.c
浏览文件 @ baa95883
......@@ -303,4 +303,5 @@ MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board")
.init_irq = omap2_init_irq,
.init_machine = omap_2430sdp_init,
.timer = &omap2_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-3430sdp.c
浏览文件 @ baa95883
......@@ -730,4 +730,5 @@ MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board")
.init_irq = omap3_init_irq,
.init_machine = omap_3430sdp_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-3630sdp.c
浏览文件 @ baa95883
......@@ -217,4 +217,5 @@ MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board")
.init_irq = omap3_init_irq,
.init_machine = omap_sdp_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-4430sdp.c
浏览文件 @ baa95883
......@@ -985,4 +985,5 @@ MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board")
.init_irq = gic_init_irq,
.init_machine = omap_4430sdp_init,
.timer = &omap4_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-am3517crane.c
浏览文件 @ baa95883
......@@ -100,4 +100,5 @@ MACHINE_START(CRANEBOARD, "AM3517/05 CRANEBOARD")
.init_irq = omap3_init_irq,
.init_machine = am3517_crane_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-am3517evm.c
浏览文件 @ baa95883
......@@ -493,4 +493,5 @@ MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM")
.init_irq = omap3_init_irq,
.init_machine = am3517_evm_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-apollon.c
浏览文件 @ baa95883
......@@ -356,4 +356,5 @@ MACHINE_START(OMAP_APOLLON, "OMAP24xx Apollon")
.init_irq = omap2_init_irq,
.init_machine = omap_apollon_init,
.timer = &omap2_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-cm-t35.c
浏览文件 @ baa95883
......@@ -636,6 +636,7 @@ MACHINE_START(CM_T35, "Compulab CM-T35")
.init_irq = omap3_init_irq,
.init_machine = cm_t35_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
MACHINE_START(CM_T3730, "Compulab CM-T3730")
......@@ -646,4 +647,5 @@ MACHINE_START(CM_T3730, "Compulab CM-T3730")
.init_irq = omap3_init_irq,
.init_machine = cm_t3730_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-cm-t3517.c
浏览文件 @ baa95883
......@@ -301,4 +301,5 @@ MACHINE_START(CM_T3517, "Compulab CM-T3517")
.init_irq = omap3_init_irq,
.init_machine = cm_t3517_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-devkit8000.c
浏览文件 @ baa95883
......@@ -662,4 +662,5 @@ MACHINE_START(DEVKIT8000, "OMAP3 Devkit8000")
.init_irq = omap3_init_irq,
.init_machine = devkit8000_init,
.timer = &omap3_secure_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-generic.c
浏览文件 @ baa95883
......@@ -106,6 +106,7 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")
.init_machine = omap_generic_init,
.timer = &omap2_timer,
.dt_compat = omap242x_boards_compat,
.restart = omap_prcm_restart,
MACHINE_END
#endif
......@@ -124,6 +125,7 @@ DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)")
.init_machine = omap_generic_init,
.timer = &omap2_timer,
.dt_compat = omap243x_boards_compat,
.restart = omap_prcm_restart,
MACHINE_END
#endif
......@@ -142,6 +144,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
.init_machine = omap3_init,
.timer = &omap3_timer,
.dt_compat = omap3_boards_compat,
.restart = omap_prcm_restart,
MACHINE_END
#endif
......@@ -160,5 +163,6 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)")
.init_machine = omap4_init,
.timer = &omap4_timer,
.dt_compat = omap4_boards_compat,
.restart = omap_prcm_restart,
MACHINE_END
#endif
arch/arm/mach-omap2/board-h4.c
浏览文件 @ baa95883
......@@ -398,4 +398,5 @@ MACHINE_START(OMAP_H4, "OMAP2420 H4 board")
.init_irq = omap2_init_irq,
.init_machine = omap_h4_init,
.timer = &omap2_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-igep0020.c
浏览文件 @ baa95883
......@@ -674,6 +674,7 @@ MACHINE_START(IGEP0020, "IGEP v2 board")
.init_irq = omap3_init_irq,
.init_machine = igep_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
MACHINE_START(IGEP0030, "IGEP OMAP3 module")
......@@ -684,4 +685,5 @@ MACHINE_START(IGEP0030, "IGEP OMAP3 module")
.init_irq = omap3_init_irq,
.init_machine = igep_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-ldp.c
浏览文件 @ baa95883
......@@ -436,4 +436,5 @@ MACHINE_START(OMAP_LDP, "OMAP LDP board")
.init_irq = omap3_init_irq,
.init_machine = omap_ldp_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-n8x0.c
浏览文件 @ baa95883
......@@ -691,6 +691,7 @@ MACHINE_START(NOKIA_N800, "Nokia N800")
.init_irq = omap2_init_irq,
.init_machine = n8x0_init_machine,
.timer = &omap2_timer,
.restart = omap_prcm_restart,
MACHINE_END
MACHINE_START(NOKIA_N810, "Nokia N810")
......@@ -701,6 +702,7 @@ MACHINE_START(NOKIA_N810, "Nokia N810")
.init_irq = omap2_init_irq,
.init_machine = n8x0_init_machine,
.timer = &omap2_timer,
.restart = omap_prcm_restart,
MACHINE_END
MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX")
......@@ -711,4 +713,5 @@ MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX")
.init_irq = omap2_init_irq,
.init_machine = n8x0_init_machine,
.timer = &omap2_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-omap3beagle.c
浏览文件 @ baa95883
......@@ -561,4 +561,5 @@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board")
.init_irq = omap3_init_irq,
.init_machine = omap3_beagle_init,
.timer = &omap3_secure_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-omap3evm.c
浏览文件 @ baa95883
......@@ -683,4 +683,5 @@ MACHINE_START(OMAP3EVM, "OMAP3 EVM")
.init_irq = omap3_init_irq,
.init_machine = omap3_evm_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-omap3logic.c
浏览文件 @ baa95883
......@@ -210,6 +210,7 @@ MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board")
.init_irq = omap3_init_irq,
.init_machine = omap3logic_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board")
......@@ -219,4 +220,5 @@ MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board")
.init_irq = omap3_init_irq,
.init_machine = omap3logic_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-omap3pandora.c
浏览文件 @ baa95883
......@@ -608,4 +608,5 @@ MACHINE_START(OMAP3_PANDORA, "Pandora Handheld Console")
.init_irq = omap3_init_irq,
.init_machine = omap3pandora_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-omap3stalker.c
浏览文件 @ baa95883
......@@ -456,4 +456,5 @@ MACHINE_START(SBC3530, "OMAP3 STALKER")
.init_irq = omap3_init_irq,
.init_machine = omap3_stalker_init,
.timer = &omap3_secure_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-omap3touchbook.c
浏览文件 @ baa95883
......@@ -383,4 +383,5 @@ MACHINE_START(TOUCHBOOK, "OMAP3 touchbook Board")
.init_irq = omap3_init_irq,
.init_machine = omap3_touchbook_init,
.timer = &omap3_secure_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-omap4panda.c
浏览文件 @ baa95883
......@@ -578,4 +578,5 @@ MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board")
.init_irq = gic_init_irq,
.init_machine = omap4_panda_init,
.timer = &omap4_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-overo.c
浏览文件 @ baa95883
......@@ -564,4 +564,5 @@ MACHINE_START(OVERO, "Gumstix Overo")
.init_irq = omap3_init_irq,
.init_machine = overo_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-rm680.c
浏览文件 @ baa95883
......@@ -151,4 +151,5 @@ MACHINE_START(NOKIA_RM680, "Nokia RM-680 board")
.init_irq = omap3_init_irq,
.init_machine = rm680_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-rx51.c
浏览文件 @ baa95883
......@@ -129,4 +129,5 @@ MACHINE_START(NOKIA_RX51, "Nokia RX-51 board")
.init_irq = omap3_init_irq,
.init_machine = rx51_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-ti8168evm.c
浏览文件 @ baa95883
......@@ -48,4 +48,5 @@ MACHINE_START(TI8168EVM, "ti8168evm")
.init_irq = ti816x_init_irq,
.timer = &omap3_timer,
.init_machine = ti8168_evm_init,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/board-zoom.c
浏览文件 @ baa95883
......@@ -137,6 +137,7 @@ MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
.init_irq = omap3_init_irq,
.init_machine = omap_zoom_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")
......@@ -147,4 +148,5 @@ MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")
.init_irq = omap3_init_irq,
.init_machine = omap_zoom_init,
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
arch/arm/mach-omap2/common.h
浏览文件 @ baa95883
......@@ -84,6 +84,7 @@ void omap3_init_early(void); /* Do not use this one */
void am35xx_init_early(void);
void ti816x_init_early(void);
void omap4430_init_early(void);
void omap_prcm_restart(char, const char *);
/*
* IO bases for various OMAP processors
......
arch/arm/mach-omap2/prcm.c
浏览文件 @ baa95883
......@@ -25,7 +25,6 @@
#include <linux/delay.h>
#include <linux/export.h>
#include <mach/system.h>
#include "common.h"
#include <plat/prcm.h>
#include <plat/irqs.h>
......@@ -59,7 +58,7 @@ u32 omap_prcm_get_reset_sources(void)
EXPORT_SYMBOL(omap_prcm_get_reset_sources);
/* Resets clock rates and reboots the system. Only called from system.h */
static void omap_prcm_arch_reset(char mode, const char *cmd)
void omap_prcm_restart(char mode, const char *cmd)
{
s16 prcm_offs = 0;
......@@ -110,8 +109,6 @@ static void omap_prcm_arch_reset(char mode, const char *cmd)
omap2_prm_read_mod_reg(prcm_offs, OMAP2_RM_RSTCTRL); /* OCP barrier */
}
void (*arch_reset)(char, const char *) = omap_prcm_arch_reset;
/**
* omap2_cm_wait_idlest - wait for IDLEST bit to indicate module readiness
* @reg: physical address of module IDLEST register
......
arch/arm/plat-omap/include/plat/system.h
浏览文件 @ baa95883
......@@ -12,6 +12,8 @@ static inline void arch_idle(void)
cpu_do_idle();
}
extern void (*arch_reset)(char, const char *);
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或