diff options
author | Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> | 2014-05-23 16:53:58 -0400 |
---|---|---|
committer | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2014-05-27 09:48:52 -0400 |
commit | b7ae8bf7bf3c9db304aa582e5c26fc74ae636998 (patch) | |
tree | 860f3c86c16288dadd8365dc1b19b03e5c7afcef | |
parent | 14f3791439b5a6cf12127fb80204265533d92664 (diff) |
ARM: keystone: remove redundant reset stuff
Remove reset stuff in flavour of using keystone reset driver:
driver/power/reset/keystone-reset.c
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
-rw-r--r-- | arch/arm/mach-keystone/keystone.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c index 59b8383cbdb0..1f9ae89ee06d 100644 --- a/arch/arm/mach-keystone/keystone.c +++ b/arch/arm/mach-keystone/keystone.c | |||
@@ -26,11 +26,6 @@ | |||
26 | 26 | ||
27 | #include "keystone.h" | 27 | #include "keystone.h" |
28 | 28 | ||
29 | #define PLL_RESET_WRITE_KEY_MASK 0xffff0000 | ||
30 | #define PLL_RESET_WRITE_KEY 0x5a69 | ||
31 | #define PLL_RESET BIT(16) | ||
32 | |||
33 | static void __iomem *keystone_rstctrl; | ||
34 | static struct notifier_block platform_nb; | 29 | static struct notifier_block platform_nb; |
35 | static unsigned long keystone_dma_pfn_offset __read_mostly; | 30 | static unsigned long keystone_dma_pfn_offset __read_mostly; |
36 | 31 | ||
@@ -55,16 +50,6 @@ static int keystone_platform_notifier(struct notifier_block *nb, | |||
55 | 50 | ||
56 | static void __init keystone_init(void) | 51 | static void __init keystone_init(void) |
57 | { | 52 | { |
58 | struct device_node *node; | ||
59 | |||
60 | node = of_find_compatible_node(NULL, NULL, "ti,keystone-reset"); | ||
61 | if (WARN_ON(!node)) | ||
62 | pr_warn("ti,keystone-reset node undefined\n"); | ||
63 | |||
64 | keystone_rstctrl = of_iomap(node, 0); | ||
65 | if (WARN_ON(!keystone_rstctrl)) | ||
66 | pr_warn("ti,keystone-reset iomap error\n"); | ||
67 | |||
68 | keystone_pm_runtime_init(); | 53 | keystone_pm_runtime_init(); |
69 | if (platform_nb.notifier_call) | 54 | if (platform_nb.notifier_call) |
70 | bus_register_notifier(&platform_bus_type, &platform_nb); | 55 | bus_register_notifier(&platform_bus_type, &platform_nb); |
@@ -123,24 +108,6 @@ static const char *keystone_match[] __initconst = { | |||
123 | NULL, | 108 | NULL, |
124 | }; | 109 | }; |
125 | 110 | ||
126 | void keystone_restart(enum reboot_mode mode, const char *cmd) | ||
127 | { | ||
128 | u32 val; | ||
129 | |||
130 | BUG_ON(!keystone_rstctrl); | ||
131 | |||
132 | /* Enable write access to RSTCTRL */ | ||
133 | val = readl(keystone_rstctrl); | ||
134 | val &= PLL_RESET_WRITE_KEY_MASK; | ||
135 | val |= PLL_RESET_WRITE_KEY; | ||
136 | writel(val, keystone_rstctrl); | ||
137 | |||
138 | /* Reset the SOC */ | ||
139 | val = readl(keystone_rstctrl); | ||
140 | val &= ~PLL_RESET; | ||
141 | writel(val, keystone_rstctrl); | ||
142 | } | ||
143 | |||
144 | DT_MACHINE_START(KEYSTONE, "Keystone") | 111 | DT_MACHINE_START(KEYSTONE, "Keystone") |
145 | #if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE) | 112 | #if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE) |
146 | .dma_zone_size = SZ_2G, | 113 | .dma_zone_size = SZ_2G, |
@@ -148,6 +115,5 @@ DT_MACHINE_START(KEYSTONE, "Keystone") | |||
148 | .smp = smp_ops(keystone_smp_ops), | 115 | .smp = smp_ops(keystone_smp_ops), |
149 | .init_machine = keystone_init, | 116 | .init_machine = keystone_init, |
150 | .dt_compat = keystone_match, | 117 | .dt_compat = keystone_match, |
151 | .restart = keystone_restart, | ||
152 | .init_meminfo = keystone_init_meminfo, | 118 | .init_meminfo = keystone_init_meminfo, |
153 | MACHINE_END | 119 | MACHINE_END |