mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 13:22:57 +00:00
Code Issues Releases Wiki Activity

Immutable branch between MFD and Cros due for the v5.3 merge window

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEdrbJNaO+IJqU8IdIUa+KL4f8d2EFAlz+EmUACgkQUa+KL4f8
 d2GaGA//UeOT3eP4eID5KDuf3sr6KuuKM0w4lU0tQDBH6ieyF4A9+hL/+lg46PKy
 YfPG86ov7miMhUDSc7G+2RRgUgocbR9pVlzBcYvdb0yMbbG3rr2cWXWmyDMyo+7g
 dzBCQAQ+WQIDOXq1CNiAAwr6HLxe9G9ysvYRpW/eSnhsAlH6diVXZQzTG0oq/ky7
 3zHpgcror50ZSWS055hJ6ePMOXkBAhG11BWQkFU1/KqkaRPZB68TSiR/9S8WZ+Ni
 PJK12PMS7lBjHHVH8wZmHuM7/hrOWB7Wk098vToW0MJk7nhx/Xg9Z/xuwTUJ7Wyo
 14EJfkkG9U78jkTMbhVKQz+6wAQBwe/HtzoDJifcYWVOZCmgdYKQ5cBd2CEparu3
 NZMTC8ijelFTCfcdByeskCwv1tDkjmvMvc6mU8c7TRvI2XT/ed58Onru5M5/wrVO
 ocyx81Uo7cJMX5xwaybm2frdYNMaQ5hC0RH/xwoJLdPujx5AQxV7fp9drppZ9em9
 8JuQuIqpNKmwbeQ61rgsoD21+qH/Fv3nhnBziKzjETp0R/VWOkBls5QJHU/iBukW
 XxJVPzXey7wk8SPW/hawZrYXmgwwYsaYoKvjcw+prjp5CniOOorhsftc9ymRX8cU
 pjwVOngs1KIa1Eh9toxmhyUQGxuYZxu5G5BB6n3yKH9dmYqmDDQ=
 =3A2t
 -----END PGP SIGNATURE-----

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: Enric Balletbo i Serra <enric.balletbo@collabora.com>
This commit is contained in:
Enric Balletbo i Serra 2019-06-12 18:04:17 +02:00
commit 74e80d81cc
2 changed files with 2893 additions and 729 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3614
include/linux/mfd/cros_ec_commands.h
View file

File diff suppressed because it is too large Load diff

8
sound/soc/codecs/cros_ec_codec.c
View file

@ -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;