SUSPEND: enable supspend function.

PD#156734: suspend: enable supspend function.

Change-Id: I20d62c97147298617cc3c11b3a0ff878bff5f034
Signed-off-by: Hong Guo <hong.guo@amlogic.com>

diff --git a/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi b/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
index 97fb351..f28d8e5 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
@@ -146,7 +146,8 @@
                compatible = "amlogic, pm";
                device_name = "aml_pm";
                status = "okay";
-               reg = <0x0 0xff80023c 0x0 0x4>;
+               reg = <0x0 0xff8000a8 0x0 0x4
+                       0x0 0xff80023c 0x0 0x4>;
        };
 
 

diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
index 370b5ab..f1818f1 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
@@ -177,9 +177,10 @@
 
        meson_suspend:pm {
                compatible = "amlogic, pm";
-               status = "disabled";
+               status = "okay";
                device_name = "aml_pm";
-               reg = <0x0 0xff80023c 0x0 0x4>;
+               reg = <0x0 0xff8000a8 0x0 0x4
+                       0x0 0xff80023c 0x0 0x4>;
        };
 
        secmon {

diff --git a/drivers/amlogic/pm/gx_pm.c b/drivers/amlogic/pm/gx_pm.c
index f4589be..817b861 100644 (file)
--- a/drivers/amlogic/pm/gx_pm.c
+++ b/drivers/amlogic/pm/gx_pm.c
@@ -243,7 +243,6 @@ static int __init meson_pm_probe(struct platform_device *pdev)
 
        debug_reg = of_iomap(pdev->dev.of_node, 0);
        exit_reg = of_iomap(pdev->dev.of_node, 1);
-       writel(0x0, debug_reg);
        device_create_file(&pdev->dev, &dev_attr_suspend_reason);
        device_create_file(&pdev->dev, &dev_attr_time_out);
        device_rename(&pdev->dev, "aml_pm");