shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "i3c: master: support to adjust first broadcast address speed"

Browse Source 
This reverts commit 9be9327905 which is
commit aef79e189ba2b32f78bd35daf2c0b41f3868a321 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: Ic446c45504662c6e2c2d0a547677ed68eeddd59e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-12-30 11:11:48 +00:00
parent efa48b6122
commit 6e6b3eeb00
2 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/i3c/master.c
View File

@@ -1810,12 +1810,6 @@ static int i3c_master_bus_init(struct i3c_master_controller *master)
goto err_bus_cleanup; goto err_bus_cleanup;
} }
if (master->ops->set_speed) {
ret = master->ops->set_speed(master, I3C_OPEN_DRAIN_SLOW_SPEED);
if (ret)
goto err_bus_cleanup;
}
/* /*
* Reset all dynamic address that may have been assigned before * Reset all dynamic address that may have been assigned before
* (assigned by the bootloader for example). * (assigned by the bootloader for example).
@@ -1824,12 +1818,6 @@ static int i3c_master_bus_init(struct i3c_master_controller *master)
if (ret && ret != I3C_ERROR_M2) if (ret && ret != I3C_ERROR_M2)
goto err_bus_cleanup; goto err_bus_cleanup;
if (master->ops->set_speed) {
master->ops->set_speed(master, I3C_OPEN_DRAIN_NORMAL_SPEED);
if (ret)
goto err_bus_cleanup;
}
/* Disable all slave events before starting DAA. */ /* Disable all slave events before starting DAA. */
ret = i3c_master_disec_locked(master, I3C_BROADCAST_ADDR, ret = i3c_master_disec_locked(master, I3C_BROADCAST_ADDR,
I3C_CCC_EVENT_SIR | I3C_CCC_EVENT_MR | I3C_CCC_EVENT_SIR | I3C_CCC_EVENT_MR |

16
include/linux/i3c/master.h
View File

@@ -268,20 +268,6 @@ enum i3c_bus_mode {
I3C_BUS_MODE_MIXED_SLOW, I3C_BUS_MODE_MIXED_SLOW,
}; };
/**
* enum i3c_open_drain_speed - I3C open-drain speed
* @I3C_OPEN_DRAIN_SLOW_SPEED: Slow open-drain speed for sending the first
* broadcast address. The first broadcast address at this speed
* will be visible to all devices on the I3C bus. I3C devices
* working in I2C mode will turn off their spike filter when
* switching into I3C mode.
* @I3C_OPEN_DRAIN_NORMAL_SPEED: Normal open-drain speed in I3C bus mode.
*/
enum i3c_open_drain_speed {
I3C_OPEN_DRAIN_SLOW_SPEED,
I3C_OPEN_DRAIN_NORMAL_SPEED,
};
/** /**
* enum i3c_addr_slot_status - I3C address slot status * enum i3c_addr_slot_status - I3C address slot status
* @I3C_ADDR_SLOT_FREE: address is free * @I3C_ADDR_SLOT_FREE: address is free
@@ -441,7 +427,6 @@ struct i3c_bus {
* NULL. * NULL.
* @enable_hotjoin: enable hot join event detect. * @enable_hotjoin: enable hot join event detect.
* @disable_hotjoin: disable hot join event detect. * @disable_hotjoin: disable hot join event detect.
* @set_speed: adjust I3C open drain mode timing.
*/ */
struct i3c_master_controller_ops { struct i3c_master_controller_ops {
int (*bus_init)(struct i3c_master_controller *master); int (*bus_init)(struct i3c_master_controller *master);
@@ -470,7 +455,6 @@ struct i3c_master_controller_ops {
struct i3c_ibi_slot *slot); struct i3c_ibi_slot *slot);
int (*enable_hotjoin)(struct i3c_master_controller *master); int (*enable_hotjoin)(struct i3c_master_controller *master);
int (*disable_hotjoin)(struct i3c_master_controller *master); int (*disable_hotjoin)(struct i3c_master_controller *master);
int (*set_speed)(struct i3c_master_controller *master, enum i3c_open_drain_speed speed);
}; };
/** /**