Skip to content

Commit

Permalink
Revert "arm64: i3c: cdns: add support for Phytium workaround"
Browse files Browse the repository at this point in the history
This reverts commit 8153a1c.
  • Loading branch information
Avenger-285714 authored May 30, 2024
1 parent 2e3f87b commit 5486a55
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions drivers/i3c/master/i3c-master-cdns.c
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,6 @@ struct cdns_i3c_xfer {

struct cdns_i3c_data {
u8 thd_delay_ns;
u8 halt_disable;
};

struct cdns_i3c_master {
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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 */ },
};

Expand Down

0 comments on commit 5486a55

Please sign in to comment.