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

Commit 4a9b3737 authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Olof Johansson
Browse files

power: reset: move hisilicon reboot code 



Move reboot code from hisilicon platform driver into reset driver.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@linaro.org>
Acked-by: default avatarWei Xu <xuwei5@hisilicon.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 75a4795a

arch/arm/mach-hisi/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ config ARCH_HISI 
	select ARM_AMBA

	select ARM_GIC

	select ARM_TIMER_SP804

	select POWER_RESET

	select POWER_RESET_HISI

	select POWER_SUPPLY



if ARCH_HISI

arch/arm/mach-hisi/hisilicon.c

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

#include <linux/clocksource.h>

#include <linux/irqchip.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>



#include <asm/proc-fns.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>
@@ -51,32 +47,6 @@ static void __init hi3620_map_io(void) 
	iotable_init(hi3620_io_desc, ARRAY_SIZE(hi3620_io_desc));

}



static void hi3xxx_restart(enum reboot_mode mode, const char *cmd)

{

	struct device_node *np;

	void __iomem *base;

	int offset;



	np = of_find_compatible_node(NULL, NULL, "hisilicon,sysctrl");

	if (!np) {

		pr_err("failed to find hisilicon,sysctrl node\n");

		return;

	}

	base = of_iomap(np, 0);

	if (!base) {

		pr_err("failed to map address in hisilicon,sysctrl node\n");

		return;

	}

	if (of_property_read_u32(np, "reboot-offset", &offset) < 0) {

		pr_err("failed to find reboot-offset property\n");

		return;

	}

	writel_relaxed(0xdeadbeef, base + offset);



	while (1)

		cpu_do_idle();

}



static const char *hi3xxx_compat[] __initconst = {

	"hisilicon,hi3620-hi4511",

	NULL,
@@ -86,7 +56,6 @@ DT_MACHINE_START(HI3620, "Hisilicon Hi3620 (Flattened Device Tree)") 
	.map_io		= hi3620_map_io,

	.dt_compat	= hi3xxx_compat,

	.smp		= smp_ops(hi3xxx_smp_ops),

	.restart	= hi3xxx_restart,

MACHINE_END



static const char *hix5hd2_compat[] __initconst = {
@@ -96,7 +65,5 @@ static const char *hix5hd2_compat[] __initconst = { 


DT_MACHINE_START(HIX5HD2_DT, "Hisilicon HIX5HD2 (Flattened Device Tree)")

	.dt_compat	= hix5hd2_compat,

	.init_late	= hi3xxx_init_late,

	.smp		= smp_ops(hix5hd2_smp_ops),

	.restart	= hi3xxx_restart,

MACHINE_END

drivers/power/reset/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -28,6 +28,12 @@ config POWER_RESET_GPIO 
	  If your board needs a GPIO high/low to power down, say Y and

	  create a binding in your devicetree.



config POWER_RESET_HISI

	bool "Hisilicon power-off driver"

	depends on POWER_RESET && ARCH_HISI

	help

	  Reboot support for Hisilicon boards.



config POWER_RESET_MSM

	bool "Qualcomm MSM power-off driver"

	depends on POWER_RESET && ARCH_QCOM

drivers/power/reset/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_POWER_RESET_AS3722) += as3722-poweroff.o

obj-$(CONFIG_POWER_RESET_AXXIA) += axxia-reset.o

obj-$(CONFIG_POWER_RESET_GPIO) += gpio-poweroff.o

obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o

obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o

obj-$(CONFIG_POWER_RESET_QNAP) += qnap-poweroff.o

obj-$(CONFIG_POWER_RESET_RESTART) += restart-poweroff.o

drivers/power/reset/hisi-reboot.c

0 → 100644
+67 −0
Original line number Diff line number Diff line 
/*

 * Hisilicon SoC reset code

 *

 * Copyright (c) 2014 Hisilicon Ltd.

 * Copyright (c) 2014 Linaro Ltd.

 *

 * Author: Haojian Zhuang <haojian.zhuang@linaro.org>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/delay.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/of_address.h>

#include <linux/platform_device.h>

#include <linux/reboot.h>



#include <asm/proc-fns.h>

#include <asm/system_misc.h>



static void __iomem *base;

static u32 reboot_offset;



static void hisi_restart(enum reboot_mode mode, const char *cmd)

{

	writel_relaxed(0xdeadbeef, base + reboot_offset);



	while (1)

		cpu_do_idle();

}



static int hisi_reboot_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;



	base = of_iomap(np, 0);

	if (!base) {

		WARN(1, "failed to map base address");

		return -ENODEV;

	}



	if (of_property_read_u32(np, "reboot-offset", &reboot_offset) < 0) {

		pr_err("failed to find reboot-offset property\n");

		return -EINVAL;

	}



	arm_pm_restart = hisi_restart;



	return 0;

}



static struct of_device_id hisi_reboot_of_match[] = {

	{ .compatible = "hisilicon,sysctrl" },

	{}

};



static struct platform_driver hisi_reboot_driver = {

	.probe = hisi_reboot_probe,

	.driver = {

		.name = "hisi-reboot",

		.of_match_table = hisi_reboot_of_match,

	},

};

module_platform_driver(hisi_reboot_driver);