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

Commit 6f1294b5 authored by Heiko Stübner's avatar Heiko Stübner Committed by Heiko Stuebner
Browse files

clk: rockchip: add restart handler 



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: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent aec1d96c

drivers/clk/rockchip/clk-rk3188.c

+2 −0
Original line number Diff line number Diff line
@@ -735,6 +735,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)

drivers/clk/rockchip/clk-rk3288.c

+2 −0
Original line number Diff line number Diff line
@@ -808,5 +808,7 @@ static void __init rk3288_clk_init(struct device_node *np) 


	rockchip_register_softrst(np, 12, 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);

drivers/clk/rockchip/clk.c

+25 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/clk-provider.h>

#include <linux/mfd/syscon.h>

#include <linux/regmap.h>

#include <linux/reboot.h>

#include "clk.h"



/**
@@ -330,3 +331,27 @@ void __init rockchip_clk_protect_critical(const char *clocks[], int nclocks) 
			clk_prepare_enable(clk);

	}

}



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

}

drivers/clk/rockchip/clk.h

+1 −0
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ void rockchip_clk_register_armclk(unsigned int lookup_id, const char *name, 
			const struct rockchip_cpuclk_rate_table *rates,

			int nrates);

void rockchip_clk_protect_critical(const char *clocks[], int nclocks);

void rockchip_register_restart_notifier(unsigned int reg);



#define ROCKCHIP_SOFTRST_HIWORD_MASK	BIT(0)