Fix cam_i2c test failure on Nexus board The pinmux needs to be configured to run cam_i2c test on Nexus board Change-Id: I444f15e77a43e7d21d834292175e9e5ab2858c32
diff --git a/sw/device/lib/BUILD b/sw/device/lib/BUILD index be5576b..c8647d6 100644 --- a/sw/device/lib/BUILD +++ b/sw/device/lib/BUILD
@@ -68,7 +68,7 @@ target_compatible_with = [OPENTITAN_CPU], deps = [ "//hw/top_matcha/sw/autogen:top_matcha", - "//sw/device/lib/dif:rv_plic_sec", + "//sw/device/lib/dif:rv_plic_smc", "@lowrisc_opentitan//sw/device/lib/dif:i2c", "@lowrisc_opentitan//sw/device/lib/testing/test_framework:check", ],
diff --git a/sw/device/tests/simple_sec.c b/sw/device/tests/simple_sec.c index 2e05928..fc7b029 100644 --- a/sw/device/tests/simple_sec.c +++ b/sw/device/tests/simple_sec.c
@@ -11,6 +11,7 @@ #include "sw/device/lib/dif/dif_smc_ctrl.h" #include "sw/device/lib/dif/dif_uart.h" #include "sw/device/lib/runtime/hart.h" +#include "sw/device/lib/testing/pinmux_testutils.h" #include "sw/device/lib/testing/test_framework/check.h" #include "sw/device/lib/testing/test_framework/ottf_test_config.h" #include "sw/device/lib/testing/test_framework/test_util.h" @@ -52,21 +53,17 @@ CHECK_DIF_OK(dif_pinmux_init( mmio_region_from_addr(TOP_MATCHA_PINMUX_AON_BASE_ADDR), &pinmux)); #if defined(I2S_TX_TEST) - CHECK_DIF_OK(dif_pinmux_output_select(&pinmux, kTopMatchaPinmuxMioOutIod3, - kTopMatchaPinmuxOutselI2s0TxSclk)); - CHECK_DIF_OK(dif_pinmux_output_select(&pinmux, kTopMatchaPinmuxMioOutIod4, - kTopMatchaPinmuxOutselI2s0TxWs)); - CHECK_DIF_OK(dif_pinmux_output_select(&pinmux, kTopMatchaPinmuxMioOutIod5, - kTopMatchaPinmuxOutselI2s0TxSd)); + CHECK_DIF_OK(pinmux_testutils_configure_i2s_tx(&pinmux)); #endif #if defined(I2S_RX_TEST) - CHECK_DIF_OK(dif_pinmux_output_select(&pinmux, kTopMatchaPinmuxMioOutIod0, - kTopMatchaPinmuxOutselI2s0RxSclk)); - CHECK_DIF_OK(dif_pinmux_output_select(&pinmux, kTopMatchaPinmuxMioOutIod1, - kTopMatchaPinmuxOutselI2s0RxWs)); - CHECK_DIF_OK(dif_pinmux_input_select(&pinmux, kTopMatchaPinmuxPeripheralInI2s0RxSd, - kTopMatchaPinmuxInselIod2)); + CHECK_DIF_OK(pinmux_testutils_configure_i2s_rx(&pinmux)); +#endif + +#if defined(CAM_I2C_TEST) + CHECK_DIF_OK(pinmux_testutils_configure_cam_i2c(&pinmux)); + CHECK_DIF_OK(pinmux_testutils_configure_isp_wrapper(&pinmux)); + CHECK_DIF_OK(pinmux_testutils_configure_cam_ctrl(&pinmux)); #endif #if defined(HAS_SMC_BIN)
diff --git a/sw/device/tests/smc/BUILD b/sw/device/tests/smc/BUILD index 730246a..4605d90 100644 --- a/sw/device/tests/smc/BUILD +++ b/sw/device/tests/smc/BUILD
@@ -62,8 +62,8 @@ "//sw/device/lib:camera_hm01b0", "//sw/device/lib/dif:cam_ctrl", "//sw/device/lib/dif:isp_wrapper", + "//sw/device/lib/dif:rv_plic_smc", "//sw/device/tests:test_lib_smc", - "@lowrisc_opentitan//sw/device/silicon_creator/lib:manifest_def", ], )