Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"

[u-boot.git] / test / dm / sysreset.c

diff --git a/test/dm/sysreset.c b/test/dm/sysreset.c
index e5cd18cd82e48a2dc167ca8c1e4572897ba5a81f..f3a859be787802711483080df51eec8ec611b241 100644 (file)
--- a/test/dm/sysreset.c
+++ b/test/dm/sysreset.c
@@ -3,7 +3,6 @@
  * Copyright (C) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <sysreset.h>
 #include <asm/state.h>
@@ -27,8 +26,8 @@ static int dm_test_sysreset_base(struct unit_test_state *uts)
        /* Device 1 is the warm sysreset device */
        ut_assertok(uclass_get_device(UCLASS_SYSRESET, 1, &dev));
        ut_asserteq(-EACCES, sysreset_request(dev, SYSRESET_WARM));
-       ut_asserteq(-ENOSYS, sysreset_request(dev, SYSRESET_COLD));
-       ut_asserteq(-ENOSYS, sysreset_request(dev, SYSRESET_POWER));
+       ut_asserteq(-EPROTONOSUPPORT, sysreset_request(dev, SYSRESET_COLD));
+       ut_asserteq(-EPROTONOSUPPORT, sysreset_request(dev, SYSRESET_POWER));
 
        state->sysreset_allowed[SYSRESET_WARM] = true;
        ut_asserteq(-EINPROGRESS, sysreset_request(dev, SYSRESET_WARM));
@@ -36,15 +35,17 @@ static int dm_test_sysreset_base(struct unit_test_state *uts)
 
        /* Device 2 is the cold sysreset device */
        ut_assertok(uclass_get_device(UCLASS_SYSRESET, 2, &dev));
-       ut_asserteq(-ENOSYS, sysreset_request(dev, SYSRESET_WARM));
+       ut_asserteq(-EPROTONOSUPPORT, sysreset_request(dev, SYSRESET_WARM));
+       state->sysreset_allowed[SYSRESET_COLD] = false;
        ut_asserteq(-EACCES, sysreset_request(dev, SYSRESET_COLD));
+       state->sysreset_allowed[SYSRESET_COLD] = true;
        state->sysreset_allowed[SYSRESET_POWER] = false;
        ut_asserteq(-EACCES, sysreset_request(dev, SYSRESET_POWER));
        state->sysreset_allowed[SYSRESET_POWER] = true;
 
        return 0;
 }
-DM_TEST(dm_test_sysreset_base, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
+DM_TEST(dm_test_sysreset_base, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);
 
 static int dm_test_sysreset_get_status(struct unit_test_state *uts)
 {
@@ -63,7 +64,7 @@ static int dm_test_sysreset_get_status(struct unit_test_state *uts)
 
        return 0;
 }
-DM_TEST(dm_test_sysreset_get_status, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
+DM_TEST(dm_test_sysreset_get_status, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);
 
 /* Test that we can walk through the sysreset devices */
 static int dm_test_sysreset_walk(struct unit_test_state *uts)
@@ -71,27 +72,30 @@ static int dm_test_sysreset_walk(struct unit_test_state *uts)
        struct sandbox_state *state = state_get_current();
 
        /* If we generate a power sysreset, we will exit sandbox! */
+       state->sysreset_allowed[SYSRESET_WARM] = false;
+       state->sysreset_allowed[SYSRESET_COLD] = false;
        state->sysreset_allowed[SYSRESET_POWER] = false;
        state->sysreset_allowed[SYSRESET_POWER_OFF] = false;
        ut_asserteq(-EACCES, sysreset_walk(SYSRESET_WARM));
        ut_asserteq(-EACCES, sysreset_walk(SYSRESET_COLD));
        ut_asserteq(-EACCES, sysreset_walk(SYSRESET_POWER));
+       ut_asserteq(-EACCES, sysreset_walk(SYSRESET_POWER_OFF));
 
        /*
         * Enable cold system reset - this should make cold system reset work,
         * plus a warm system reset should be promoted to cold, since this is
         * the next step along.
         */
-       state->sysreset_allowed[SYSRESET_COLD] = true;
+       state->sysreset_allowed[SYSRESET_WARM] = true;
        ut_asserteq(-EINPROGRESS, sysreset_walk(SYSRESET_WARM));
-       ut_asserteq(-EINPROGRESS, sysreset_walk(SYSRESET_COLD));
+       ut_asserteq(-EACCES, sysreset_walk(SYSRESET_COLD));
        ut_asserteq(-EACCES, sysreset_walk(SYSRESET_POWER));
-       state->sysreset_allowed[SYSRESET_COLD] = false;
+       state->sysreset_allowed[SYSRESET_COLD] = true;
        state->sysreset_allowed[SYSRESET_POWER] = true;
 
        return 0;
 }
-DM_TEST(dm_test_sysreset_walk, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
+DM_TEST(dm_test_sysreset_walk, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);
 
 static int dm_test_sysreset_get_last(struct unit_test_state *uts)
 {
@@ -110,4 +114,4 @@ static int dm_test_sysreset_get_last(struct unit_test_state *uts)
 
        return 0;
 }
-DM_TEST(dm_test_sysreset_get_last, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
+DM_TEST(dm_test_sysreset_get_last, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);