diff options
| author | Tom Rini <trini@konsulko.com> | 2020-12-14 18:57:57 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-12-14 18:57:57 -0500 |
| commit | 8351a29d2df18c92d8e365cfa848218c3859f3d2 (patch) | |
| tree | 5d29001be9accfb8029df9d9ed78fba196ee07b9 /drivers/w1-eeprom | |
| parent | ddaa94978583d07ec515e7226e397221d8cc44c8 (diff) | |
| parent | b7bbd553de0d9752f919dfc616f560f6f2504c14 (diff) | |
Merge tag 'dm-pull-14dec20' of git://git.denx.de/u-boot-dm into next
Driver model tidy-up for livetree
Driver model big rename for consistency
Python 3 clean-ups for patman
Update sandbox serial driver to use membuff
Diffstat (limited to 'drivers/w1-eeprom')
| -rw-r--r-- | drivers/w1-eeprom/ds24xxx.c | 2 | ||||
| -rw-r--r-- | drivers/w1-eeprom/ds2502.c | 2 | ||||
| -rw-r--r-- | drivers/w1-eeprom/w1-eeprom-uclass.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/w1-eeprom/ds24xxx.c b/drivers/w1-eeprom/ds24xxx.c index 0967accdf0..d12fd5754e 100644 --- a/drivers/w1-eeprom/ds24xxx.c +++ b/drivers/w1-eeprom/ds24xxx.c @@ -31,7 +31,7 @@ static int ds24xxx_probe(struct udevice *dev) { struct w1_device *w1; - w1 = dev_get_parent_platdata(dev); + w1 = dev_get_parent_plat(dev); w1->id = 0; return 0; } diff --git a/drivers/w1-eeprom/ds2502.c b/drivers/w1-eeprom/ds2502.c index 19ee4b17ea..b3d68d7f05 100644 --- a/drivers/w1-eeprom/ds2502.c +++ b/drivers/w1-eeprom/ds2502.c @@ -222,7 +222,7 @@ static int ds2502_probe(struct udevice *dev) { struct w1_device *w1; - w1 = dev_get_parent_platdata(dev); + w1 = dev_get_parent_plat(dev); w1->id = 0; return 0; } diff --git a/drivers/w1-eeprom/w1-eeprom-uclass.c b/drivers/w1-eeprom/w1-eeprom-uclass.c index d515b4c536..97a9d43b03 100644 --- a/drivers/w1-eeprom/w1-eeprom-uclass.c +++ b/drivers/w1-eeprom/w1-eeprom-uclass.c @@ -53,7 +53,7 @@ int w1_eeprom_register_new_device(u64 id) if (dev_get_driver_data(dev) == family) { struct w1_device *w1; - w1 = dev_get_parent_platdata(dev); + w1 = dev_get_parent_plat(dev); if (w1->id) /* device already in use */ continue; w1->id = id; @@ -70,7 +70,7 @@ int w1_eeprom_register_new_device(u64 id) int w1_eeprom_get_id(struct udevice *dev, u64 *id) { - struct w1_device *w1 = dev_get_parent_platdata(dev); + struct w1_device *w1 = dev_get_parent_plat(dev); if (!w1) return -ENODEV; |