From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756017AbaICTF6 (ORCPT ); Wed, 3 Sep 2014 15:05:58 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:33245 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753402AbaICTF5 convert rfc822-to-8bit (ORCPT ); Wed, 3 Sep 2014 15:05:57 -0400 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT To: Guenter Roeck , "Russell King" , "Wim Van Sebroeck" , "Catalin Marinas" , "Maxime Ripard" , "Andrew Morton" From: Mike Turquette In-Reply-To: <1408495538-27480-12-git-send-email-linux@roeck-us.net> Cc: linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, linux-samsung-soc@vger.kernel.org, "Will Deacon" , "Arnd Bergmann" , "Heiko Stuebner" , "Jonas Jensen" , "Randy Dunlap" , "Steven Rostedt" , "Ingo Molnar" , "Dmitry Eremin-Solenikov" , "David Woodhouse" , "Tomasz Figa" , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, "Guenter Roeck" References: <1408495538-27480-1-git-send-email-linux@roeck-us.net> <1408495538-27480-12-git-send-email-linux@roeck-us.net> Message-ID: <20140903190542.11368.20755@quantum> User-Agent: alot/0.3.5 Subject: Re: [PATCH v7 11/11] clk: rockchip: add restart handler Date: Wed, 03 Sep 2014 12:05:42 -0700 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Quoting Guenter Roeck (2014-08-19 17:45:38) > From: Heiko Stübner > > Add infrastructure to write the correct value to the restart register and > register the restart notifier for both rk3188 (including rk3066) and rk3288. > > Signed-off-by: Heiko Stuebner > Signed-off-by: Guenter Roeck Acked-by: Mike Turquette > --- > v7: Added patch to series. > > drivers/clk/rockchip/clk-rk3188.c | 2 ++ > drivers/clk/rockchip/clk-rk3288.c | 2 ++ > drivers/clk/rockchip/clk.c | 25 +++++++++++++++++++++++++ > drivers/clk/rockchip/clk.h | 1 + > 4 files changed, 30 insertions(+) > > diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c > index a83a6d8..71b661a 100644 > --- a/drivers/clk/rockchip/clk-rk3188.c > +++ b/drivers/clk/rockchip/clk-rk3188.c > @@ -631,6 +631,8 @@ static void __init rk3188_common_clk_init(struct device_node *np) > > rockchip_register_softrst(np, 9, reg_base + RK2928_SOFTRST_CON(0), > ROCKCHIP_SOFTRST_HIWORD_MASK); > + > + rockchip_register_restart_notifier(RK2928_GLB_SRST_FST); > } > > static void __init rk3066a_clk_init(struct device_node *np) > diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c > index 0d8c6c5..b604217 100644 > --- a/drivers/clk/rockchip/clk-rk3288.c > +++ b/drivers/clk/rockchip/clk-rk3288.c > @@ -713,5 +713,7 @@ static void __init rk3288_clk_init(struct device_node *np) > > rockchip_register_softrst(np, 9, reg_base + RK3288_SOFTRST_CON(0), > ROCKCHIP_SOFTRST_HIWORD_MASK); > + > + rockchip_register_restart_notifier(RK3288_GLB_SRST_FST); > } > CLK_OF_DECLARE(rk3288_cru, "rockchip,rk3288-cru", rk3288_clk_init); > diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c > index 278cf9d..aa41433 100644 > --- a/drivers/clk/rockchip/clk.c > +++ b/drivers/clk/rockchip/clk.c > @@ -25,6 +25,7 @@ > #include > #include > #include > +#include > #include "clk.h" > > /** > @@ -242,3 +243,27 @@ void __init rockchip_clk_register_branches( > rockchip_clk_add_lookup(clk, list->id); > } > } > + > +static unsigned int reg_restart; > +static int rockchip_restart_notify(struct notifier_block *this, > + unsigned long mode, void *cmd) > +{ > + writel(0xfdb9, reg_base + reg_restart); > + return NOTIFY_DONE; > +} > + > +static struct notifier_block rockchip_restart_handler = { > + .notifier_call = rockchip_restart_notify, > + .priority = 128, > +}; > + > +void __init rockchip_register_restart_notifier(unsigned int reg) > +{ > + int ret; > + > + reg_restart = reg; > + ret = register_restart_handler(&rockchip_restart_handler); > + if (ret) > + pr_err("%s: cannot register restart handler, %d\n", > + __func__, ret); > +} > diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h > index 887cbde..0b5eab5 100644 > --- a/drivers/clk/rockchip/clk.h > +++ b/drivers/clk/rockchip/clk.h > @@ -329,6 +329,7 @@ void rockchip_clk_register_branches(struct rockchip_clk_branch *clk_list, > unsigned int nr_clk); > void rockchip_clk_register_plls(struct rockchip_pll_clock *pll_list, > unsigned int nr_pll, int grf_lock_offset); > +void rockchip_register_restart_notifier(unsigned int reg); > > #define ROCKCHIP_SOFTRST_HIWORD_MASK BIT(0) > > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/