Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e45be4b5fcccb241101ad1aa1e15581ad2071393

Authored by Samuel Ortiz
1 parent cb5811cf32
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

mfd: Use mfd cell platform_data for wm8400 cells platform bits 

With the addition of a platform device mfd_cell pointer, MFD drivers
can go back to passing platform data back to their sub drivers.
This allows for an mfd_cell->mfd_data removal and thus keep the
sub drivers MFD agnostic. This is mostly needed for non MFD aware
sub drivers.

Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

Showing 2 changed files with 3 additions and 2 deletions Side-by-side Diff

drivers/mfd/wm8400-core.c
Diff comments   View file @ e45be4b
... ... @@ -245,7 +245,8 @@
245 245 {
246 246 struct mfd_cell cell = {
247 247 .name = "wm8400-codec",
248   - .mfd_data = wm8400,
  248 + .platform_data = wm8400,
  249 + .pdata_size = sizeof(*wm8400),
249 250 };
250 251  
251 252 return mfd_add_devices(wm8400->dev, -1, &cell, 1, NULL, 0);
sound/soc/codecs/wm8400.c
Diff comments   View file @ e45be4b
... ... @@ -1378,7 +1378,7 @@
1378 1378  
1379 1379 static int wm8400_codec_probe(struct snd_soc_codec *codec)
1380 1380 {
1381   - struct wm8400 *wm8400 = mfd_get_data(to_platform_device(codec->dev));
  1381 + struct wm8400 *wm8400 = dev_get_platdata(codec->dev);
1382 1382 struct wm8400_priv *priv;
1383 1383 int ret;
1384 1384 u16 reg;