mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 00:39:48 +00:00
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>
This commit is contained in:
parent
14f3791439
commit
b7ae8bf7bf
1 changed files with 0 additions and 34 deletions
|
@ -26,11 +26,6 @@
|
||||||
|
|
||||||
#include "keystone.h"
|
#include "keystone.h"
|
||||||
|
|
||||||
#define PLL_RESET_WRITE_KEY_MASK 0xffff0000
|
|
||||||
#define PLL_RESET_WRITE_KEY 0x5a69
|
|
||||||
#define PLL_RESET BIT(16)
|
|
||||||
|
|
||||||
static void __iomem *keystone_rstctrl;
|
|
||||||
static struct notifier_block platform_nb;
|
static struct notifier_block platform_nb;
|
||||||
static unsigned long keystone_dma_pfn_offset __read_mostly;
|
static unsigned long keystone_dma_pfn_offset __read_mostly;
|
||||||
|
|
||||||
|
@ -55,16 +50,6 @@ static int keystone_platform_notifier(struct notifier_block *nb,
|
||||||
|
|
||||||
static void __init keystone_init(void)
|
static void __init keystone_init(void)
|
||||||
{
|
{
|
||||||
struct device_node *node;
|
|
||||||
|
|
||||||
node = of_find_compatible_node(NULL, NULL, "ti,keystone-reset");
|
|
||||||
if (WARN_ON(!node))
|
|
||||||
pr_warn("ti,keystone-reset node undefined\n");
|
|
||||||
|
|
||||||
keystone_rstctrl = of_iomap(node, 0);
|
|
||||||
if (WARN_ON(!keystone_rstctrl))
|
|
||||||
pr_warn("ti,keystone-reset iomap error\n");
|
|
||||||
|
|
||||||
keystone_pm_runtime_init();
|
keystone_pm_runtime_init();
|
||||||
if (platform_nb.notifier_call)
|
if (platform_nb.notifier_call)
|
||||||
bus_register_notifier(&platform_bus_type, &platform_nb);
|
bus_register_notifier(&platform_bus_type, &platform_nb);
|
||||||
|
@ -123,24 +108,6 @@ static const char *keystone_match[] __initconst = {
|
||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
void keystone_restart(enum reboot_mode mode, const char *cmd)
|
|
||||||
{
|
|
||||||
u32 val;
|
|
||||||
|
|
||||||
BUG_ON(!keystone_rstctrl);
|
|
||||||
|
|
||||||
/* Enable write access to RSTCTRL */
|
|
||||||
val = readl(keystone_rstctrl);
|
|
||||||
val &= PLL_RESET_WRITE_KEY_MASK;
|
|
||||||
val |= PLL_RESET_WRITE_KEY;
|
|
||||||
writel(val, keystone_rstctrl);
|
|
||||||
|
|
||||||
/* Reset the SOC */
|
|
||||||
val = readl(keystone_rstctrl);
|
|
||||||
val &= ~PLL_RESET;
|
|
||||||
writel(val, keystone_rstctrl);
|
|
||||||
}
|
|
||||||
|
|
||||||
DT_MACHINE_START(KEYSTONE, "Keystone")
|
DT_MACHINE_START(KEYSTONE, "Keystone")
|
||||||
#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
|
#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
|
||||||
.dma_zone_size = SZ_2G,
|
.dma_zone_size = SZ_2G,
|
||||||
|
@ -148,6 +115,5 @@ DT_MACHINE_START(KEYSTONE, "Keystone")
|
||||||
.smp = smp_ops(keystone_smp_ops),
|
.smp = smp_ops(keystone_smp_ops),
|
||||||
.init_machine = keystone_init,
|
.init_machine = keystone_init,
|
||||||
.dt_compat = keystone_match,
|
.dt_compat = keystone_match,
|
||||||
.restart = keystone_restart,
|
|
||||||
.init_meminfo = keystone_init_meminfo,
|
.init_meminfo = keystone_init_meminfo,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
Loading…
Reference in a new issue