diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-11 13:55:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-11 13:55:03 -0500 |
| commit | d71be1990218957b9f05dbf13a72859a2abe06d7 (patch) | |
| tree | 99858dc9988f7f7b4c0ab1d8d45738e3abdf38c8 /drivers/sound/ivybridge_sound.c | |
| parent | c4fddedc48f336eabc4ce3f74940e6aa372de18c (diff) | |
| parent | bc0b99bd8b19599f670f42401de655fa9b44cd94 (diff) | |
Merge branch 'next'
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/sound/ivybridge_sound.c')
| -rw-r--r-- | drivers/sound/ivybridge_sound.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/sound/ivybridge_sound.c b/drivers/sound/ivybridge_sound.c index bc3c1e85f8..492a86cafe 100644 --- a/drivers/sound/ivybridge_sound.c +++ b/drivers/sound/ivybridge_sound.c @@ -22,7 +22,7 @@ static int bd82x6x_azalia_probe(struct udevice *dev) { - struct pci_child_platdata *plat; + struct pci_child_plat *plat; struct hda_codec_priv *priv; struct udevice *pch; u32 codec_mask; @@ -71,7 +71,7 @@ static int bd82x6x_azalia_probe(struct udevice *dev) dm_pci_clrset_config32(dev, 0xd0, 1U << 31, 0); /* Additional step on Panther Point */ - plat = dev_get_parent_platdata(dev); + plat = dev_get_parent_plat(dev); if (plat->device == PCI_DEVICE_ID_INTEL_PANTHERPOINT_HDA) dm_pci_clrset_config32(dev, 0xc4, 0, 1 << 17); @@ -135,5 +135,5 @@ U_BOOT_DRIVER(bd82x6x_azalia_drv) = { .of_match = bd82x6x_azalia_ids, .probe = bd82x6x_azalia_probe, .ops = &bd82x6x_azalia_ops, - .priv_auto_alloc_size = sizeof(struct hda_codec_priv), + .priv_auto = sizeof(struct hda_codec_priv), }; |