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

Commit 74e80d81 authored by Enric Balletbo i Serra's avatar Enric Balletbo i Serra
Browse files

Merge tag 'ib-mfd-cros-v5.3' into chrome-platform/for-next 



Immutable branch between MFD and chrome-platform for driver changes to
allow picking patches that depends on the cros_ec_commands.h file
update.

Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
parents 81bc8c03 3aa6be30

include/linux/mfd/cros_ec_commands.h

+2911 −747

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/cros_ec_codec.c

+4 −4
Original line number Diff line number Diff line
@@ -38,21 +38,21 @@ static const DECLARE_TLV_DB_SCALE(ec_mic_gain_tlv, 0, 100, 0); 


static int ec_command_get_gain(struct snd_soc_component *component,

			       struct ec_param_codec_i2s *param,

			       struct ec_response_codec_gain *resp)

			       struct ec_codec_i2s_gain *resp)

{

	struct cros_ec_codec_data *codec_data =

		snd_soc_component_get_drvdata(component);

	struct cros_ec_device *ec_device = codec_data->ec_device;

	u8 buffer[sizeof(struct cros_ec_command) +

		  max(sizeof(struct ec_param_codec_i2s),

		      sizeof(struct ec_response_codec_gain))];

		      sizeof(struct ec_codec_i2s_gain))];

	struct cros_ec_command *msg = (struct cros_ec_command *)&buffer;

	int ret;



	msg->version = 0;

	msg->command = EC_CMD_CODEC_I2S;

	msg->outsize = sizeof(struct ec_param_codec_i2s);

	msg->insize = sizeof(struct ec_response_codec_gain);

	msg->insize = sizeof(struct ec_codec_i2s_gain);



	memcpy(msg->data, param, msg->outsize);
@@ -226,7 +226,7 @@ static int get_ec_mic_gain(struct snd_soc_component *component, 
			   u8 *left, u8 *right)

{

	struct ec_param_codec_i2s param;

	struct ec_response_codec_gain resp;

	struct ec_codec_i2s_gain resp;

	int ret;



	param.cmd = EC_CODEC_GET_GAIN;