From: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
To: <dbaryshkov@gmail.com>, <dwmw2@infradead.org>,
<santosh.shilimkar@ti.com>, <arnd@arndb.de>, <robh+dt@kernel.org>,
<pawel.moll@arm.com>, <mark.rutland@arm.com>,
<ijc+devicetree@hellion.org.uk>, <galak@codeaurora.org>,
<grant.likely@linaro.org>
Cc: <rdunlap@infradead.org>, <linux@arm.linux.org.uk>,
<grygorii.strashko@ti.com>, <olof@lixom.net>, <w-kwok2@ti.com>,
<sboyd@codeaurora.org>, <devicetree@vger.kernel.org>,
<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>, <m-karicheri2@ti.com>,
<sergei.shtylyov@cogentembedded.com>,
Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Subject: [Patch v5 5/7] ARM: keystone: remove redundant reset stuff
Date: Thu, 22 May 2014 16:48:34 +0300 [thread overview]
Message-ID: <1400766516-14537-6-git-send-email-ivan.khoronzhuk@ti.com> (raw)
In-Reply-To: <1400766516-14537-1-git-send-email-ivan.khoronzhuk@ti.com>
Remove reset stuff in flavour of using keystone reset driver:
driver/power/reset/keystone-reset.c
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
arch/arm/mach-keystone/keystone.c | 34 ----------------------------------
1 file changed, 34 deletions(-)
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index 59b8383..1f9ae89 100644
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -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
--
1.8.3.2
next prev parent reply other threads:[~2014-05-22 13:50 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-22 13:48 [Patch v5 0/7] Introduce keystone reset driver Ivan Khoronzhuk
2014-05-22 13:48 ` [Patch v5 1/7] power: reset: keystone-reset: introduce " Ivan Khoronzhuk
2014-05-22 13:48 ` [Patch v5 2/7] clock: keystone-pllctrl: add bindings for keystone pll controller Ivan Khoronzhuk
2014-05-22 13:48 ` [Patch v5 3/7] mfd: ti-keystone-devctrl: add bindings for device state control Ivan Khoronzhuk
2014-05-22 14:14 ` Lee Jones
2014-05-22 14:32 ` Ivan Khoronzhuk
2014-05-22 15:33 ` Lee Jones
2014-05-22 16:14 ` Ivan Khoronzhuk
2014-05-22 16:30 ` Ivan Khoronzhuk
2014-05-22 13:48 ` [Patch v5 4/7] power: reset: add bindings for keystone reset driver Ivan Khoronzhuk
2014-05-22 13:48 ` Ivan Khoronzhuk [this message]
2014-05-22 13:48 ` [Patch v5 6/7] ARM: dts: keystone: update reset node to work with " Ivan Khoronzhuk
2014-05-22 13:48 ` [Patch v5 7/7] ARM: keystone: enable reset driver support Ivan Khoronzhuk
2014-05-22 13:52 ` [Patch v5 0/7] Introduce keystone reset driver Santosh Shilimkar
2014-05-22 13:54 ` Arnd Bergmann
2014-05-22 13:58 ` Ivan Khoronzhuk
2014-05-22 14:02 ` Santosh Shilimkar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400766516-14537-6-git-send-email-ivan.khoronzhuk@ti.com \
--to=ivan.khoronzhuk@ti.com \
--cc=arnd@arndb.de \
--cc=dbaryshkov@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=galak@codeaurora.org \
--cc=grant.likely@linaro.org \
--cc=grygorii.strashko@ti.com \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=m-karicheri2@ti.com \
--cc=mark.rutland@arm.com \
--cc=olof@lixom.net \
--cc=pawel.moll@arm.com \
--cc=rdunlap@infradead.org \
--cc=robh+dt@kernel.org \
--cc=santosh.shilimkar@ti.com \
--cc=sboyd@codeaurora.org \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=w-kwok2@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®