Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8380c1a authored by Mark Brown's avatar Mark Brown Committed by Samuel Ortiz
Browse files

mfd: Register WM8400 codec device 



Register a child device for the codec in the WM8400.

Also switch the unregistration of the MFD devices to use the MFD core
since the current code is hand rolling the same thing.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@openedhand.com>
parent 44faac31

drivers/mfd/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ config PMIC_DA903X 


config MFD_WM8400

	tristate "Support Wolfson Microelectronics WM8400"

	select MFD_CORE

	depends on I2C

	help

	  Support for the Wolfson Microelecronics WM8400 PMIC and audio

drivers/mfd/wm8400-core.c

+25 −6
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/bug.h>

#include <linux/i2c.h>

#include <linux/kernel.h>

#include <linux/mfd/core.h>

#include <linux/mfd/wm8400-private.h>

#include <linux/mfd/wm8400-audio.h>
@@ -239,6 +240,16 @@ void wm8400_reset_codec_reg_cache(struct wm8400 *wm8400) 
}

EXPORT_SYMBOL_GPL(wm8400_reset_codec_reg_cache);



static int wm8400_register_codec(struct wm8400 *wm8400)

{

	struct mfd_cell cell = {

		.name = "wm8400-codec",

		.driver_data = wm8400,

	};



	return mfd_add_devices(wm8400->dev, -1, &cell, 1, NULL, 0);

}



/*

 * wm8400_init - Generic initialisation

 *
@@ -296,24 +307,32 @@ static int wm8400_init(struct wm8400 *wm8400, 
	reg = (reg & WM8400_CHIP_REV_MASK) >> WM8400_CHIP_REV_SHIFT;

	dev_info(wm8400->dev, "WM8400 revision %x\n", reg);



	ret = wm8400_register_codec(wm8400);

	if (ret != 0) {

		dev_err(wm8400->dev, "Failed to register codec\n");

		goto err_children;

	}



	if (pdata && pdata->platform_init) {

		ret = pdata->platform_init(wm8400->dev);

		if (ret != 0)

		if (ret != 0) {

			dev_err(wm8400->dev, "Platform init failed: %d\n",

				ret);

			goto err_children;

		}

	} else

		dev_warn(wm8400->dev, "No platform initialisation supplied\n");



	return 0;



err_children:

	mfd_remove_devices(wm8400->dev);

	return ret;

}



static void wm8400_release(struct wm8400 *wm8400)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(wm8400->regulators); i++)

		if (wm8400->regulators[i].name)

			platform_device_unregister(&wm8400->regulators[i]);

	mfd_remove_devices(wm8400->dev);

}



#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)