summaryrefslogtreecommitdiff
path: root/drivers/sound
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/sound')
-rw-r--r--drivers/sound/broadwell_i2s.c2
-rw-r--r--drivers/sound/hda_codec.c2
-rw-r--r--drivers/sound/i2s-uclass.c2
-rw-r--r--drivers/sound/ivybridge_sound.c6
-rw-r--r--drivers/sound/max98088.c2
-rw-r--r--drivers/sound/max98090.c2
-rw-r--r--drivers/sound/max98095.c2
-rw-r--r--drivers/sound/max98357a.c4
-rw-r--r--drivers/sound/rt5677.c2
-rw-r--r--drivers/sound/samsung-i2s.c4
-rw-r--r--drivers/sound/sandbox.c6
-rw-r--r--drivers/sound/sound-uclass.c2
-rw-r--r--drivers/sound/tegra_ahub.c2
-rw-r--r--drivers/sound/wm8994.c2
14 files changed, 20 insertions, 20 deletions
diff --git a/drivers/sound/broadwell_i2s.c b/drivers/sound/broadwell_i2s.c
index adb0b2b104..7f754e6567 100644
--- a/drivers/sound/broadwell_i2s.c
+++ b/drivers/sound/broadwell_i2s.c
@@ -304,5 +304,5 @@ U_BOOT_DRIVER(broadwell_i2s) = {
.of_match = broadwell_i2s_ids,
.probe = broadwell_i2s_probe,
.ops = &broadwell_i2s_ops,
- .priv_auto_alloc_size = sizeof(struct broadwell_i2s_priv),
+ .priv_auto = sizeof(struct broadwell_i2s_priv),
};
diff --git a/drivers/sound/hda_codec.c b/drivers/sound/hda_codec.c
index 4154d29399..eb92830ad9 100644
--- a/drivers/sound/hda_codec.c
+++ b/drivers/sound/hda_codec.c
@@ -539,7 +539,7 @@ U_BOOT_DRIVER(hda_codec) = {
.name = "hda_codec",
.id = UCLASS_SOUND,
.ops = &hda_codec_ops,
- .priv_auto_alloc_size = sizeof(struct hda_codec_priv),
+ .priv_auto = sizeof(struct hda_codec_priv),
.probe = hda_codec_init,
};
diff --git a/drivers/sound/i2s-uclass.c b/drivers/sound/i2s-uclass.c
index b741e3952d..2639c86ea2 100644
--- a/drivers/sound/i2s-uclass.c
+++ b/drivers/sound/i2s-uclass.c
@@ -21,5 +21,5 @@ int i2s_tx_data(struct udevice *dev, void *data, uint data_size)
UCLASS_DRIVER(i2s) = {
.id = UCLASS_I2S,
.name = "i2s",
- .per_device_auto_alloc_size = sizeof(struct i2s_uc_priv),
+ .per_device_auto = sizeof(struct i2s_uc_priv),
};
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),
};
diff --git a/drivers/sound/max98088.c b/drivers/sound/max98088.c
index 5b4c489f4b..4bcb7482b2 100644
--- a/drivers/sound/max98088.c
+++ b/drivers/sound/max98088.c
@@ -421,5 +421,5 @@ U_BOOT_DRIVER(max98088) = {
.of_match = max98088_ids,
.probe = max98088_probe,
.ops = &max98088_ops,
- .priv_auto_alloc_size = sizeof(struct maxim_priv),
+ .priv_auto = sizeof(struct maxim_priv),
};
diff --git a/drivers/sound/max98090.c b/drivers/sound/max98090.c
index d23955d6e1..c77a732277 100644
--- a/drivers/sound/max98090.c
+++ b/drivers/sound/max98090.c
@@ -368,5 +368,5 @@ U_BOOT_DRIVER(max98090) = {
.of_match = max98090_ids,
.probe = max98090_probe,
.ops = &max98090_ops,
- .priv_auto_alloc_size = sizeof(struct maxim_priv),
+ .priv_auto = sizeof(struct maxim_priv),
};
diff --git a/drivers/sound/max98095.c b/drivers/sound/max98095.c
index 5037f9516f..002dab437f 100644
--- a/drivers/sound/max98095.c
+++ b/drivers/sound/max98095.c
@@ -462,5 +462,5 @@ U_BOOT_DRIVER(max98095) = {
.of_match = max98095_ids,
.probe = max98095_probe,
.ops = &max98095_ops,
- .priv_auto_alloc_size = sizeof(struct maxim_priv),
+ .priv_auto = sizeof(struct maxim_priv),
};
diff --git a/drivers/sound/max98357a.c b/drivers/sound/max98357a.c
index b3d27a3616..a2088f0301 100644
--- a/drivers/sound/max98357a.c
+++ b/drivers/sound/max98357a.c
@@ -25,7 +25,7 @@ struct max98357a_priv {
struct gpio_desc sdmode_gpio;
};
-static int max98357a_ofdata_to_platdata(struct udevice *dev)
+static int max98357a_of_to_plat(struct udevice *dev)
{
struct max98357a_priv *priv = dev_get_priv(dev);
int ret;
@@ -155,7 +155,7 @@ U_BOOT_DRIVER(max98357a) = {
.name = "max98357a",
.id = UCLASS_AUDIO_CODEC,
.of_match = max98357a_ids,
- .ofdata_to_platdata = max98357a_ofdata_to_platdata,
+ .of_to_plat = max98357a_of_to_plat,
.ops = &max98357a_ops,
ACPI_OPS_PTR(&max98357a_acpi_ops)
};
diff --git a/drivers/sound/rt5677.c b/drivers/sound/rt5677.c
index 16aa9dfc5b..b655bb40b6 100644
--- a/drivers/sound/rt5677.c
+++ b/drivers/sound/rt5677.c
@@ -331,5 +331,5 @@ U_BOOT_DRIVER(rt5677_drv) = {
.of_match = rt5677_ids,
.ops = &rt5677_ops,
.probe = rt5677_probe,
- .priv_auto_alloc_size = sizeof(struct rt5677_priv),
+ .priv_auto = sizeof(struct rt5677_priv),
};
diff --git a/drivers/sound/samsung-i2s.c b/drivers/sound/samsung-i2s.c
index aa1d6bb209..d3d75c046e 100644
--- a/drivers/sound/samsung-i2s.c
+++ b/drivers/sound/samsung-i2s.c
@@ -385,7 +385,7 @@ static int samsung_i2s_probe(struct udevice *dev)
return i2s_tx_init(priv);
}
-static int samsung_i2s_ofdata_to_platdata(struct udevice *dev)
+static int samsung_i2s_of_to_plat(struct udevice *dev)
{
struct i2s_uc_priv *priv = dev_get_uclass_priv(dev);
ulong base;
@@ -451,6 +451,6 @@ U_BOOT_DRIVER(samsung_i2s) = {
.id = UCLASS_I2S,
.of_match = samsung_i2s_ids,
.probe = samsung_i2s_probe,
- .ofdata_to_platdata = samsung_i2s_ofdata_to_platdata,
+ .of_to_plat = samsung_i2s_of_to_plat,
.ops = &samsung_i2s_ops,
};
diff --git a/drivers/sound/sandbox.c b/drivers/sound/sandbox.c
index 0686add3c8..4a2c87a84c 100644
--- a/drivers/sound/sandbox.c
+++ b/drivers/sound/sandbox.c
@@ -223,7 +223,7 @@ U_BOOT_DRIVER(sandbox_codec) = {
.id = UCLASS_AUDIO_CODEC,
.of_match = sandbox_codec_ids,
.ops = &sandbox_codec_ops,
- .priv_auto_alloc_size = sizeof(struct sandbox_codec_priv),
+ .priv_auto = sizeof(struct sandbox_codec_priv),
};
static const struct i2s_ops sandbox_i2s_ops = {
@@ -241,7 +241,7 @@ U_BOOT_DRIVER(sandbox_i2s) = {
.of_match = sandbox_i2s_ids,
.ops = &sandbox_i2s_ops,
.probe = sandbox_i2s_probe,
- .priv_auto_alloc_size = sizeof(struct sandbox_i2s_priv),
+ .priv_auto = sizeof(struct sandbox_i2s_priv),
};
static const struct sound_ops sandbox_sound_ops = {
@@ -262,6 +262,6 @@ U_BOOT_DRIVER(sandbox_sound) = {
.id = UCLASS_SOUND,
.of_match = sandbox_sound_ids,
.ops = &sandbox_sound_ops,
- .priv_auto_alloc_size = sizeof(struct sandbox_sound_priv),
+ .priv_auto = sizeof(struct sandbox_sound_priv),
.probe = sandbox_sound_probe,
};
diff --git a/drivers/sound/sound-uclass.c b/drivers/sound/sound-uclass.c
index 92f4b0b924..0c71e01f33 100644
--- a/drivers/sound/sound-uclass.c
+++ b/drivers/sound/sound-uclass.c
@@ -172,5 +172,5 @@ int sound_find_codec_i2s(struct udevice *dev)
UCLASS_DRIVER(sound) = {
.id = UCLASS_SOUND,
.name = "sound",
- .per_device_auto_alloc_size = sizeof(struct sound_uc_priv),
+ .per_device_auto = sizeof(struct sound_uc_priv),
};
diff --git a/drivers/sound/tegra_ahub.c b/drivers/sound/tegra_ahub.c
index 26d457255c..8708fc44a9 100644
--- a/drivers/sound/tegra_ahub.c
+++ b/drivers/sound/tegra_ahub.c
@@ -253,5 +253,5 @@ U_BOOT_DRIVER(tegra_ahub) = {
.of_match = tegra_ahub_ids,
.ops = &tegra_ahub_ops,
.probe = tegra_ahub_probe,
- .priv_auto_alloc_size = sizeof(struct tegra_ahub_priv),
+ .priv_auto = sizeof(struct tegra_ahub_priv),
};
diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c
index 367e144541..cb1e97d7a5 100644
--- a/drivers/sound/wm8994.c
+++ b/drivers/sound/wm8994.c
@@ -873,5 +873,5 @@ U_BOOT_DRIVER(wm8994) = {
.of_match = wm8994_ids,
.probe = wm8994_probe,
.ops = &wm8994_ops,
- .priv_auto_alloc_size = sizeof(struct wm8994_priv),
+ .priv_auto = sizeof(struct wm8994_priv),
};
View Lorry Controller Status