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

Commit 89128534 authored by John Keeping's avatar John Keeping Committed by Mark Brown
Browse files

ASoC: rt5677: Add ACPI support 



The Chromebook Pixel 2015 uses this codec with the ACPI ID RT5677CE, but
does not use the standard DT property names so add a new function to
parse the codec properties from these ACPI properties.

Also, the GPIOs are only available by index, so we need to register a
mapping to allow machine drivers to access the GPIOs by name.

Signed-off-by: default avatarJohn Keeping <john@metanate.com>
Tested-by: default avatarTom Rini <trini@konsulko.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 29b4817d

sound/soc/codecs/rt5677.c

+52 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/acpi.h>

#include <linux/fs.h>

#include <linux/module.h>

#include <linux/moduleparam.h>
@@ -40,6 +41,15 @@ 


#define RT5677_PR_BASE (RT5677_PR_RANGE_BASE + (0 * RT5677_PR_SPACING))



/* GPIO indexes defined by ACPI */

enum {

	RT5677_GPIO_PLUG_DET		= 0,

	RT5677_GPIO_MIC_PRESENT_L	= 1,

	RT5677_GPIO_HOTWORD_DET_L	= 2,

	RT5677_GPIO_DSP_INT		= 3,

	RT5677_GPIO_HP_AMP_SHDN_L	= 4,

};



static const struct regmap_range_cfg rt5677_ranges[] = {

	{

		.name = "PR",
@@ -5018,10 +5028,47 @@ static const struct regmap_config rt5677_regmap = { 
static const struct i2c_device_id rt5677_i2c_id[] = {

	{ "rt5677", RT5677 },

	{ "rt5676", RT5676 },

	{ "RT5677CE:00", RT5677 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, rt5677_i2c_id);



static const struct acpi_gpio_params plug_det_gpio = { RT5677_GPIO_PLUG_DET, 0, false };

static const struct acpi_gpio_params mic_present_gpio = { RT5677_GPIO_MIC_PRESENT_L, 0, false };

static const struct acpi_gpio_params headphone_enable_gpio = { RT5677_GPIO_HP_AMP_SHDN_L, 0, false };



static const struct acpi_gpio_mapping bdw_rt5677_gpios[] = {

	{ "plug-det-gpios", &plug_det_gpio, 1 },

	{ "mic-present-gpios", &mic_present_gpio, 1 },

	{ "headphone-enable-gpios", &headphone_enable_gpio, 1 },

	{ NULL },

};



static void rt5677_read_acpi_properties(struct rt5677_priv *rt5677,

		struct device *dev)

{

	int ret;

	u32 val;



	ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(dev),

			bdw_rt5677_gpios);

	if (ret)

		dev_warn(dev, "Failed to add driver gpios\n");



	if (!device_property_read_u32(dev, "DCLK", &val))

		rt5677->pdata.dmic2_clk_pin = val;



	rt5677->pdata.in1_diff = device_property_read_bool(dev, "IN1");

	rt5677->pdata.in2_diff = device_property_read_bool(dev, "IN2");

	rt5677->pdata.lout1_diff = device_property_read_bool(dev, "OUT1");

	rt5677->pdata.lout2_diff = device_property_read_bool(dev, "OUT2");

	rt5677->pdata.lout3_diff = device_property_read_bool(dev, "OUT3");



	device_property_read_u32(dev, "JD1", &rt5677->pdata.jd1_gpio);

	device_property_read_u32(dev, "JD2", &rt5677->pdata.jd2_gpio);

	device_property_read_u32(dev, "JD3", &rt5677->pdata.jd3_gpio);

}



static void rt5677_read_device_properties(struct rt5677_priv *rt5677,

		struct device *dev)

{
@@ -5127,8 +5174,12 @@ static int rt5677_i2c_probe(struct i2c_client *i2c, 


	if (pdata)

		rt5677->pdata = *pdata;

	else

	else if (i2c->dev.of_node)

		rt5677_read_device_properties(rt5677, &i2c->dev);

	else if (ACPI_HANDLE(&i2c->dev))

		rt5677_read_acpi_properties(rt5677, &i2c->dev);

	else

		return -EINVAL;



	/* pow-ldo2 and reset are optional. The codec pins may be statically

	 * connected on the board without gpios. If the gpio device property