diff --git a/drivers/i3c/master/i3c-master-cdns.c b/drivers/i3c/master/i3c-master-cdns.c index 2718460dfb891..fa5aaaf446181 100644 --- a/drivers/i3c/master/i3c-master-cdns.c +++ b/drivers/i3c/master/i3c-master-cdns.c @@ -393,7 +393,6 @@ struct cdns_i3c_xfer { struct cdns_i3c_data { u8 thd_delay_ns; - u8 halt_disable; }; struct cdns_i3c_master { @@ -1286,10 +1285,7 @@ static int cdns_i3c_master_bus_init(struct i3c_master_controller *m) * * We will issue ENTDAA afterwards from the threaded IRQ handler. */ - if (master->devdata->halt_disable) - ctrl |= CTRL_HJ_ACK | CTRL_HJ_DISEC | CTRL_MCS_EN; - else - ctrl |= CTRL_HJ_ACK | CTRL_HJ_DISEC | CTRL_HALT_EN | CTRL_MCS_EN; + ctrl |= CTRL_HJ_ACK | CTRL_HJ_DISEC | CTRL_HALT_EN | CTRL_MCS_EN; /* * Configure data hold delay based on device-specific data. @@ -1560,17 +1556,10 @@ static void cdns_i3c_master_hj(struct work_struct *work) static struct cdns_i3c_data cdns_i3c_devdata = { .thd_delay_ns = 10, - .halt_disable = 0, -}; - -static struct cdns_i3c_data phytium_i3c_devdata = { - .thd_delay_ns = 10, - .halt_disable = 1, }; static const struct of_device_id cdns_i3c_master_of_ids[] = { { .compatible = "cdns,i3c-master", .data = &cdns_i3c_devdata }, - { .compatible = "phytium,cdns-i3c-master", .data = &phytium_i3c_devdata}, { /* sentinel */ }, };