Skip to content

spi: uclass: skip cs lookup if bus not probed #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jiez wants to merge 1 commit into
base: adi-u-boot-2025.10.y
Choose a base branch
from
Open

spi: uclass: skip cs lookup if bus not probed #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 11 additions & 25 deletions drivers/spi/spi-uclass.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,17 @@ static int spi_child_pre_probe(struct udevice *dev)
{
struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev);
struct spi_slave *slave = dev_get_parent_priv(dev);
struct udevice *bus = dev_get_parent(dev);
struct dm_spi_ops *ops = spi_get_ops(bus);
int ret;

if (ops->cs_info) {
ret = ops->cs_info(bus, plat->cs[0], NULL);
if (ret) {
dev_err(dev, "Invalid chip select %u\n", plat->cs[0]);
return ret;
}
}

/*
* This is needed because we pass struct spi_slave around the place
Expand All @@ -229,32 +240,7 @@ int spi_chip_select(struct udevice *dev)

int spi_find_chip_select(struct udevice *bus, int cs, struct udevice **devp)
{
struct dm_spi_ops *ops;
struct spi_cs_info info;
struct udevice *dev;
int ret;

/*
* Ask the driver. For the moment we don't have CS info.
* When we do we could provide the driver with a helper function
* to figure out what chip selects are valid, or just handle the
* request.
*/
ops = spi_get_ops(bus);
if (ops->cs_info) {
ret = ops->cs_info(bus, cs, &info);
} else {
/*
* We could assume there is at least one valid chip select.
* The driver didn't care enough to tell us.
*/
ret = 0;
}

if (ret) {
dev_err(bus, "Invalid cs %d (err=%d)\n", cs, ret);
return ret;
}

for (device_find_first_child(bus, &dev); dev;
device_find_next_child(&dev)) {
Expand Down
Loading