summaryrefslogtreecommitdiff
path: root/doc/driver-model/design.rst
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-06-13 09:01:01 -0400
committerTom Rini <trini@konsulko.com>2020-06-13 09:01:01 -0400
commitf9e3d2e147ee3b18dbc09e56d13e6fc8758ac375 (patch)
treebd93f43be8a3ea14724aeb5686fbdcb80125623e /doc/driver-model/design.rst
parent8a1292ce3e21205645a155b23ac083a3fc6b64c1 (diff)
parentcea8f2c995b9d87af6ef42f967402e1c8a3506db (diff)
Merge tag 'dm-pull-12jun20' of git://git.denx.de/u-boot-dm into next
patman improvements to allow it to work with Zephyr change to how sequence numbers are assigned to devices minor fixes and improvements
Diffstat (limited to 'doc/driver-model/design.rst')
-rw-r--r--doc/driver-model/design.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/driver-model/design.rst b/doc/driver-model/design.rst
index 635effcef6..96525b6ccc 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.