Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7ae8bf7 authored by Ivan Khoronzhuk's avatar Ivan Khoronzhuk Committed by Santosh Shilimkar
Browse files

ARM: keystone: remove redundant reset stuff 



Remove reset stuff in flavour of using keystone reset driver:
driver/power/reset/keystone-reset.c

Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarIvan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
parent 14f37914

arch/arm/mach-keystone/keystone.c

+0 −34
Original line number Diff line number Diff line
@@ -26,11 +26,6 @@ 


#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 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)

{

	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();

	if (platform_nb.notifier_call)

		bus_register_notifier(&platform_bus_type, &platform_nb);
@@ -123,24 +108,6 @@ static const char *keystone_match[] __initconst = { 
	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")

#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)

	.dma_zone_size	= SZ_2G,
@@ -148,6 +115,5 @@ DT_MACHINE_START(KEYSTONE, "Keystone") 
	.smp		= smp_ops(keystone_smp_ops),

	.init_machine	= keystone_init,

	.dt_compat	= keystone_match,

	.restart	= keystone_restart,

	.init_meminfo   = keystone_init_meminfo,

MACHINE_END