Merge tag 'char-misc-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[platform/kernel/linux-starfive.git] / drivers / bus / mhi / core / init.c

diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c
index 1f8c826..e43a190 100644 (file)
--- a/drivers/bus/mhi/core/init.c
+++ b/drivers/bus/mhi/core/init.c
@@ -34,6 +34,8 @@ const char * const dev_state_tran_str[DEV_ST_TRANSITION_MAX] = {
        [DEV_ST_TRANSITION_READY] = "READY",
        [DEV_ST_TRANSITION_SBL] = "SBL",
        [DEV_ST_TRANSITION_MISSION_MODE] = "MISSION_MODE",
+       [DEV_ST_TRANSITION_SYS_ERR] = "SYS_ERR",
+       [DEV_ST_TRANSITION_DISABLE] = "DISABLE",
 };
 
 const char * const mhi_state_str[MHI_STATE_MAX] = {
@@ -835,8 +837,6 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,
        spin_lock_init(&mhi_cntrl->transition_lock);
        spin_lock_init(&mhi_cntrl->wlock);
        INIT_WORK(&mhi_cntrl->st_worker, mhi_pm_st_worker);
-       INIT_WORK(&mhi_cntrl->syserr_worker, mhi_pm_sys_err_worker);
-       INIT_WORK(&mhi_cntrl->fw_worker, mhi_fw_load_worker);
        init_waitqueue_head(&mhi_cntrl->state_event);
 
        mhi_cmd = mhi_cntrl->mhi_cmd;
@@ -864,6 +864,10 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,
                mutex_init(&mhi_chan->mutex);
                init_completion(&mhi_chan->completion);
                rwlock_init(&mhi_chan->lock);
+
+               /* used in setting bei field of TRE */
+               mhi_event = &mhi_cntrl->mhi_event[mhi_chan->er_index];
+               mhi_chan->intmod = mhi_event->intmod;
        }
 
        if (mhi_cntrl->bounce_buf) {