diff options
| author | Tom Rini <[email protected]> | 2020-07-06 15:46:38 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-07-06 15:46:38 -0400 |
| commit | 6e7d7aa2e2062995c1cbc3af81cf40c04c50ad30 (patch) | |
| tree | 3c560d567a76e9850e0195fb892d7e1fbaeed198 /doc/driver-model | |
| parent | 2f5fbb5b39f7b67044dda5c35e4a4b31685a3109 (diff) | |
| parent | 621e09cb3bf7e6d4fce9dd5e6de97e057adebc3a (diff) | |
Merge branch 'next'
Merge all outstanding changes from the current next branch in now that
we have released.
Diffstat (limited to 'doc/driver-model')
| -rw-r--r-- | doc/driver-model/design.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/driver-model/design.rst b/doc/driver-model/design.rst index 635effcef68..96525b6ccc5 100644 --- a/doc/driver-model/design.rst +++ b/doc/driver-model/design.rst @@ -613,7 +613,7 @@ be connected on a SATA bus or standalone with no bus:: xhci_usb (UCLASS_USB) flash (UCLASS_FLASH_STORAGE) - parent data/methods defined by USB bus - sata (UCLASS_SATA) + sata (UCLASS_AHCI) flash (UCLASS_FLASH_STORAGE) - parent data/methods defined by SATA bus flash (UCLASS_FLASH_STORAGE) - no parent data/methods (not on a bus) @@ -628,7 +628,7 @@ parent device which is a bus, causes the device to start behaving like a bus device, regardless of its own views on the matter. The uclass for the device can also contain data private to that uclass. -But note that each device on the bus may be a memeber of a different +But note that each device on the bus may be a member of a different uclass, and this data has nothing to do with the child data for each child on the bus. It is the bus' uclass that controls the child with respect to the bus. |