From 3694473201815a14360af17d2a09fe74c58a580c Mon Sep 17 00:00:00 2001
From: Ziyuan Xu <xzy.xu@rock-chips.com>
Date: Mon, 14 Sep 2020 14:51:00 +0800
Subject: [PATCH] power: reset: gpio-poweroff: force override pm_power_off for
 rockchip

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I4a8cdeaaf35d51ca39ee7b0336888219d3eca9e1
---
 drivers/power/reset/gpio-poweroff.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
index 38206c39b3bf..4c2349f30a28 100644
--- a/drivers/power/reset/gpio-poweroff.c
+++ b/drivers/power/reset/gpio-poweroff.c
@@ -52,6 +52,7 @@ static int gpio_poweroff_probe(struct platform_device *pdev)
 	bool input = false;
 	enum gpiod_flags flags;
 
+#ifndef CONFIG_ARCH_ROCKCHIP
 	/* If a pm_power_off function has already been added, leave it alone */
 	if (pm_power_off != NULL) {
 		dev_err(&pdev->dev,
@@ -59,6 +60,7 @@ static int gpio_poweroff_probe(struct platform_device *pdev)
 		       __func__);
 		return -EBUSY;
 	}
+#endif
 
 	input = device_property_read_bool(&pdev->dev, "input");
 	if (input)