imx8: Correct the SCU API return value check

The SCU API alreay has been converted to return Linux error code,
using SCU error code is not correct here, although SC_ERR_NONE is value
as 0.

Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index ed44df394b154bd2a7d371594ca740b461b7cbfa..324e010bb2c3f70b8f3d5f74ef2971d2fdde66bb 100644 (file)
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -345,9 +345,9 @@ int ahab_close(void)
        u16 lc;
 
        err = sc_seco_chip_info(-1, &lc, NULL, NULL, NULL);
-       if (err != SC_ERR_NONE) {
+       if (err) {
                printf("Error in get lifecycle\n");
-               return -EIO;
+               return err;
        }
 
        if (lc != 0x20) {
@@ -357,9 +357,9 @@ int ahab_close(void)
        }
 
        err = sc_seco_forward_lifecycle(-1, 16);
-       if (err != SC_ERR_NONE) {
+       if (err) {
                printf("Error in forward lifecycle to OEM closed\n");
-               return -EIO;
+               return err;
        }
 
        return 0;

diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index 2ff4ff35e49a4613b63aa114d64323017ac59390..37a5473ac7cf49e71908c1276dd596917d3f14d1 100644 (file)
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -48,7 +48,7 @@ static char *get_reset_cause(void)
 {
        sc_pm_reset_reason_t reason;
 
-       if (sc_pm_reset_reason(-1, &reason) != SC_ERR_NONE)
+       if (sc_pm_reset_reason(-1, &reason))
                return "Unknown reset";
 
        switch (reason) {
@@ -160,6 +160,7 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data)
        sc_faddr_t tcml_addr;
        u32 tcml_size = SZ_128K;
        ulong addr;
+       int ret;
 
        switch (core_id) {
        case 0:
@@ -187,10 +188,12 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data)
 
        printf("Power on M4 and MU\n");
 
-       if (sc_pm_set_resource_power_mode(-1, core_rsrc, SC_PM_PW_MODE_ON) != SC_ERR_NONE)
-               return -EIO;
+       ret = sc_pm_set_resource_power_mode(-1, core_rsrc, SC_PM_PW_MODE_ON);
+       if (ret)
+               return ret;
 
-       if (sc_pm_set_resource_power_mode(-1, mu_rsrc, SC_PM_PW_MODE_ON) != SC_ERR_NONE)
+       ret = sc_pm_set_resource_power_mode(-1, mu_rsrc, SC_PM_PW_MODE_ON);
+       if (ret)
                return -EIO;
 
        printf("Copy M4 image from 0x%lx to TCML 0x%lx\n", addr, (ulong)tcml_addr);
@@ -199,7 +202,8 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data)
                memcpy((void *)tcml_addr, (void *)addr, tcml_size);
 
        printf("Start M4 %u\n", core_id);
-       if (sc_pm_cpu_start(-1, core_rsrc, true, tcml_addr) != SC_ERR_NONE)
+       ret = sc_pm_cpu_start(-1, core_rsrc, true, tcml_addr);
+       if (ret)
                return -EIO;
 
        printf("bootaux complete\n");
@@ -214,6 +218,7 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data)
        sc_faddr_t aux_core_ram;
        u32 size;
        ulong addr;
+       int ret;
 
        switch (core_id) {
        case 0:
@@ -242,20 +247,23 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data)
 
        printf("Power on aux core %d\n", core_id);
 
-       if (sc_pm_set_resource_power_mode(-1, core_rsrc, SC_PM_PW_MODE_ON) != SC_ERR_NONE)
-               return -EIO;
+       ret = sc_pm_set_resource_power_mode(-1, core_rsrc, SC_PM_PW_MODE_ON);
+       if (ret)
+               return ret;
 
        if (mu_rsrc != SC_R_NONE) {
-               if (sc_pm_set_resource_power_mode(-1, mu_rsrc, SC_PM_PW_MODE_ON) != SC_ERR_NONE)
+               ret = sc_pm_set_resource_power_mode(-1, mu_rsrc, SC_PM_PW_MODE_ON);
+               if (ret)
                        return -EIO;
        }
 
        if (core_id == 1) {
                struct power_domain pd;
 
-               if (sc_pm_clock_enable(-1, core_rsrc, SC_PM_CLK_PER, true, false) != SC_ERR_NONE) {
+               ret = sc_pm_clock_enable(-1, core_rsrc, SC_PM_CLK_PER, true, false);
+               if (ret) {
                        printf("Error enable clock\n");
-                       return -EIO;
+                       return ret;
                }
 
                if (!imx8_power_domain_lookup_name("audio_sai0", &pd)) {
@@ -286,8 +294,9 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data)
 
        printf("Start %s\n", core_id == 0 ? "M4" : "HIFI");
 
-       if (sc_pm_cpu_start(-1, core_rsrc, true, aux_core_ram) != SC_ERR_NONE)
-               return -EIO;
+       ret = sc_pm_cpu_start(-1, core_rsrc, true, aux_core_ram);
+       if (ret)
+               return ret;
 
        printf("bootaux complete\n");
        return 0;
@@ -313,7 +322,7 @@ int arch_auxiliary_core_check_up(u32 core_id)
                return 0;
        }
 
-       if (sc_pm_get_resource_power_mode(-1, core_rsrc, &power_mode) != SC_ERR_NONE)
+       if (sc_pm_get_resource_power_mode(-1, core_rsrc, &power_mode))
                return 0;
 
        if (power_mode != SC_PM_PW_MODE_OFF)