June 2019 - Alsa-devel - mailman.alsa-project.org

Re: [alsa-devel] [PATCH v2 06/10] mfd / platform: cros_ec: Reorganize platform and mfd includes
by Chanwoo Choi 20 Jun '19

20 Jun '19

Hi Enric, For extcon part, Acked-by: Chanwoo Choi <cw00.choi(a)samsung.com> Best Regards, Chanwoo choi On 19. 6. 15. 오전 1:36, Enric Balletbo i Serra wrote: > There is a bit of mess between cros-ec mfd includes and platform > includes. For example, we have a linux/mfd/cros_ec.h include that > exports the interface implemented in platform/chrome/cros_ec_proto.c. Or > we have a linux/mfd/cros_ec_commands.h file that is non related to the > multifunction device (in the sense that is not exporting any function of > the mfd device). This causes crossed includes between mfd and > platform/chrome subsystems and makes the code difficult to read, apart > from creating 'curious' situations where a platform/chrome driver includes > a linux/mfd/cros_ec.h file just to get the exported functions that are > implemented in another platform/chrome driver. > > In order to have a better separation on what the cros-ec multifunction > driver does and what the cros-ec core provides move and rework the > affected includes doing: > > - Move cros_ec_commands.h to include/linux/platform_data/cros_ec_commands.h > - Get rid of the parts that are implemented in the platform/chrome/cros_ec_proto.c > driver from include/linux/mfd/cros_ec.h to a new file > include/linux/platform_data/cros_ec_proto.h > - Update all the drivers with the new includes, so > - Drivers that only need to know about the protocol include > - linux/platform_data/cros_ec_proto.h > - linux/platform_data/cros_ec_commands.h > - Drivers that need to know about the cros-ec mfd device also include > - linux/mfd/cros_ec.h > > Signed-off-by: Enric Balletbo i Serra <enric.balletbo(a)collabora.com> > Acked-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> > Acked-by: Mark Brown <broonie(a)kernel.org> > Acked-by: Wolfram Sang <wsa(a)the-dreams.de> > Acked-by: Neil Armstrong <narmstrong(a)baylibre.com> > Acked-by: Alexandre Belloni <alexandre.belloni(a)bootlin.com> > Acked-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> > Acked-by: Benjamin Tissoires <benjamin.tissoires(a)redhat.com> > Acked-by: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> > Acked-by: Sebastian Reichel <sebastian.reichel(a)collabora.com> > --- > > Changes in v2: None > > drivers/extcon/extcon-usbc-cros-ec.c | 3 +- > drivers/hid/hid-google-hammer.c | 4 +- > drivers/i2c/busses/i2c-cros-ec-tunnel.c | 4 +- > drivers/iio/accel/cros_ec_accel_legacy.c | 3 +- > .../common/cros_ec_sensors/cros_ec_sensors.c | 3 +- > .../cros_ec_sensors/cros_ec_sensors_core.c | 3 +- > drivers/iio/light/cros_ec_light_prox.c | 3 +- > drivers/iio/pressure/cros_ec_baro.c | 3 +- > drivers/input/keyboard/cros_ec_keyb.c | 4 +- > .../media/platform/cros-ec-cec/cros-ec-cec.c | 4 +- > drivers/mfd/cros_ec_dev.c | 3 +- > drivers/platform/chrome/cros_ec.c | 3 +- > drivers/platform/chrome/cros_ec_debugfs.c | 3 +- > drivers/platform/chrome/cros_ec_i2c.c | 4 +- > drivers/platform/chrome/cros_ec_lightbar.c | 3 +- > drivers/platform/chrome/cros_ec_lpc.c | 4 +- > drivers/platform/chrome/cros_ec_lpc_reg.c | 4 +- > drivers/platform/chrome/cros_ec_proto.c | 3 +- > drivers/platform/chrome/cros_ec_rpmsg.c | 4 +- > drivers/platform/chrome/cros_ec_spi.c | 4 +- > drivers/platform/chrome/cros_ec_sysfs.c | 3 +- > drivers/platform/chrome/cros_ec_trace.c | 2 +- > drivers/platform/chrome/cros_ec_trace.h | 4 +- > drivers/platform/chrome/cros_ec_vbc.c | 3 +- > drivers/platform/chrome/cros_usbpd_logger.c | 5 +- > drivers/power/supply/cros_usbpd-charger.c | 5 +- > drivers/pwm/pwm-cros-ec.c | 4 +- > drivers/rtc/rtc-cros-ec.c | 3 +- > .../linux/iio/common/cros_ec_sensors_core.h | 3 +- > include/linux/mfd/cros_ec.h | 306 ----------------- > .../{mfd => platform_data}/cros_ec_commands.h | 0 > include/linux/platform_data/cros_ec_proto.h | 315 ++++++++++++++++++ > sound/soc/codecs/cros_ec_codec.c | 4 +- > 33 files changed, 377 insertions(+), 349 deletions(-) > rename include/linux/{mfd => platform_data}/cros_ec_commands.h (100%) > create mode 100644 include/linux/platform_data/cros_ec_proto.h > > diff --git a/drivers/extcon/extcon-usbc-cros-ec.c b/drivers/extcon/extcon-usbc-cros-ec.c > index 43c0a936ab82..5290cc2d19d9 100644 > --- a/drivers/extcon/extcon-usbc-cros-ec.c > +++ b/drivers/extcon/extcon-usbc-cros-ec.c > @@ -6,10 +6,11 @@ > > #include <linux/extcon-provider.h> > #include <linux/kernel.h> > -#include <linux/mfd/cros_ec.h> > #include <linux/module.h> > #include <linux/notifier.h> > #include <linux/of.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <linux/slab.h> > #include <linux/sched.h> > diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c > index ee5e0bdcf078..84f8c127ebdc 100644 > --- a/drivers/hid/hid-google-hammer.c > +++ b/drivers/hid/hid-google-hammer.c > @@ -16,9 +16,9 @@ > #include <linux/acpi.h> > #include <linux/hid.h> > #include <linux/leds.h> > -#include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > #include <linux/module.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <linux/pm_wakeup.h> > #include <asm/unaligned.h> > diff --git a/drivers/i2c/busses/i2c-cros-ec-tunnel.c b/drivers/i2c/busses/i2c-cros-ec-tunnel.c > index 82bcd9a78759..c551aa96a2e3 100644 > --- a/drivers/i2c/busses/i2c-cros-ec-tunnel.c > +++ b/drivers/i2c/busses/i2c-cros-ec-tunnel.c > @@ -5,8 +5,8 @@ > > #include <linux/module.h> > #include <linux/i2c.h> > -#include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <linux/slab.h> > > diff --git a/drivers/iio/accel/cros_ec_accel_legacy.c b/drivers/iio/accel/cros_ec_accel_legacy.c > index 46bb2e421bb9..fd9a634f741e 100644 > --- a/drivers/iio/accel/cros_ec_accel_legacy.c > +++ b/drivers/iio/accel/cros_ec_accel_legacy.c > @@ -18,9 +18,10 @@ > #include <linux/iio/triggered_buffer.h> > #include <linux/kernel.h> > #include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > #include <linux/module.h> > #include <linux/slab.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > > #define DRV_NAME "cros-ec-accel-legacy" > diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c > index 17af4e0fd5f8..40dc24ff0ee5 100644 > --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c > +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c > @@ -17,8 +17,9 @@ > #include <linux/iio/triggered_buffer.h> > #include <linux/kernel.h> > #include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > #include <linux/module.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <linux/slab.h> > > diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c > index 719a0df5aeeb..fd63315399ac 100644 > --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c > +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c > @@ -14,9 +14,10 @@ > #include <linux/iio/trigger_consumer.h> > #include <linux/kernel.h> > #include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > #include <linux/module.h> > #include <linux/slab.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > > static char *cros_ec_loc[] = { > diff --git a/drivers/iio/light/cros_ec_light_prox.c b/drivers/iio/light/cros_ec_light_prox.c > index 308ee6ff2e22..437e0eae9178 100644 > --- a/drivers/iio/light/cros_ec_light_prox.c > +++ b/drivers/iio/light/cros_ec_light_prox.c > @@ -15,8 +15,9 @@ > #include <linux/iio/trigger_consumer.h> > #include <linux/kernel.h> > #include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > #include <linux/module.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <linux/slab.h> > > diff --git a/drivers/iio/pressure/cros_ec_baro.c b/drivers/iio/pressure/cros_ec_baro.c > index 034ce98d6e97..956dc01f1295 100644 > --- a/drivers/iio/pressure/cros_ec_baro.c > +++ b/drivers/iio/pressure/cros_ec_baro.c > @@ -15,9 +15,10 @@ > #include <linux/iio/trigger_consumer.h> > #include <linux/kernel.h> > #include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > #include <linux/module.h> > #include <linux/slab.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > > /* > diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c > index d56001181598..2b71c5a51f90 100644 > --- a/drivers/input/keyboard/cros_ec_keyb.c > +++ b/drivers/input/keyboard/cros_ec_keyb.c > @@ -22,8 +22,8 @@ > #include <linux/slab.h> > #include <linux/sysrq.h> > #include <linux/input/matrix_keypad.h> > -#include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > > #include <asm/unaligned.h> > > diff --git a/drivers/media/platform/cros-ec-cec/cros-ec-cec.c b/drivers/media/platform/cros-ec-cec/cros-ec-cec.c > index 068df9888dbf..2e4e263a4a94 100644 > --- a/drivers/media/platform/cros-ec-cec/cros-ec-cec.c > +++ b/drivers/media/platform/cros-ec-cec/cros-ec-cec.c > @@ -16,8 +16,8 @@ > #include <linux/interrupt.h> > #include <media/cec.h> > #include <media/cec-notifier.h> > -#include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > > #define DRV_NAME "cros-ec-cec" > > diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c > index d465bcde9fc4..7572fe096c72 100644 > --- a/drivers/mfd/cros_ec_dev.c > +++ b/drivers/mfd/cros_ec_dev.c > @@ -19,11 +19,12 @@ > > #include <linux/mfd/core.h> > #include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > #include <linux/module.h> > #include <linux/mod_devicetable.h> > #include <linux/of_platform.h> > #include <linux/platform_device.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/slab.h> > > #define DRV_NAME "cros-ec-dev" > diff --git a/drivers/platform/chrome/cros_ec.c b/drivers/platform/chrome/cros_ec.c > index 11fced7917fc..9800597ccd96 100644 > --- a/drivers/platform/chrome/cros_ec.c > +++ b/drivers/platform/chrome/cros_ec.c > @@ -21,7 +21,8 @@ > #include <linux/interrupt.h> > #include <linux/slab.h> > #include <linux/module.h> > -#include <linux/mfd/cros_ec.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/suspend.h> > #include <asm/unaligned.h> > > diff --git a/drivers/platform/chrome/cros_ec_debugfs.c b/drivers/platform/chrome/cros_ec_debugfs.c > index 4c2a27f6a6d0..b088d91be9c9 100644 > --- a/drivers/platform/chrome/cros_ec_debugfs.c > +++ b/drivers/platform/chrome/cros_ec_debugfs.c > @@ -8,9 +8,10 @@ > #include <linux/delay.h> > #include <linux/fs.h> > #include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > #include <linux/module.h> > #include <linux/mutex.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <linux/poll.h> > #include <linux/sched.h> > diff --git a/drivers/platform/chrome/cros_ec_i2c.c b/drivers/platform/chrome/cros_ec_i2c.c > index 6bb82dfa7dae..9bd97bc8454b 100644 > --- a/drivers/platform/chrome/cros_ec_i2c.c > +++ b/drivers/platform/chrome/cros_ec_i2c.c > @@ -9,8 +9,8 @@ > #include <linux/module.h> > #include <linux/i2c.h> > #include <linux/interrupt.h> > -#include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <linux/slab.h> > > diff --git a/drivers/platform/chrome/cros_ec_lightbar.c b/drivers/platform/chrome/cros_ec_lightbar.c > index d30a6650b0b5..caa26da2c788 100644 > --- a/drivers/platform/chrome/cros_ec_lightbar.c > +++ b/drivers/platform/chrome/cros_ec_lightbar.c > @@ -9,8 +9,9 @@ > #include <linux/fs.h> > #include <linux/kobject.h> > #include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > #include <linux/module.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <linux/sched.h> > #include <linux/types.h> > diff --git a/drivers/platform/chrome/cros_ec_lpc.c b/drivers/platform/chrome/cros_ec_lpc.c > index 2c7e654cf89c..0c976e95998a 100644 > --- a/drivers/platform/chrome/cros_ec_lpc.c > +++ b/drivers/platform/chrome/cros_ec_lpc.c > @@ -16,9 +16,9 @@ > #include <linux/delay.h> > #include <linux/io.h> > #include <linux/interrupt.h> > -#include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > #include <linux/module.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <linux/printk.h> > #include <linux/suspend.h> > diff --git a/drivers/platform/chrome/cros_ec_lpc_reg.c b/drivers/platform/chrome/cros_ec_lpc_reg.c > index 0f5cd0ac8b49..dec9a779e209 100644 > --- a/drivers/platform/chrome/cros_ec_lpc_reg.c > +++ b/drivers/platform/chrome/cros_ec_lpc_reg.c > @@ -4,8 +4,8 @@ > // Copyright (C) 2016 Google, Inc > > #include <linux/io.h> > -#include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > > #include "cros_ec_lpc_mec.h" > > diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c > index 3d2325197a68..f659f96bda12 100644 > --- a/drivers/platform/chrome/cros_ec_proto.c > +++ b/drivers/platform/chrome/cros_ec_proto.c > @@ -3,10 +3,11 @@ > // > // Copyright (C) 2015 Google, Inc > > -#include <linux/mfd/cros_ec.h> > #include <linux/delay.h> > #include <linux/device.h> > #include <linux/module.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/slab.h> > #include <asm/unaligned.h> > > diff --git a/drivers/platform/chrome/cros_ec_rpmsg.c b/drivers/platform/chrome/cros_ec_rpmsg.c > index 520e507bfa54..9633e5417686 100644 > --- a/drivers/platform/chrome/cros_ec_rpmsg.c > +++ b/drivers/platform/chrome/cros_ec_rpmsg.c > @@ -6,9 +6,9 @@ > #include <linux/delay.h> > #include <linux/kernel.h> > #include <linux/module.h> > -#include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > #include <linux/of.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <linux/rpmsg.h> > #include <linux/slab.h> > diff --git a/drivers/platform/chrome/cros_ec_spi.c b/drivers/platform/chrome/cros_ec_spi.c > index 02f9e8257581..a4167dfd85bf 100644 > --- a/drivers/platform/chrome/cros_ec_spi.c > +++ b/drivers/platform/chrome/cros_ec_spi.c > @@ -6,9 +6,9 @@ > #include <linux/delay.h> > #include <linux/kernel.h> > #include <linux/module.h> > -#include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > #include <linux/of.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <linux/slab.h> > #include <linux/spi/spi.h> > diff --git a/drivers/platform/chrome/cros_ec_sysfs.c b/drivers/platform/chrome/cros_ec_sysfs.c > index fe0b7614ae1b..0caeb8d0989d 100644 > --- a/drivers/platform/chrome/cros_ec_sysfs.c > +++ b/drivers/platform/chrome/cros_ec_sysfs.c > @@ -9,8 +9,9 @@ > #include <linux/fs.h> > #include <linux/kobject.h> > #include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > #include <linux/module.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <linux/printk.h> > #include <linux/slab.h> > diff --git a/drivers/platform/chrome/cros_ec_trace.c b/drivers/platform/chrome/cros_ec_trace.c > index 0a76412095a9..6f80ff4532ae 100644 > --- a/drivers/platform/chrome/cros_ec_trace.c > +++ b/drivers/platform/chrome/cros_ec_trace.c > @@ -6,7 +6,7 @@ > #define TRACE_SYMBOL(a) {a, #a} > > // Generate the list using the following script: > -// sed -n 's/^#define \(EC_CMD_[[:alnum:]_]*\)\s.*/\tTRACE_SYMBOL(\1), \\/p' include/linux/mfd/cros_ec_commands.h > +// sed -n 's/^#define \(EC_CMD_[[:alnum:]_]*\)\s.*/\tTRACE_SYMBOL(\1), \\/p' include/linux/platform_data/cros_ec_commands.h > #define EC_CMDS \ > TRACE_SYMBOL(EC_CMD_PROTO_VERSION), \ > TRACE_SYMBOL(EC_CMD_HELLO), \ > diff --git a/drivers/platform/chrome/cros_ec_trace.h b/drivers/platform/chrome/cros_ec_trace.h > index 7ae3b89c78b9..0dd4df30fa89 100644 > --- a/drivers/platform/chrome/cros_ec_trace.h > +++ b/drivers/platform/chrome/cros_ec_trace.h > @@ -11,8 +11,10 @@ > #if !defined(_CROS_EC_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ) > #define _CROS_EC_TRACE_H_ > > +#include <linux/bits.h> > #include <linux/types.h> > -#include <linux/mfd/cros_ec.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > > #include <linux/tracepoint.h> > > diff --git a/drivers/platform/chrome/cros_ec_vbc.c b/drivers/platform/chrome/cros_ec_vbc.c > index 8392a1ec33a7..cffe119e7a7a 100644 > --- a/drivers/platform/chrome/cros_ec_vbc.c > +++ b/drivers/platform/chrome/cros_ec_vbc.c > @@ -7,8 +7,9 @@ > #include <linux/of.h> > #include <linux/platform_device.h> > #include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > #include <linux/module.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/slab.h> > > #define DRV_NAME "cros-ec-vbc" > diff --git a/drivers/platform/chrome/cros_usbpd_logger.c b/drivers/platform/chrome/cros_usbpd_logger.c > index 7c7b267626a0..c549a9b49b56 100644 > --- a/drivers/platform/chrome/cros_usbpd_logger.c > +++ b/drivers/platform/chrome/cros_usbpd_logger.c > @@ -6,10 +6,11 @@ > */ > > #include <linux/ktime.h> > -#include <linux/math64.h> > #include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > +#include <linux/math64.h> > #include <linux/module.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <linux/rtc.h> > > diff --git a/drivers/power/supply/cros_usbpd-charger.c b/drivers/power/supply/cros_usbpd-charger.c > index 7e9c3984ef6a..ed8eca28c195 100644 > --- a/drivers/power/supply/cros_usbpd-charger.c > +++ b/drivers/power/supply/cros_usbpd-charger.c > @@ -5,9 +5,10 @@ > * Copyright (c) 2014 - 2018 Google, Inc > */ > > -#include <linux/module.h> > #include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > +#include <linux/module.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <linux/power_supply.h> > #include <linux/slab.h> > diff --git a/drivers/pwm/pwm-cros-ec.c b/drivers/pwm/pwm-cros-ec.c > index 98f6ac6cf6ab..85bea2d40b7d 100644 > --- a/drivers/pwm/pwm-cros-ec.c > +++ b/drivers/pwm/pwm-cros-ec.c > @@ -6,8 +6,8 @@ > */ > > #include <linux/module.h> > -#include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <linux/pwm.h> > #include <linux/slab.h> > diff --git a/drivers/rtc/rtc-cros-ec.c b/drivers/rtc/rtc-cros-ec.c > index 4d6bf9304ceb..6909e01936d9 100644 > --- a/drivers/rtc/rtc-cros-ec.c > +++ b/drivers/rtc/rtc-cros-ec.c > @@ -6,8 +6,9 @@ > > #include <linux/kernel.h> > #include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > #include <linux/module.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <linux/rtc.h> > #include <linux/slab.h> > diff --git a/include/linux/iio/common/cros_ec_sensors_core.h b/include/linux/iio/common/cros_ec_sensors_core.h > index ce16445411ac..8a91669f5bed 100644 > --- a/include/linux/iio/common/cros_ec_sensors_core.h > +++ b/include/linux/iio/common/cros_ec_sensors_core.h > @@ -18,7 +18,8 @@ > > #include <linux/iio/iio.h> > #include <linux/irqreturn.h> > -#include <linux/mfd/cros_ec.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > > enum { > CROS_EC_SENSOR_X, > diff --git a/include/linux/mfd/cros_ec.h b/include/linux/mfd/cros_ec.h > index 2a1372d167b9..e0bae49535e1 100644 > --- a/include/linux/mfd/cros_ec.h > +++ b/include/linux/mfd/cros_ec.h > @@ -16,184 +16,7 @@ > #ifndef __LINUX_MFD_CROS_EC_H > #define __LINUX_MFD_CROS_EC_H > > -#include <linux/cdev.h> > #include <linux/device.h> > -#include <linux/notifier.h> > -#include <linux/mfd/cros_ec_commands.h> > -#include <linux/mutex.h> > - > -#define CROS_EC_DEV_NAME "cros_ec" > -#define CROS_EC_DEV_FP_NAME "cros_fp" > -#define CROS_EC_DEV_PD_NAME "cros_pd" > -#define CROS_EC_DEV_TP_NAME "cros_tp" > -#define CROS_EC_DEV_ISH_NAME "cros_ish" > - > -/* > - * The EC is unresponsive for a time after a reboot command. Add a > - * simple delay to make sure that the bus stays locked. > - */ > -#define EC_REBOOT_DELAY_MS 50 > - > -/* > - * Max bus-specific overhead incurred by request/responses. > - * I2C requires 1 additional byte for requests. > - * I2C requires 2 additional bytes for responses. > - * SPI requires up to 32 additional bytes for responses. > - */ > -#define EC_PROTO_VERSION_UNKNOWN 0 > -#define EC_MAX_REQUEST_OVERHEAD 1 > -#define EC_MAX_RESPONSE_OVERHEAD 32 > - > -/* > - * Command interface between EC and AP, for LPC, I2C and SPI interfaces. > - */ > -enum { > - EC_MSG_TX_HEADER_BYTES = 3, > - EC_MSG_TX_TRAILER_BYTES = 1, > - EC_MSG_TX_PROTO_BYTES = EC_MSG_TX_HEADER_BYTES + > - EC_MSG_TX_TRAILER_BYTES, > - EC_MSG_RX_PROTO_BYTES = 3, > - > - /* Max length of messages for proto 2*/ > - EC_PROTO2_MSG_BYTES = EC_PROTO2_MAX_PARAM_SIZE + > - EC_MSG_TX_PROTO_BYTES, > - > - EC_MAX_MSG_BYTES = 64 * 1024, > -}; > - > -/** > - * struct cros_ec_command - Information about a ChromeOS EC command. > - * @version: Command version number (often 0). > - * @command: Command to send (EC_CMD_...). > - * @outsize: Outgoing length in bytes. > - * @insize: Max number of bytes to accept from the EC. > - * @result: EC's response to the command (separate from communication failure). > - * @data: Where to put the incoming data from EC and outgoing data to EC. > - */ > -struct cros_ec_command { > - uint32_t version; > - uint32_t command; > - uint32_t outsize; > - uint32_t insize; > - uint32_t result; > - uint8_t data[0]; > -}; > - > -/** > - * struct cros_ec_device - Information about a ChromeOS EC device. > - * @phys_name: Name of physical comms layer (e.g. 'i2c-4'). > - * @dev: Device pointer for physical comms device > - * @was_wake_device: True if this device was set to wake the system from > - * sleep at the last suspend. > - * @cros_class: The class structure for this device. > - * @cmd_readmem: Direct read of the EC memory-mapped region, if supported. > - * @offset: Is within EC_LPC_ADDR_MEMMAP region. > - * @bytes: Number of bytes to read. zero means "read a string" (including > - * the trailing '\0'). At most only EC_MEMMAP_SIZE bytes can be > - * read. Caller must ensure that the buffer is large enough for the > - * result when reading a string. > - * @max_request: Max size of message requested. > - * @max_response: Max size of message response. > - * @max_passthru: Max sice of passthru message. > - * @proto_version: The protocol version used for this device. > - * @priv: Private data. > - * @irq: Interrupt to use. > - * @id: Device id. > - * @din: Input buffer (for data from EC). This buffer will always be > - * dword-aligned and include enough space for up to 7 word-alignment > - * bytes also, so we can ensure that the body of the message is always > - * dword-aligned (64-bit). We use this alignment to keep ARM and x86 > - * happy. Probably word alignment would be OK, there might be a small > - * performance advantage to using dword. > - * @dout: Output buffer (for data to EC). This buffer will always be > - * dword-aligned and include enough space for up to 7 word-alignment > - * bytes also, so we can ensure that the body of the message is always > - * dword-aligned (64-bit). We use this alignment to keep ARM and x86 > - * happy. Probably word alignment would be OK, there might be a small > - * performance advantage to using dword. > - * @din_size: Size of din buffer to allocate (zero to use static din). > - * @dout_size: Size of dout buffer to allocate (zero to use static dout). > - * @wake_enabled: True if this device can wake the system from sleep. > - * @suspended: True if this device had been suspended. > - * @cmd_xfer: Send command to EC and get response. > - * Returns the number of bytes received if the communication > - * succeeded, but that doesn't mean the EC was happy with the > - * command. The caller should check msg.result for the EC's result > - * code. > - * @pkt_xfer: Send packet to EC and get response. > - * @lock: One transaction at a time. > - * @mkbp_event_supported: True if this EC supports the MKBP event protocol. > - * @host_sleep_v1: True if this EC supports the sleep v1 command. > - * @event_notifier: Interrupt event notifier for transport devices. > - * @event_data: Raw payload transferred with the MKBP event. > - * @event_size: Size in bytes of the event data. > - * @host_event_wake_mask: Mask of host events that cause wake from suspend. > - * @ec: The platform_device used by the mfd driver to interface with the > - * main EC. > - * @pd: The platform_device used by the mfd driver to interface with the > - * PD behind an EC. > - */ > -struct cros_ec_device { > - /* These are used by other drivers that want to talk to the EC */ > - const char *phys_name; > - struct device *dev; > - bool was_wake_device; > - struct class *cros_class; > - int (*cmd_readmem)(struct cros_ec_device *ec, unsigned int offset, > - unsigned int bytes, void *dest); > - > - /* These are used to implement the platform-specific interface */ > - u16 max_request; > - u16 max_response; > - u16 max_passthru; > - u16 proto_version; > - void *priv; > - int irq; > - u8 *din; > - u8 *dout; > - int din_size; > - int dout_size; > - bool wake_enabled; > - bool suspended; > - int (*cmd_xfer)(struct cros_ec_device *ec, > - struct cros_ec_command *msg); > - int (*pkt_xfer)(struct cros_ec_device *ec, > - struct cros_ec_command *msg); > - struct mutex lock; > - bool mkbp_event_supported; > - bool host_sleep_v1; > - struct blocking_notifier_head event_notifier; > - > - struct ec_response_get_next_event_v1 event_data; > - int event_size; > - u32 host_event_wake_mask; > - > - /* The platform devices used by the mfd driver */ > - struct platform_device *ec; > - struct platform_device *pd; > -}; > - > -/** > - * struct cros_ec_sensor_platform - ChromeOS EC sensor platform information. > - * @sensor_num: Id of the sensor, as reported by the EC. > - */ > -struct cros_ec_sensor_platform { > - u8 sensor_num; > -}; > - > -/** > - * struct cros_ec_platform - ChromeOS EC platform information. > - * @ec_name: Name of EC device (e.g. 'cros-ec', 'cros-pd', ...) > - * used in /dev/ and sysfs. > - * @cmd_offset: Offset to apply for each command. Set when > - * registering a device behind another one. > - */ > -struct cros_ec_platform { > - const char *ec_name; > - u16 cmd_offset; > -}; > - > -struct cros_ec_debugfs; > > /** > * struct cros_ec_dev - ChromeOS EC device entry point. > @@ -217,133 +40,4 @@ struct cros_ec_dev { > > #define to_cros_ec_dev(dev) container_of(dev, struct cros_ec_dev, class_dev) > > -/** > - * cros_ec_suspend() - Handle a suspend operation for the ChromeOS EC device. > - * @ec_dev: Device to suspend. > - * > - * This can be called by drivers to handle a suspend event. > - * > - * Return: 0 on success or negative error code. > - */ > -int cros_ec_suspend(struct cros_ec_device *ec_dev); > - > -/** > - * cros_ec_resume() - Handle a resume operation for the ChromeOS EC device. > - * @ec_dev: Device to resume. > - * > - * This can be called by drivers to handle a resume event. > - * > - * Return: 0 on success or negative error code. > - */ > -int cros_ec_resume(struct cros_ec_device *ec_dev); > - > -/** > - * cros_ec_prepare_tx() - Prepare an outgoing message in the output buffer. > - * @ec_dev: Device to register. > - * @msg: Message to write. > - * > - * This is intended to be used by all ChromeOS EC drivers, but at present > - * only SPI uses it. Once LPC uses the same protocol it can start using it. > - * I2C could use it now, with a refactor of the existing code. > - * > - * Return: 0 on success or negative error code. > - */ > -int cros_ec_prepare_tx(struct cros_ec_device *ec_dev, > - struct cros_ec_command *msg); > - > -/** > - * cros_ec_check_result() - Check ec_msg->result. > - * @ec_dev: EC device. > - * @msg: Message to check. > - * > - * This is used by ChromeOS EC drivers to check the ec_msg->result for > - * errors and to warn about them. > - * > - * Return: 0 on success or negative error code. > - */ > -int cros_ec_check_result(struct cros_ec_device *ec_dev, > - struct cros_ec_command *msg); > - > -/** > - * cros_ec_cmd_xfer() - Send a command to the ChromeOS EC. > - * @ec_dev: EC device. > - * @msg: Message to write. > - * > - * Call this to send a command to the ChromeOS EC. This should be used > - * instead of calling the EC's cmd_xfer() callback directly. > - * > - * Return: 0 on success or negative error code. > - */ > -int cros_ec_cmd_xfer(struct cros_ec_device *ec_dev, > - struct cros_ec_command *msg); > - > -/** > - * cros_ec_cmd_xfer_status() - Send a command to the ChromeOS EC. > - * @ec_dev: EC device. > - * @msg: Message to write. > - * > - * This function is identical to cros_ec_cmd_xfer, except it returns success > - * status only if both the command was transmitted successfully and the EC > - * replied with success status. It's not necessary to check msg->result when > - * using this function. > - * > - * Return: The number of bytes transferred on success or negative error code. > - */ > -int cros_ec_cmd_xfer_status(struct cros_ec_device *ec_dev, > - struct cros_ec_command *msg); > - > -/** > - * cros_ec_register() - Register a new ChromeOS EC, using the provided info. > - * @ec_dev: Device to register. > - * > - * Before calling this, allocate a pointer to a new device and then fill > - * in all the fields up to the --private-- marker. > - * > - * Return: 0 on success or negative error code. > - */ > -int cros_ec_register(struct cros_ec_device *ec_dev); > - > -/** > - * cros_ec_unregister() - Remove a ChromeOS EC. > - * @ec_dev: Device to unregister. > - * > - * Call this to deregister a ChromeOS EC, then clean up any private data. > - * > - * Return: 0 on success or negative error code. > - */ > -int cros_ec_unregister(struct cros_ec_device *ec_dev); > - > -/** > - * cros_ec_query_all() - Query the protocol version supported by the > - * ChromeOS EC. > - * @ec_dev: Device to register. > - * > - * Return: 0 on success or negative error code. > - */ > -int cros_ec_query_all(struct cros_ec_device *ec_dev); > - > -/** > - * cros_ec_get_next_event() - Fetch next event from the ChromeOS EC. > - * @ec_dev: Device to fetch event from. > - * @wake_event: Pointer to a bool set to true upon return if the event might be > - * treated as a wake event. Ignored if null. > - * > - * Return: negative error code on errors; 0 for no data; or else number of > - * bytes received (i.e., an event was retrieved successfully). Event types are > - * written out to @ec_dev->event_data.event_type on success. > - */ > -int cros_ec_get_next_event(struct cros_ec_device *ec_dev, bool *wake_event); > - > -/** > - * cros_ec_get_host_event() - Return a mask of event set by the ChromeOS EC. > - * @ec_dev: Device to fetch event from. > - * > - * When MKBP is supported, when the EC raises an interrupt, we collect the > - * events raised and call the functions in the ec notifier. This function > - * is a helper to know which events are raised. > - * > - * Return: 0 on error or non-zero bitmask of one or more EC_HOST_EVENT_*. > - */ > -u32 cros_ec_get_host_event(struct cros_ec_device *ec_dev); > - > #endif /* __LINUX_MFD_CROS_EC_H */ > diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h > similarity index 100% > rename from include/linux/mfd/cros_ec_commands.h > rename to include/linux/platform_data/cros_ec_commands.h > diff --git a/include/linux/platform_data/cros_ec_proto.h b/include/linux/platform_data/cros_ec_proto.h > new file mode 100644 > index 000000000000..34dd9e5c1779 > --- /dev/null > +++ b/include/linux/platform_data/cros_ec_proto.h > @@ -0,0 +1,315 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * ChromeOS Embedded Controller protocol interface. > + * > + * Copyright (C) 2012 Google, Inc > + */ > + > +#ifndef __LINUX_CROS_EC_PROTO_H > +#define __LINUX_CROS_EC_PROTO_H > + > +#include <linux/device.h> > +#include <linux/mutex.h> > +#include <linux/notifier.h> > + > +#define CROS_EC_DEV_NAME "cros_ec" > +#define CROS_EC_DEV_FP_NAME "cros_fp" > +#define CROS_EC_DEV_ISH_NAME "cros_ish" > +#define CROS_EC_DEV_PD_NAME "cros_pd" > +#define CROS_EC_DEV_TP_NAME "cros_tp" > + > +/* > + * The EC is unresponsive for a time after a reboot command. Add a > + * simple delay to make sure that the bus stays locked. > + */ > +#define EC_REBOOT_DELAY_MS 50 > + > +/* > + * Max bus-specific overhead incurred by request/responses. > + * I2C requires 1 additional byte for requests. > + * I2C requires 2 additional bytes for responses. > + * SPI requires up to 32 additional bytes for responses. > + */ > +#define EC_PROTO_VERSION_UNKNOWN 0 > +#define EC_MAX_REQUEST_OVERHEAD 1 > +#define EC_MAX_RESPONSE_OVERHEAD 32 > + > +/* > + * Command interface between EC and AP, for LPC, I2C and SPI interfaces. > + */ > +enum { > + EC_MSG_TX_HEADER_BYTES = 3, > + EC_MSG_TX_TRAILER_BYTES = 1, > + EC_MSG_TX_PROTO_BYTES = EC_MSG_TX_HEADER_BYTES + > + EC_MSG_TX_TRAILER_BYTES, > + EC_MSG_RX_PROTO_BYTES = 3, > + > + /* Max length of messages for proto 2*/ > + EC_PROTO2_MSG_BYTES = EC_PROTO2_MAX_PARAM_SIZE + > + EC_MSG_TX_PROTO_BYTES, > + > + EC_MAX_MSG_BYTES = 64 * 1024, > +}; > + > +/** > + * struct cros_ec_command - Information about a ChromeOS EC command. > + * @version: Command version number (often 0). > + * @command: Command to send (EC_CMD_...). > + * @outsize: Outgoing length in bytes. > + * @insize: Max number of bytes to accept from the EC. > + * @result: EC's response to the command (separate from communication failure). > + * @data: Where to put the incoming data from EC and outgoing data to EC. > + */ > +struct cros_ec_command { > + uint32_t version; > + uint32_t command; > + uint32_t outsize; > + uint32_t insize; > + uint32_t result; > + uint8_t data[0]; > +}; > + > +/** > + * struct cros_ec_device - Information about a ChromeOS EC device. > + * @phys_name: Name of physical comms layer (e.g. 'i2c-4'). > + * @dev: Device pointer for physical comms device > + * @was_wake_device: True if this device was set to wake the system from > + * sleep at the last suspend. > + * @cros_class: The class structure for this device. > + * @cmd_readmem: Direct read of the EC memory-mapped region, if supported. > + * @offset: Is within EC_LPC_ADDR_MEMMAP region. > + * @bytes: Number of bytes to read. zero means "read a string" (including > + * the trailing '\0'). At most only EC_MEMMAP_SIZE bytes can be > + * read. Caller must ensure that the buffer is large enough for the > + * result when reading a string. > + * @max_request: Max size of message requested. > + * @max_response: Max size of message response. > + * @max_passthru: Max sice of passthru message. > + * @proto_version: The protocol version used for this device. > + * @priv: Private data. > + * @irq: Interrupt to use. > + * @id: Device id. > + * @din: Input buffer (for data from EC). This buffer will always be > + * dword-aligned and include enough space for up to 7 word-alignment > + * bytes also, so we can ensure that the body of the message is always > + * dword-aligned (64-bit). We use this alignment to keep ARM and x86 > + * happy. Probably word alignment would be OK, there might be a small > + * performance advantage to using dword. > + * @dout: Output buffer (for data to EC). This buffer will always be > + * dword-aligned and include enough space for up to 7 word-alignment > + * bytes also, so we can ensure that the body of the message is always > + * dword-aligned (64-bit). We use this alignment to keep ARM and x86 > + * happy. Probably word alignment would be OK, there might be a small > + * performance advantage to using dword. > + * @din_size: Size of din buffer to allocate (zero to use static din). > + * @dout_size: Size of dout buffer to allocate (zero to use static dout). > + * @wake_enabled: True if this device can wake the system from sleep. > + * @suspended: True if this device had been suspended. > + * @cmd_xfer: Send command to EC and get response. > + * Returns the number of bytes received if the communication > + * succeeded, but that doesn't mean the EC was happy with the > + * command. The caller should check msg.result for the EC's result > + * code. > + * @pkt_xfer: Send packet to EC and get response. > + * @lock: One transaction at a time. > + * @mkbp_event_supported: True if this EC supports the MKBP event protocol. > + * @host_sleep_v1: True if this EC supports the sleep v1 command. > + * @event_notifier: Interrupt event notifier for transport devices. > + * @event_data: Raw payload transferred with the MKBP event. > + * @event_size: Size in bytes of the event data. > + * @host_event_wake_mask: Mask of host events that cause wake from suspend. > + * @ec: The platform_device used by the mfd driver to interface with the > + * main EC. > + * @pd: The platform_device used by the mfd driver to interface with the > + * PD behind an EC. > + */ > +struct cros_ec_device { > + /* These are used by other drivers that want to talk to the EC */ > + const char *phys_name; > + struct device *dev; > + bool was_wake_device; > + struct class *cros_class; > + int (*cmd_readmem)(struct cros_ec_device *ec, unsigned int offset, > + unsigned int bytes, void *dest); > + > + /* These are used to implement the platform-specific interface */ > + u16 max_request; > + u16 max_response; > + u16 max_passthru; > + u16 proto_version; > + void *priv; > + int irq; > + u8 *din; > + u8 *dout; > + int din_size; > + int dout_size; > + bool wake_enabled; > + bool suspended; > + int (*cmd_xfer)(struct cros_ec_device *ec, > + struct cros_ec_command *msg); > + int (*pkt_xfer)(struct cros_ec_device *ec, > + struct cros_ec_command *msg); > + struct mutex lock; > + bool mkbp_event_supported; > + bool host_sleep_v1; > + struct blocking_notifier_head event_notifier; > + > + struct ec_response_get_next_event_v1 event_data; > + int event_size; > + u32 host_event_wake_mask; > + > + /* The platform devices used by the mfd driver */ > + struct platform_device *ec; > + struct platform_device *pd; > +}; > + > +/** > + * struct cros_ec_sensor_platform - ChromeOS EC sensor platform information. > + * @sensor_num: Id of the sensor, as reported by the EC. > + */ > +struct cros_ec_sensor_platform { > + u8 sensor_num; > +}; > + > +/** > + * struct cros_ec_platform - ChromeOS EC platform information. > + * @ec_name: Name of EC device (e.g. 'cros-ec', 'cros-pd', ...) > + * used in /dev/ and sysfs. > + * @cmd_offset: Offset to apply for each command. Set when > + * registering a device behind another one. > + */ > +struct cros_ec_platform { > + const char *ec_name; > + u16 cmd_offset; > +}; > + > +/** > + * cros_ec_suspend() - Handle a suspend operation for the ChromeOS EC device. > + * @ec_dev: Device to suspend. > + * > + * This can be called by drivers to handle a suspend event. > + * > + * Return: 0 on success or negative error code. > + */ > +int cros_ec_suspend(struct cros_ec_device *ec_dev); > + > +/** > + * cros_ec_resume() - Handle a resume operation for the ChromeOS EC device. > + * @ec_dev: Device to resume. > + * > + * This can be called by drivers to handle a resume event. > + * > + * Return: 0 on success or negative error code. > + */ > +int cros_ec_resume(struct cros_ec_device *ec_dev); > + > +/** > + * cros_ec_prepare_tx() - Prepare an outgoing message in the output buffer. > + * @ec_dev: Device to register. > + * @msg: Message to write. > + * > + * This is intended to be used by all ChromeOS EC drivers, but at present > + * only SPI uses it. Once LPC uses the same protocol it can start using it. > + * I2C could use it now, with a refactor of the existing code. > + * > + * Return: 0 on success or negative error code. > + */ > +int cros_ec_prepare_tx(struct cros_ec_device *ec_dev, > + struct cros_ec_command *msg); > + > +/** > + * cros_ec_check_result() - Check ec_msg->result. > + * @ec_dev: EC device. > + * @msg: Message to check. > + * > + * This is used by ChromeOS EC drivers to check the ec_msg->result for > + * errors and to warn about them. > + * > + * Return: 0 on success or negative error code. > + */ > +int cros_ec_check_result(struct cros_ec_device *ec_dev, > + struct cros_ec_command *msg); > + > +/** > + * cros_ec_cmd_xfer() - Send a command to the ChromeOS EC. > + * @ec_dev: EC device. > + * @msg: Message to write. > + * > + * Call this to send a command to the ChromeOS EC. This should be used > + * instead of calling the EC's cmd_xfer() callback directly. > + * > + * Return: 0 on success or negative error code. > + */ > +int cros_ec_cmd_xfer(struct cros_ec_device *ec_dev, > + struct cros_ec_command *msg); > + > +/** > + * cros_ec_cmd_xfer_status() - Send a command to the ChromeOS EC. > + * @ec_dev: EC device. > + * @msg: Message to write. > + * > + * This function is identical to cros_ec_cmd_xfer, except it returns success > + * status only if both the command was transmitted successfully and the EC > + * replied with success status. It's not necessary to check msg->result when > + * using this function. > + * > + * Return: The number of bytes transferred on success or negative error code. > + */ > +int cros_ec_cmd_xfer_status(struct cros_ec_device *ec_dev, > + struct cros_ec_command *msg); > + > +/** > + * cros_ec_register() - Register a new ChromeOS EC, using the provided info. > + * @ec_dev: Device to register. > + * > + * Before calling this, allocate a pointer to a new device and then fill > + * in all the fields up to the --private-- marker. > + * > + * Return: 0 on success or negative error code. > + */ > +int cros_ec_register(struct cros_ec_device *ec_dev); > + > +/** > + * cros_ec_unregister() - Remove a ChromeOS EC. > + * @ec_dev: Device to unregister. > + * > + * Call this to deregister a ChromeOS EC, then clean up any private data. > + * > + * Return: 0 on success or negative error code. > + */ > +int cros_ec_unregister(struct cros_ec_device *ec_dev); > + > +/** > + * cros_ec_query_all() - Query the protocol version supported by the > + * ChromeOS EC. > + * @ec_dev: Device to register. > + * > + * Return: 0 on success or negative error code. > + */ > +int cros_ec_query_all(struct cros_ec_device *ec_dev); > + > +/** > + * cros_ec_get_next_event() - Fetch next event from the ChromeOS EC. > + * @ec_dev: Device to fetch event from. > + * @wake_event: Pointer to a bool set to true upon return if the event might be > + * treated as a wake event. Ignored if null. > + * > + * Return: negative error code on errors; 0 for no data; or else number of > + * bytes received (i.e., an event was retrieved successfully). Event types are > + * written out to @ec_dev->event_data.event_type on success. > + */ > +int cros_ec_get_next_event(struct cros_ec_device *ec_dev, bool *wake_event); > + > +/** > + * cros_ec_get_host_event() - Return a mask of event set by the ChromeOS EC. > + * @ec_dev: Device to fetch event from. > + * > + * When MKBP is supported, when the EC raises an interrupt, we collect the > + * events raised and call the functions in the ec notifier. This function > + * is a helper to know which events are raised. > + * > + * Return: 0 on error or non-zero bitmask of one or more EC_HOST_EVENT_*. > + */ > +u32 cros_ec_get_host_event(struct cros_ec_device *ec_dev); > + > +#endif /* __LINUX_CROS_EC_PROTO_H */ > diff --git a/sound/soc/codecs/cros_ec_codec.c b/sound/soc/codecs/cros_ec_codec.c > index 87830ed5ebf4..79bb4081d3c2 100644 > --- a/sound/soc/codecs/cros_ec_codec.c > +++ b/sound/soc/codecs/cros_ec_codec.c > @@ -9,9 +9,9 @@ > #include <linux/delay.h> > #include <linux/device.h> > #include <linux/kernel.h> > -#include <linux/mfd/cros_ec.h> > -#include <linux/mfd/cros_ec_commands.h> > #include <linux/module.h> > +#include <linux/platform_data/cros_ec_commands.h> > +#include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > #include <sound/pcm.h> > #include <sound/pcm_params.h> > -- Best Regards, Chanwoo Choi Samsung Electronics

1 0

[alsa-devel] [PATCH] ASoC: rt5514-spi: don't use snd_soc_lookup_component()
by Kuninori Morimoto 20 Jun '19

20 Jun '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> rt5514-spi can use dev_get_drvdata() to get its component because it is using snd_soc_component_set_drvdata(); static int rt5514_spi_pcm_probe(...) { ... => snd_soc_component_set_drvdata(component, ...); ... } We don't need to use snd_soc_lookup_component() for it. This patch uses dev_get_drvdata() instead of snd_soc_lookup_component(). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/codecs/rt5514-spi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c index 94c8149..d62c185 100644 --- a/sound/soc/codecs/rt5514-spi.c +++ b/sound/soc/codecs/rt5514-spi.c @@ -474,9 +474,7 @@ static int __maybe_unused rt5514_suspend(struct device *dev) static int __maybe_unused rt5514_resume(struct device *dev) { - struct snd_soc_component *component = snd_soc_lookup_component(dev, DRV_NAME); - struct rt5514_dsp *rt5514_dsp = - snd_soc_component_get_drvdata(component); + struct rt5514_dsp *rt5514_dsp = dev_get_drvdata(dev); int irq = to_spi_device(dev)->irq; u8 buf[8]; -- 2.7.4

1 0

[alsa-devel] [asoc:for-5.3 362/362] sound//soc/soc-core.c:1051:11: error: 'struct snd_soc_dai_link' has no member named 'dobj'
by kbuild test robot 20 Jun '19

20 Jun '19

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.3 head: 9b3941a8fcdd77d9f17f36f48d84bf6f1ba1a0fb commit: 9b3941a8fcdd77d9f17f36f48d84bf6f1ba1a0fb [362/362] ASoC: soc.h: dobj is used only when SND_SOC_TOPOLOGY config: x86_64-randconfig-r0-06200024 (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: git checkout 9b3941a8fcdd77d9f17f36f48d84bf6f1ba1a0fb # save the attached .config to linux build tree make ARCH=x86_64 If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> All error/warnings (new ones prefixed by >>): In file included from include/linux/export.h:45:0, from include/linux/linkage.h:7, from include/linux/kernel.h:8, from include/linux/list.h:9, from include/linux/module.h:9, from sound//soc/soc-core.c:20: sound//soc/soc-core.c: In function 'soc_remove_dai_links': >> sound//soc/soc-core.c:1051:11: error: 'struct snd_soc_dai_link' has no member named 'dobj' if (link->dobj.type == SND_SOC_DOBJ_DAI_LINK) ^ include/linux/compiler.h:58:52: note: in definition of macro '__trace_if_var' #define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond)) ^~~~ >> sound//soc/soc-core.c:1051:3: note: in expansion of macro 'if' if (link->dobj.type == SND_SOC_DOBJ_DAI_LINK) ^~ >> sound//soc/soc-core.c:1051:11: error: 'struct snd_soc_dai_link' has no member named 'dobj' if (link->dobj.type == SND_SOC_DOBJ_DAI_LINK) ^ include/linux/compiler.h:58:61: note: in definition of macro '__trace_if_var' #define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond)) ^~~~ >> sound//soc/soc-core.c:1051:3: note: in expansion of macro 'if' if (link->dobj.type == SND_SOC_DOBJ_DAI_LINK) ^~ >> sound//soc/soc-core.c:1051:11: error: 'struct snd_soc_dai_link' has no member named 'dobj' if (link->dobj.type == SND_SOC_DOBJ_DAI_LINK) ^ include/linux/compiler.h:69:3: note: in definition of macro '__trace_if_value' (cond) ? \ ^~~~ include/linux/compiler.h:56:28: note: in expansion of macro '__trace_if_var' #define if(cond, ...) if ( __trace_if_var( !!(cond , ## __VA_ARGS__) ) ) ^~~~~~~~~~~~~~ >> sound//soc/soc-core.c:1051:3: note: in expansion of macro 'if' if (link->dobj.type == SND_SOC_DOBJ_DAI_LINK) ^~ sound//soc/soc-core.c: In function 'snd_soc_add_dai_link': sound//soc/soc-core.c:1187:14: error: 'struct snd_soc_dai_link' has no member named 'dobj' if (dai_link->dobj.type ^ include/linux/compiler.h:58:52: note: in definition of macro '__trace_if_var' #define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond)) ^~~~ sound//soc/soc-core.c:1187:2: note: in expansion of macro 'if' if (dai_link->dobj.type ^~ sound//soc/soc-core.c:1188:17: error: 'struct snd_soc_dai_link' has no member named 'dobj' && dai_link->dobj.type != SND_SOC_DOBJ_DAI_LINK) { ^ include/linux/compiler.h:58:52: note: in definition of macro '__trace_if_var' #define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond)) ^~~~ sound//soc/soc-core.c:1187:2: note: in expansion of macro 'if' if (dai_link->dobj.type ^~ sound//soc/soc-core.c:1187:14: error: 'struct snd_soc_dai_link' has no member named 'dobj' if (dai_link->dobj.type ^ include/linux/compiler.h:58:61: note: in definition of macro '__trace_if_var' #define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond)) ^~~~ sound//soc/soc-core.c:1187:2: note: in expansion of macro 'if' if (dai_link->dobj.type ^~ sound//soc/soc-core.c:1188:17: error: 'struct snd_soc_dai_link' has no member named 'dobj' && dai_link->dobj.type != SND_SOC_DOBJ_DAI_LINK) { ^ include/linux/compiler.h:58:61: note: in definition of macro '__trace_if_var' #define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond)) ^~~~ sound//soc/soc-core.c:1187:2: note: in expansion of macro 'if' if (dai_link->dobj.type ^~ sound//soc/soc-core.c:1187:14: error: 'struct snd_soc_dai_link' has no member named 'dobj' if (dai_link->dobj.type ^ include/linux/compiler.h:69:3: note: in definition of macro '__trace_if_value' (cond) ? \ ^~~~ include/linux/compiler.h:56:28: note: in expansion of macro '__trace_if_var' #define if(cond, ...) if ( __trace_if_var( !!(cond , ## __VA_ARGS__) ) ) ^~~~~~~~~~~~~~ sound//soc/soc-core.c:1187:2: note: in expansion of macro 'if' if (dai_link->dobj.type ^~ sound//soc/soc-core.c:1188:17: error: 'struct snd_soc_dai_link' has no member named 'dobj' && dai_link->dobj.type != SND_SOC_DOBJ_DAI_LINK) { ^ include/linux/compiler.h:69:3: note: in definition of macro '__trace_if_value' (cond) ? \ ^~~~ include/linux/compiler.h:56:28: note: in expansion of macro '__trace_if_var' #define if(cond, ...) if ( __trace_if_var( !!(cond , ## __VA_ARGS__) ) ) ^~~~~~~~~~~~~~ sound//soc/soc-core.c:1187:2: note: in expansion of macro 'if' if (dai_link->dobj.type ^~ In file included from include/linux/platform_device.h:14:0, from sound//soc/soc-core.c:27: sound//soc/soc-core.c:1190:12: error: 'struct snd_soc_dai_link' has no member named 'dobj' dai_link->dobj.type); ^ include/linux/device.h:1483:32: note: in definition of macro 'dev_err' _dev_err(dev, dev_fmt(fmt), ##__VA_ARGS__) ^~~~~~~~~~~ In file included from include/linux/export.h:45:0, from include/linux/linkage.h:7, from include/linux/kernel.h:8, from include/linux/list.h:9, from include/linux/module.h:9, from sound//soc/soc-core.c:20: sound//soc/soc-core.c:1199:14: error: 'struct snd_soc_dai_link' has no member named 'dobj' if (dai_link->dobj.type && card->add_dai_link) ^ include/linux/compiler.h:58:52: note: in definition of macro '__trace_if_var' #define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond)) ^~~~ sound//soc/soc-core.c:1199:2: note: in expansion of macro 'if' if (dai_link->dobj.type && card->add_dai_link) ^~ sound//soc/soc-core.c:1199:14: error: 'struct snd_soc_dai_link' has no member named 'dobj' if (dai_link->dobj.type && card->add_dai_link) ^ include/linux/compiler.h:58:61: note: in definition of macro '__trace_if_var' #define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond)) ^~~~ sound//soc/soc-core.c:1199:2: note: in expansion of macro 'if' if (dai_link->dobj.type && card->add_dai_link) ^~ sound//soc/soc-core.c:1199:14: error: 'struct snd_soc_dai_link' has no member named 'dobj' if (dai_link->dobj.type && card->add_dai_link) ^ include/linux/compiler.h:69:3: note: in definition of macro '__trace_if_value' (cond) ? \ vim +1051 sound//soc/soc-core.c 62ae68fa5 Stephen Warren 2012-06-08 1033 0671fd8ef Kuninori Morimoto 2011-04-08 1034 static void soc_remove_dai_links(struct snd_soc_card *card) 0671fd8ef Kuninori Morimoto 2011-04-08 1035 { 1a497983a Mengdong Lin 2015-11-18 1036 int order; 1a497983a Mengdong Lin 2015-11-18 1037 struct snd_soc_pcm_runtime *rtd; f8f80361d Mengdong Lin 2015-12-02 1038 struct snd_soc_dai_link *link, *_link; 0671fd8ef Kuninori Morimoto 2011-04-08 1039 1a1035a98 Kuninori Morimoto 2018-09-18 1040 for_each_comp_order(order) { bcb1fd1fc Kuninori Morimoto 2018-09-18 1041 for_each_card_rtds(card, rtd) 1a497983a Mengdong Lin 2015-11-18 1042 soc_remove_link_dais(card, rtd, order); 62ae68fa5 Stephen Warren 2012-06-08 1043 } 62ae68fa5 Stephen Warren 2012-06-08 1044 1a1035a98 Kuninori Morimoto 2018-09-18 1045 for_each_comp_order(order) { bcb1fd1fc Kuninori Morimoto 2018-09-18 1046 for_each_card_rtds(card, rtd) 1a497983a Mengdong Lin 2015-11-18 1047 soc_remove_link_components(card, rtd, order); 0168bf0d1 Liam Girdwood 2011-06-07 1048 } 62ae68fa5 Stephen Warren 2012-06-08 1049 98061fdbf Kuninori Morimoto 2018-09-18 1050 for_each_card_links_safe(card, link, _link) { f8f80361d Mengdong Lin 2015-12-02 @1051 if (link->dobj.type == SND_SOC_DOBJ_DAI_LINK) f8f80361d Mengdong Lin 2015-12-02 1052 dev_warn(card->dev, "Topology forgot to remove link %s?\n", f8f80361d Mengdong Lin 2015-12-02 1053 link->name); f8f80361d Mengdong Lin 2015-12-02 1054 f8f80361d Mengdong Lin 2015-12-02 1055 list_del(&link->list); f8f80361d Mengdong Lin 2015-12-02 1056 } 0671fd8ef Kuninori Morimoto 2011-04-08 1057 } 0671fd8ef Kuninori Morimoto 2011-04-08 1058 :::::: The code at line 1051 was first introduced by commit :::::: f8f80361d07d503093940097e967a7edaa134ca2 ASoC: Implement DAI links in a list & define API to add/remove a link :::::: TO: Mengdong Lin <mengdong.lin(a)linux.intel.com> :::::: CC: Mark Brown <broonie(a)kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] Applied "ASoC: soc.h: dobj is used only when SND_SOC_TOPOLOGY" to the asoc tree
by Mark Brown 20 Jun '19

20 Jun '19

The patch ASoC: soc.h: dobj is used only when SND_SOC_TOPOLOGY has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 9b3941a8fcdd77d9f17f36f48d84bf6f1ba1a0fb Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Date: Wed, 19 Jun 2019 10:28:02 +0900 Subject: [PATCH] ASoC: soc.h: dobj is used only when SND_SOC_TOPOLOGY snd_soc_dobj is used only when SND_SOC_TOPOLOGY was selected. Let's enable it under SND_SOC_TOPOLOGY. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- include/sound/soc.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 64405cdab8bb..4dbfb21c14cf 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -990,7 +990,9 @@ struct snd_soc_dai_link { unsigned int ignore:1; struct list_head list; /* DAI link list of the soc card */ +#ifdef CONFIG_SND_SOC_TOPOLOGY struct snd_soc_dobj dobj; /* For topology */ +#endif }; #define for_each_link_codecs(link, i, codec) \ for ((i) = 0; \ @@ -1297,7 +1299,9 @@ struct soc_mixer_control { unsigned int sign_bit; unsigned int invert:1; unsigned int autodisable:1; +#ifdef CONFIG_SND_SOC_TOPOLOGY struct snd_soc_dobj dobj; +#endif }; struct soc_bytes { @@ -1308,8 +1312,9 @@ struct soc_bytes { struct soc_bytes_ext { int max; +#ifdef CONFIG_SND_SOC_TOPOLOGY struct snd_soc_dobj dobj; - +#endif /* used for TLV byte control */ int (*get)(struct snd_kcontrol *kcontrol, unsigned int __user *bytes, unsigned int size); @@ -1333,7 +1338,9 @@ struct soc_enum { const char * const *texts; const unsigned int *values; unsigned int autodisable:1; +#ifdef CONFIG_SND_SOC_TOPOLOGY struct snd_soc_dobj dobj; +#endif }; /** -- 2.20.1

2 2

[alsa-devel] [bug report] ASoC: codecs: ad193x: Fix frame polarity for DSP_A format
by Dan Carpenter 19 Jun '19

19 Jun '19

Hi Codrin, Linus recently corrected me on one of my patches and I said I would look through the kernel and fix similar bugs as well. The problem I realized is that I'm really stupid and I have forgot how to do math... The patch 90f6e6803139: "ASoC: codecs: ad193x: Fix frame polarity for DSP_A format" from Feb 18, 2019, leads to the following static checker warning: sound/soc/codecs/ad193x.c:244 ad193x_set_dai_fmt() warn: passing casted pointer '&dac_fmt' to 'change_bit()' 32 vs 64. sound/soc/codecs/ad193x.c 194 static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai, 195 unsigned int fmt) 196 { 197 struct ad193x_priv *ad193x = snd_soc_component_get_drvdata(codec_dai->component); 198 unsigned int adc_serfmt = 0; 199 unsigned int dac_serfmt = 0; 200 unsigned int adc_fmt = 0; 201 unsigned int dac_fmt = 0; ^^^^^^^^^^^^^^^^^^^^^^^^ This is a u32. 202 203 /* At present, the driver only support AUX ADC mode(SND_SOC_DAIFMT_I2S 204 * with TDM), ADC&DAC TDM mode(SND_SOC_DAIFMT_DSP_A) and DAC I2S mode 205 * (SND_SOC_DAIFMT_I2S) 206 */ 207 switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { 208 case SND_SOC_DAIFMT_I2S: 209 adc_serfmt |= AD193X_ADC_SERFMT_TDM; 210 dac_serfmt |= AD193X_DAC_SERFMT_STEREO; 211 break; 212 case SND_SOC_DAIFMT_DSP_A: 213 adc_serfmt |= AD193X_ADC_SERFMT_AUX; 214 dac_serfmt |= AD193X_DAC_SERFMT_TDM; 215 break; 216 default: 217 if (ad193x_has_adc(ad193x)) 218 return -EINVAL; 219 } 220 221 switch (fmt & SND_SOC_DAIFMT_INV_MASK) { 222 case SND_SOC_DAIFMT_NB_NF: /* normal bit clock + frame */ 223 break; 224 case SND_SOC_DAIFMT_NB_IF: /* normal bclk + invert frm */ 225 adc_fmt |= AD193X_ADC_LEFT_HIGH; 226 dac_fmt |= AD193X_DAC_LEFT_HIGH; 227 break; 228 case SND_SOC_DAIFMT_IB_NF: /* invert bclk + normal frm */ 229 adc_fmt |= AD193X_ADC_BCLK_INV; 230 dac_fmt |= AD193X_DAC_BCLK_INV; 231 break; 232 case SND_SOC_DAIFMT_IB_IF: /* invert bclk + frm */ 233 adc_fmt |= AD193X_ADC_LEFT_HIGH; 234 adc_fmt |= AD193X_ADC_BCLK_INV; 235 dac_fmt |= AD193X_DAC_LEFT_HIGH; 236 dac_fmt |= AD193X_DAC_BCLK_INV; 237 break; 238 default: 239 return -EINVAL; 240 } 241 242 /* For DSP_*, LRCLK's polarity must be inverted */ 243 if (fmt & SND_SOC_DAIFMT_DSP_A) { 244 change_bit(ffs(AD193X_DAC_LEFT_HIGH) - 1, 245 (unsigned long *)&dac_fmt); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This change_bit() will work on little endian systems but on 64 bit big endian systems it will corrupt memory. I *think* the correct code looks like this, but again, I'm feeling dumb so I might be wrong: dac_fmt ^= 1 << (ffs(AD193X_DAC_LEFT_HIGH) - 1); 246 } 247 regards, dan carpenter

2 1

[alsa-devel] [asoc:for-5.3 362/362] sound/soc/soc-core.c:1051:11: error: 'struct snd_soc_dai_link' has no member named 'dobj'
by kbuild test robot 19 Jun '19

19 Jun '19

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.3 head: 9b3941a8fcdd77d9f17f36f48d84bf6f1ba1a0fb commit: 9b3941a8fcdd77d9f17f36f48d84bf6f1ba1a0fb [362/362] ASoC: soc.h: dobj is used only when SND_SOC_TOPOLOGY config: arm-at91_dt_defconfig (attached as .config) compiler: arm-linux-gnueabi-gcc (GCC) 7.4.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 9b3941a8fcdd77d9f17f36f48d84bf6f1ba1a0fb # save the attached .config to linux build tree GCC_VERSION=7.4.0 make.cross ARCH=arm If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> All errors (new ones prefixed by >>): sound/soc/soc-core.c: In function 'soc_remove_dai_links': >> sound/soc/soc-core.c:1051:11: error: 'struct snd_soc_dai_link' has no member named 'dobj' if (link->dobj.type == SND_SOC_DOBJ_DAI_LINK) ^~ sound/soc/soc-core.c: In function 'snd_soc_add_dai_link': sound/soc/soc-core.c:1187:14: error: 'struct snd_soc_dai_link' has no member named 'dobj' if (dai_link->dobj.type ^~ sound/soc/soc-core.c:1188:17: error: 'struct snd_soc_dai_link' has no member named 'dobj' && dai_link->dobj.type != SND_SOC_DOBJ_DAI_LINK) { ^~ In file included from include/linux/platform_device.h:14:0, from sound/soc/soc-core.c:27: sound/soc/soc-core.c:1190:12: error: 'struct snd_soc_dai_link' has no member named 'dobj' dai_link->dobj.type); ^ include/linux/device.h:1483:32: note: in definition of macro 'dev_err' _dev_err(dev, dev_fmt(fmt), ##__VA_ARGS__) ^~~~~~~~~~~ sound/soc/soc-core.c:1199:14: error: 'struct snd_soc_dai_link' has no member named 'dobj' if (dai_link->dobj.type && card->add_dai_link) ^~ sound/soc/soc-core.c: In function 'snd_soc_remove_dai_link': sound/soc/soc-core.c:1223:14: error: 'struct snd_soc_dai_link' has no member named 'dobj' if (dai_link->dobj.type ^~ sound/soc/soc-core.c:1224:17: error: 'struct snd_soc_dai_link' has no member named 'dobj' && dai_link->dobj.type != SND_SOC_DOBJ_DAI_LINK) { ^~ In file included from include/linux/platform_device.h:14:0, from sound/soc/soc-core.c:27: sound/soc/soc-core.c:1226:12: error: 'struct snd_soc_dai_link' has no member named 'dobj' dai_link->dobj.type); ^ include/linux/device.h:1483:32: note: in definition of macro 'dev_err' _dev_err(dev, dev_fmt(fmt), ##__VA_ARGS__) ^~~~~~~~~~~ sound/soc/soc-core.c:1235:14: error: 'struct snd_soc_dai_link' has no member named 'dobj' if (dai_link->dobj.type && card->remove_dai_link) ^~ vim +1051 sound/soc/soc-core.c 62ae68fa5 Stephen Warren 2012-06-08 1033 0671fd8ef Kuninori Morimoto 2011-04-08 1034 static void soc_remove_dai_links(struct snd_soc_card *card) 0671fd8ef Kuninori Morimoto 2011-04-08 1035 { 1a497983a Mengdong Lin 2015-11-18 1036 int order; 1a497983a Mengdong Lin 2015-11-18 1037 struct snd_soc_pcm_runtime *rtd; f8f80361d Mengdong Lin 2015-12-02 1038 struct snd_soc_dai_link *link, *_link; 0671fd8ef Kuninori Morimoto 2011-04-08 1039 1a1035a98 Kuninori Morimoto 2018-09-18 1040 for_each_comp_order(order) { bcb1fd1fc Kuninori Morimoto 2018-09-18 1041 for_each_card_rtds(card, rtd) 1a497983a Mengdong Lin 2015-11-18 1042 soc_remove_link_dais(card, rtd, order); 62ae68fa5 Stephen Warren 2012-06-08 1043 } 62ae68fa5 Stephen Warren 2012-06-08 1044 1a1035a98 Kuninori Morimoto 2018-09-18 1045 for_each_comp_order(order) { bcb1fd1fc Kuninori Morimoto 2018-09-18 1046 for_each_card_rtds(card, rtd) 1a497983a Mengdong Lin 2015-11-18 1047 soc_remove_link_components(card, rtd, order); 0168bf0d1 Liam Girdwood 2011-06-07 1048 } 62ae68fa5 Stephen Warren 2012-06-08 1049 98061fdbf Kuninori Morimoto 2018-09-18 1050 for_each_card_links_safe(card, link, _link) { f8f80361d Mengdong Lin 2015-12-02 @1051 if (link->dobj.type == SND_SOC_DOBJ_DAI_LINK) f8f80361d Mengdong Lin 2015-12-02 1052 dev_warn(card->dev, "Topology forgot to remove link %s?\n", f8f80361d Mengdong Lin 2015-12-02 1053 link->name); f8f80361d Mengdong Lin 2015-12-02 1054 f8f80361d Mengdong Lin 2015-12-02 1055 list_del(&link->list); f8f80361d Mengdong Lin 2015-12-02 1056 } 0671fd8ef Kuninori Morimoto 2011-04-08 1057 } 0671fd8ef Kuninori Morimoto 2011-04-08 1058 :::::: The code at line 1051 was first introduced by commit :::::: f8f80361d07d503093940097e967a7edaa134ca2 ASoC: Implement DAI links in a list & define API to add/remove a link :::::: TO: Mengdong Lin <mengdong.lin(a)linux.intel.com> :::::: CC: Mark Brown <broonie(a)kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH v3 1/5] ASoC: madera: Add DT bindings for Cirrus Logic Madera codecs
by Charles Keepax 19 Jun '19

19 Jun '19

From: Richard Fitzgerald <rf(a)opensource.cirrus.com> The Cirrus Logic Madera codecs are a family of related codecs with extensive digital and analogue I/O, digital mixing and routing, signal processing and programmable DSPs. Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- Changes since v2: - Minor tweak to out-mono to allow shorter arrays to be passed. Thanks, Charles Documentation/devicetree/bindings/sound/madera.txt | 67 ++++++++++++++++++++++ MAINTAINERS | 1 + include/dt-bindings/sound/madera.h | 29 ++++++++++ 3 files changed, 97 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/madera.txt create mode 100644 include/dt-bindings/sound/madera.h diff --git a/Documentation/devicetree/bindings/sound/madera.txt b/Documentation/devicetree/bindings/sound/madera.txt new file mode 100644 index 0000000000000..5e669ce552f47 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/madera.txt @@ -0,0 +1,67 @@ +Cirrus Logic Madera class audio codecs + +This describes audio configuration bindings for these codecs. + +See also the core bindings for the parent MFD driver: +See Documentation/devicetree/bindings/mfd/madera.txt + +and defines for values used in these bindings: +include/dt-bindings/sound/madera.h + +These properties are all contained in the parent MFD node. + +Optional properties: + - cirrus,dmic-ref : Indicates how the MICBIAS pins have been externally + connected to DMICs on each input, one cell per input. + <IN1 IN2 IN3 ...> + A value of 0 indicates MICVDD and is the default, other values depend on the + codec: + For CS47L35 one of the CS47L35_DMIC_REF_xxx values + For all other codecs one of the MADERA_DMIC_REF_xxx values + Also see the datasheet for a description of the INn_DMIC_SUP field. + + - cirrus,inmode : A list of input mode settings for each input. A maximum of + 16 cells, with four cells per input in the order INnAL, INnAR INnBL INnBR. + For non-muxed inputs the first two cells for that input set the mode for + the left and right channel and the second two cells must be 0. + For muxed inputs the first two cells for that input set the mode of the + left and right A inputs and the second two cells set the mode of the left + and right B inputs. + Valid mode values are one of the MADERA_INMODE_xxx. If the array is shorter + than the number of inputs the unspecified inputs default to + MADERA_INMODE_DIFF. + + - cirrus,out-mono : Mono bit for each output, maximum of six cells if the + array is shorter outputs will be set to stereo. + + - cirrus,max-channels-clocked : Maximum number of channels that I2S clocks + will be generated for. Useful when clock master for systems where the I2S + bus has multiple data lines. + One cell for each AIF, use a value of zero for AIFs that should be handled + normally. + + - cirrus,pdm-fmt : PDM speaker data format, must contain 2 cells + (OUT5 and OUT6). See the PDM_SPKn_FMT field in the datasheet for a + description of this value. + The second cell is ignored for codecs that do not have OUT6. + + - cirrus,pdm-mute : PDM mute format, must contain 2 cells + (OUT5 and OUT6). See the PDM_SPKn_CTRL_1 register in the datasheet for a + description of this value. + The second cell is ignored for codecs that do not have OUT6. + +Example: + +cs47l35@0 { + compatible = "cirrus,cs47l35"; + + cirrus,dmic-ref = <0 0 CS47L35_DMIC_REF_MICBIAS1B 0>; + cirrus,inmode = < + MADERA_INMODE_DMIC MADERA_INMODE_DMIC /* IN1A digital */ + MADERA_INMODE_SE MADERA_INMODE_SE /* IN1B single-ended */ + MADERA_INMODE_DIFF MADERA_INMODE_DIFF /* IN2 differential */ + 0 0 /* not used on this codec */ + >; + cirrus,out-mono = <0 0 0 0 0 0>; + cirrus,max-channels-clocked = <2 0 0>; +}; diff --git a/MAINTAINERS b/MAINTAINERS index addc269ad75e9..55d8b3d1a5cff 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3927,6 +3927,7 @@ W: https://github.com/CirrusLogic/linux-drivers/wiki S: Supported F: Documentation/devicetree/bindings/mfd/madera.txt F: Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt +F: include/dt-bindings/sound/madera* F: include/linux/irqchip/irq-madera* F: include/linux/mfd/madera/* F: drivers/gpio/gpio-madera* diff --git a/include/dt-bindings/sound/madera.h b/include/dt-bindings/sound/madera.h new file mode 100644 index 0000000000000..9ff4eae5259b0 --- /dev/null +++ b/include/dt-bindings/sound/madera.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Device Tree defines for Madera codecs + * + * Copyright (C) 2016-2017 Cirrus Logic, Inc. and + * Cirrus Logic International Semiconductor Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef DT_BINDINGS_SOUND_MADERA_H +#define DT_BINDINGS_SOUND_MADERA_H + +#define MADERA_INMODE_DIFF 0 +#define MADERA_INMODE_SE 1 +#define MADERA_INMODE_DMIC 2 + +#define MADERA_DMIC_REF_MICVDD 0 +#define MADERA_DMIC_REF_MICBIAS1 1 +#define MADERA_DMIC_REF_MICBIAS2 2 +#define MADERA_DMIC_REF_MICBIAS3 3 + +#define CS47L35_DMIC_REF_MICBIAS1B 1 +#define CS47L35_DMIC_REF_MICBIAS2A 2 +#define CS47L35_DMIC_REF_MICBIAS2B 3 + +#endif -- 2.11.0

1 4

[alsa-devel] [RFC PATCH] ASoC: Intel: use common helpers to detect CPUs
by Pierre-Louis Bossart 19 Jun '19

19 Jun '19

We have duplicated code in multiple locations (atom, machine drivers, SOF) to detect Baytrail, Cherrytrail and other SOCs. This is not very elegant, and introduces dependencies on CONFIG_X86 that prevent COMPILE_TEST from working. Add common helpers to provide same functionality in a cleaner way. This will also help support the DMI-based quirks being introduced to handle SOF/SST autodetection. FIXME: 0. does this fix COMPILE_TEST issues reported by Randy? 1. should the include file moved to include/sound? this would be handy for the SOF/SST mutual exclusion? 2. is there a better way to do this for all Intel chips or do we keep this in sound/? Andy? Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/intel/atom/sst/sst_acpi.c | 65 +--------- sound/soc/intel/boards/bxt_da7219_max98357a.c | 11 +- sound/soc/intel/boards/bytcht_es8316.c | 12 +- sound/soc/intel/boards/bytcr_rt5640.c | 16 +-- sound/soc/intel/boards/bytcr_rt5651.c | 17 +-- sound/soc/intel/boards/cht_bsw_rt5645.c | 16 +-- sound/soc/intel/boards/sof_rt5682.c | 11 +- sound/soc/intel/common/soc-intel-quirks.h | 115 ++++++++++++++++++ sound/soc/sof/sof-acpi-dev.c | 57 +-------- 9 files changed, 135 insertions(+), 185 deletions(-) create mode 100644 sound/soc/intel/common/soc-intel-quirks.h diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c index ae17ce4677a5..06c4a2da900c 100644 --- a/sound/soc/intel/atom/sst/sst_acpi.c +++ b/sound/soc/intel/atom/sst/sst_acpi.c @@ -38,12 +38,11 @@ #include <acpi/platform/aclinux.h> #include <acpi/actypes.h> #include <acpi/acpi_bus.h> -#include <asm/cpu_device_id.h> -#include <asm/iosf_mbi.h> #include <sound/soc-acpi.h> #include <sound/soc-acpi-intel-match.h> #include "../sst-mfld-platform.h" #include "../../common/sst-dsp.h" +#include "../../common/soc-intel-quirks.h" #include "sst.h" /* LPE viewpoint addresses */ @@ -243,64 +242,6 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx) return 0; } -static int is_byt(void) -{ - bool status = false; - static const struct x86_cpu_id cpu_ids[] = { - { X86_VENDOR_INTEL, 6, 55 }, /* Valleyview, Bay Trail */ - {} - }; - if (x86_match_cpu(cpu_ids)) - status = true; - return status; -} - -static bool is_byt_cr(struct platform_device *pdev) -{ - struct device *dev = &pdev->dev; - int status = 0; - - if (!is_byt()) - return false; - - if (iosf_mbi_available()) { - u32 bios_status; - status = iosf_mbi_read(BT_MBI_UNIT_PMC, /* 0x04 PUNIT */ - MBI_REG_READ, /* 0x10 */ - 0x006, /* BIOS_CONFIG */ - &bios_status); - - if (status) { - dev_err(dev, "could not read PUNIT BIOS_CONFIG\n"); - } else { - /* bits 26:27 mirror PMIC options */ - bios_status = (bios_status >> 26) & 3; - - if (bios_status == 1 || bios_status == 3) { - dev_info(dev, "Detected Baytrail-CR platform\n"); - return true; - } - - dev_info(dev, "BYT-CR not detected\n"); - } - } else { - dev_info(dev, "IOSF_MBI not available, no BYT-CR detection\n"); - } - - if (platform_get_resource(pdev, IORESOURCE_IRQ, 5) == NULL) { - /* - * Some devices detected as BYT-T have only a single IRQ listed, - * causing platform_get_irq with index 5 to return -ENXIO. - * The correct IRQ in this case is at index 0, as on BYT-CR. - */ - dev_info(dev, "Falling back to Baytrail-CR platform\n"); - return true; - } - - return false; -} - - static int sst_acpi_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -325,7 +266,7 @@ static int sst_acpi_probe(struct platform_device *pdev) return -ENODEV; } - if (is_byt()) + if (soc_intel_is_byt()) mach->pdata = &byt_rvp_platform_data; else mach->pdata = &chv_platform_data; @@ -343,7 +284,7 @@ static int sst_acpi_probe(struct platform_device *pdev) if (ret < 0) return ret; - if (is_byt_cr(pdev)) { + if (soc_intel_is_byt_cr(pdev)) { /* override resource info */ byt_rvp_platform_data.res_info = &bytcr_res_info; } diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c index d8c7d64bb1d7..d476c55f2efe 100644 --- a/sound/soc/intel/boards/bxt_da7219_max98357a.c +++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c @@ -16,7 +16,6 @@ * GNU General Public License for more details. */ -#include <asm/cpu_device_id.h> #include <linux/input.h> #include <linux/module.h> #include <linux/platform_device.h> @@ -29,6 +28,7 @@ #include "../../codecs/hdac_hdmi.h" #include "../../codecs/da7219.h" #include "../../codecs/da7219-aad.h" +#include "../common/soc-intel-quirks.h" #define BXT_DIALOG_CODEC_DAI "da7219-hifi" #define BXT_MAXIM_CODEC_DAI "HiFi" @@ -579,11 +579,6 @@ static struct snd_soc_dai_link broxton_dais[] = { }, }; -static const struct x86_cpu_id glk_ids[] = { - { X86_VENDOR_INTEL, 6, 0x7A }, /* Geminilake CPU_ID */ - {} -}; - #define NAME_SIZE 32 static int bxt_card_late_probe(struct snd_soc_card *card) { @@ -593,7 +588,7 @@ static int bxt_card_late_probe(struct snd_soc_card *card) int err, i = 0; char jack_name[NAME_SIZE]; - if (x86_match_cpu(glk_ids)) + if (soc_intel_is_glk()) snd_soc_dapm_add_routes(&card->dapm, gemini_map, ARRAY_SIZE(gemini_map)); else @@ -656,7 +651,7 @@ static int broxton_audio_probe(struct platform_device *pdev) broxton_audio_card.dev = &pdev->dev; snd_soc_card_set_drvdata(&broxton_audio_card, ctx); - if (x86_match_cpu(glk_ids)) { + if (soc_intel_is_glk()) { unsigned int i; broxton_audio_card.name = "glkda7219max"; diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index e8c585ffd04d..d08715ac3945 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -30,8 +30,6 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/slab.h> -#include <asm/cpu_device_id.h> -#include <asm/intel-family.h> #include <asm/platform_sst_audio.h> #include <sound/jack.h> #include <sound/pcm.h> @@ -40,6 +38,7 @@ #include <sound/soc-acpi.h> #include "../atom/sst-atom-controls.h" #include "../common/sst-dsp.h" +#include "../common/soc-intel-quirks.h" /* jd-inv + terminating entry */ #define MAX_NO_PROPS 2 @@ -430,11 +429,6 @@ static struct snd_soc_card byt_cht_es8316_card = { .resume_post = byt_cht_es8316_resume, }; -static const struct x86_cpu_id baytrail_cpu_ids[] = { - { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT }, /* Valleyview */ - {} -}; - static const struct acpi_gpio_params first_gpio = { 0, 0, false }; static const struct acpi_gpio_mapping byt_cht_es8316_gpios[] = { @@ -506,8 +500,8 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) dmi_id = dmi_first_match(byt_cht_es8316_quirk_table); if (dmi_id) { quirk = (unsigned long)dmi_id->driver_data; - } else if (x86_match_cpu(baytrail_cpu_ids) && - mach->mach_params.acpi_ipc_irq_index == 0) { + } else if (soc_intel_is_byt() && + mach->mach_params.acpi_ipc_irq_index == 0) { /* On BYTCR default to SSP0, internal-mic-in2-map, mono-spk */ quirk = BYT_CHT_ES8316_SSP0 | BYT_CHT_ES8316_INTMIC_IN2_MAP | BYT_CHT_ES8316_MONO_SPEAKER; diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index dc22df9a99fb..7aae7b78efba 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -28,7 +28,6 @@ #include <linux/dmi.h> #include <linux/input.h> #include <linux/slab.h> -#include <asm/cpu_device_id.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> @@ -38,6 +37,7 @@ #include "../../codecs/rt5640.h" #include "../atom/sst-atom-controls.h" #include "../common/sst-dsp.h" +#include "../common/soc-intel-quirks.h" enum { BYT_RT5640_DMIC1_MAP, @@ -1130,18 +1130,6 @@ static struct snd_soc_card byt_rt5640_card = { .resume_post = byt_rt5640_resume, }; -static bool is_valleyview(void) -{ - static const struct x86_cpu_id cpu_ids[] = { - { X86_VENDOR_INTEL, 6, 55 }, /* Valleyview, Bay Trail */ - {} - }; - - if (!x86_match_cpu(cpu_ids)) - return false; - return true; -} - struct acpi_chan_package { /* ACPICA seems to require 64 bit integers */ u64 aif_value; /* 1: AIF1, 2: AIF2 */ u64 mclock_value; /* usually 25MHz (0x17d7940), ignored */ @@ -1190,7 +1178,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) * swap SSP0 if bytcr is detected * (will be overridden if DMI quirk is detected) */ - if (is_valleyview()) { + if (soc_intel_is_byt()) { if (mach->mach_params.acpi_ipc_irq_index == 0) is_bytcr = true; } diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index ca657c3e5726..6df6435ea394 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -30,8 +30,6 @@ #include <linux/gpio/consumer.h> #include <linux/gpio/machine.h> #include <linux/slab.h> -#include <asm/cpu_device_id.h> -#include <asm/intel-family.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> @@ -39,6 +37,7 @@ #include <sound/soc-acpi.h> #include "../../codecs/rt5651.h" #include "../atom/sst-atom-controls.h" +#include "../common/soc-intel-quirks.h" enum { BYT_RT5651_DMIC_MAP, @@ -852,16 +851,6 @@ static struct snd_soc_card byt_rt5651_card = { .resume_post = byt_rt5651_resume, }; -static const struct x86_cpu_id baytrail_cpu_ids[] = { - { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT }, /* Valleyview */ - {} -}; - -static const struct x86_cpu_id cherrytrail_cpu_ids[] = { - { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_AIRMONT }, /* Braswell */ - {} -}; - static const struct acpi_gpio_params ext_amp_enable_gpios = { 0, 0, false }; static const struct acpi_gpio_mapping cht_rt5651_gpios[] = { @@ -932,7 +921,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) * swap SSP0 if bytcr is detected * (will be overridden if DMI quirk is detected) */ - if (x86_match_cpu(baytrail_cpu_ids)) { + if (soc_intel_is_byt()) { if (mach->mach_params.acpi_ipc_irq_index == 0) is_bytcr = true; } @@ -1001,7 +990,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) } /* Cherry Trail devices use an external amplifier enable gpio */ - if (x86_match_cpu(cherrytrail_cpu_ids) && !byt_rt5651_gpios) + if (soc_intel_is_cht() && !byt_rt5651_gpios) byt_rt5651_gpios = cht_rt5651_gpios; if (byt_rt5651_gpios) { diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index 32dbeaf1ab94..de5fe58ae3b4 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -26,7 +26,6 @@ #include <linux/clk.h> #include <linux/dmi.h> #include <linux/slab.h> -#include <asm/cpu_device_id.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> @@ -34,6 +33,7 @@ #include <sound/soc-acpi.h> #include "../../codecs/rt5645.h" #include "../atom/sst-atom-controls.h" +#include "../common/soc-intel-quirks.h" #define CHT_PLAT_CLK_3_HZ 19200000 #define CHT_CODEC_DAI1 "rt5645-aif1" @@ -509,18 +509,6 @@ static char cht_rt5645_codec_name[SND_ACPI_I2C_ID_LEN]; static char cht_rt5645_codec_aif_name[12]; /* = "rt5645-aif[1|2]" */ static char cht_rt5645_cpu_dai_name[10]; /* = "ssp[0|2]-port" */ -static bool is_valleyview(void) -{ - static const struct x86_cpu_id cpu_ids[] = { - { X86_VENDOR_INTEL, 6, 55 }, /* Valleyview, Bay Trail */ - {} - }; - - if (!x86_match_cpu(cpu_ids)) - return false; - return true; -} - struct acpi_chan_package { /* ACPICA seems to require 64 bit integers */ u64 aif_value; /* 1: AIF1, 2: AIF2 */ u64 mclock_value; /* usually 25MHz (0x17d7940), ignored */ @@ -585,7 +573,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) * swap SSP0 if bytcr is detected * (will be overridden if DMI quirk is detected) */ - if (is_valleyview()) { + if (soc_intel_is_byt()) { if (mach->mach_params.acpi_ipc_irq_index == 0) is_bytcr = true; } diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index e441dc979966..355fd9730a44 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -10,8 +10,6 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/dmi.h> -#include <asm/cpu_device_id.h> -#include <asm/intel-family.h> #include <sound/core.h> #include <sound/jack.h> #include <sound/pcm.h> @@ -21,6 +19,7 @@ #include <sound/soc-acpi.h> #include "../../codecs/rt5682.h" #include "../../codecs/hdac_hdmi.h" +#include "../common/soc-intel-quirks.h" #define NAME_SIZE 32 @@ -304,12 +303,6 @@ static struct snd_soc_card sof_audio_card_rt5682 = { .late_probe = sof_card_late_probe, }; -static const struct x86_cpu_id legacy_cpi_ids[] = { - { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT }, /* Baytrail */ - { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_AIRMONT }, /* Cherrytrail */ - {} -}; - static struct snd_soc_dai_link_component rt5682_component[] = { { .name = "i2c-10EC5682:00", @@ -498,7 +491,7 @@ static int sof_audio_probe(struct platform_device *pdev) if (!ctx) return -ENOMEM; - if (x86_match_cpu(legacy_cpi_ids)) { + if (soc_intel_is_byt() || soc_intel_is_cht()) { is_legacy_cpu = 1; dmic_num = 0; hdmi_num = 0; diff --git a/sound/soc/intel/common/soc-intel-quirks.h b/sound/soc/intel/common/soc-intel-quirks.h new file mode 100644 index 000000000000..4718fd3cf636 --- /dev/null +++ b/sound/soc/intel/common/soc-intel-quirks.h @@ -0,0 +1,115 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * soc-intel-quirks.h - prototypes for quirk autodetection + * + * Copyright (c) 2019, Intel Corporation. + * + */ + +#ifndef _SND_SOC_INTEL_QUIRKS_H +#define _SND_SOC_INTEL_QUIRKS_H + +#if IS_ENABLED(CONFIG_X86) + +#include <asm/cpu_device_id.h> +#include <asm/intel-family.h> +#include <asm/iosf_mbi.h> + +#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } + +#define SOC_INTEL_IS_CPU(soc, type) \ +static inline bool soc_intel_is_##soc(void) \ +{ \ + static const struct x86_cpu_id soc##_cpu_ids[] = { \ + ICPU(type), \ + {} \ + }; \ + const struct x86_cpu_id *id; \ + \ + id = x86_match_cpu(soc##_cpu_ids); \ + if (id) \ + return true; \ + return false; \ +} + +SOC_INTEL_IS_CPU(byt, INTEL_FAM6_ATOM_SILVERMONT); +SOC_INTEL_IS_CPU(cht, INTEL_FAM6_ATOM_AIRMONT); +SOC_INTEL_IS_CPU(apl, INTEL_FAM6_ATOM_GOLDMONT); +SOC_INTEL_IS_CPU(glk, INTEL_FAM6_ATOM_GOLDMONT_PLUS); + +static inline bool soc_intel_is_byt_cr(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + int status = 0; + + if (!soc_intel_is_byt()) + return false; + + if (iosf_mbi_available()) { + u32 bios_status; + + status = iosf_mbi_read(BT_MBI_UNIT_PMC, /* 0x04 PUNIT */ + MBI_REG_READ, /* 0x10 */ + 0x006, /* BIOS_CONFIG */ + &bios_status); + + if (status) { + dev_err(dev, "could not read PUNIT BIOS_CONFIG\n"); + } else { + /* bits 26:27 mirror PMIC options */ + bios_status = (bios_status >> 26) & 3; + + if (bios_status == 1 || bios_status == 3) { + dev_info(dev, "Detected Baytrail-CR platform\n"); + return true; + } + + dev_info(dev, "BYT-CR not detected\n"); + } + } else { + dev_info(dev, "IOSF_MBI not available, no BYT-CR detection\n"); + } + + if (!platform_get_resource(pdev, IORESOURCE_IRQ, 5)) { + /* + * Some devices detected as BYT-T have only a single IRQ listed, + * causing platform_get_irq with index 5 to return -ENXIO. + * The correct IRQ in this case is at index 0, as on BYT-CR. + */ + dev_info(dev, "Falling back to Baytrail-CR platform\n"); + return true; + } + + return false; +} + +#else + +static inline bool soc_intel_is_byt_cr(struct platform_device *pdev) +{ + return false; +} + +static inline bool soc_intel_is_byt(void) +{ + return false; +} + +static inline bool soc_intel_is_cht(void) +{ + return false; +} + +static inline bool soc_intel_is_apl(void) +{ + return false; +} + +static inline bool soc_intel_is_glk(void) +{ + return false; +} + +#endif + + #endif /* _SND_SOC_INTEL_QUIRKS_H */ diff --git a/sound/soc/sof/sof-acpi-dev.c b/sound/soc/sof/sof-acpi-dev.c index 38062dd00dd2..93a8e15bbd2c 100644 --- a/sound/soc/sof/sof-acpi-dev.c +++ b/sound/soc/sof/sof-acpi-dev.c @@ -15,10 +15,7 @@ #include <sound/soc-acpi.h> #include <sound/soc-acpi-intel-match.h> #include <sound/sof.h> -#ifdef CONFIG_X86 -#include <asm/iosf_mbi.h> -#endif - +#include "../intel/common/soc-intel-quirks.h" #include "ops.h" /* platform specific devices */ @@ -105,56 +102,6 @@ static const struct sof_dev_desc sof_acpi_baytrail_desc = { .arch_ops = &sof_xtensa_arch_ops }; -#ifdef CONFIG_X86 /* TODO: move this to common helper */ - -static bool is_byt_cr(struct platform_device *pdev) -{ - struct device *dev = &pdev->dev; - int status; - - if (iosf_mbi_available()) { - u32 bios_status; - status = iosf_mbi_read(BT_MBI_UNIT_PMC, /* 0x04 PUNIT */ - MBI_REG_READ, /* 0x10 */ - 0x006, /* BIOS_CONFIG */ - &bios_status); - - if (status) { - dev_err(dev, "could not read PUNIT BIOS_CONFIG\n"); - } else { - /* bits 26:27 mirror PMIC options */ - bios_status = (bios_status >> 26) & 3; - - if (bios_status == 1 || bios_status == 3) { - dev_info(dev, "Detected Baytrail-CR platform\n"); - return true; - } - - dev_info(dev, "BYT-CR not detected\n"); - } - } else { - dev_info(dev, "IOSF_MBI not available, no BYT-CR detection\n"); - } - - if (platform_get_resource(pdev, IORESOURCE_IRQ, 5) == NULL) { - /* - * Some devices detected as BYT-T have only a single IRQ listed, - * causing platform_get_irq with index 5 to return -ENXIO. - * The correct IRQ in this case is at index 0, as on BYT-CR. - */ - dev_info(dev, "Falling back to Baytrail-CR platform\n"); - return true; - } - - return false; -} -#else -static int is_byt_cr(struct platform_device *pdev) -{ - return 0; -} -#endif - static const struct sof_dev_desc sof_acpi_cherrytrail_desc = { .machines = snd_soc_acpi_intel_cherrytrail_machines, .resindex_lpe_base = 0, @@ -209,7 +156,7 @@ static int sof_acpi_probe(struct platform_device *pdev) return -ENODEV; #if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL) - if (desc == &sof_acpi_baytrail_desc && is_byt_cr(pdev)) + if (desc == &sof_acpi_baytrail_desc && soc_intel_is_byt_cr(pdev)) desc = &sof_acpi_baytrailcr_desc; #endif -- 2.20.1

6 9

[alsa-devel] [PATCH v2 1/2] ASoC: Intel: sof-rt5682: add MCLK support for BYT platform
by Bard liao 19 Jun '19

19 Jun '19

From: Xun Zhang <xun2.zhang(a)intel.com> The sof-rt5682 machine driver currently uses BCLK on BYT/Minnowboard platform. The MCLK signal is available since the Turbot revision, so enable MCLK on BYT/Minnowboard Turbot platform. Signed-off-by: Xun Zhang <xun2.zhang(a)intel.com> Signed-off-by: Bard liao <yung-chuan.liao(a)linux.intel.com> --- sound/soc/intel/boards/sof_rt5682.c | 65 ++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index e2e5f97d9920..f3d481b75b15 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -9,6 +9,7 @@ #include <linux/input.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/clk.h> #include <linux/dmi.h> #include <sound/core.h> #include <sound/jack.h> @@ -32,6 +33,7 @@ #define SOF_RT5682_SSP_AMP_MASK (GENMASK(8, 6)) #define SOF_RT5682_SSP_AMP(quirk) \ (((quirk) << SOF_RT5682_SSP_AMP_SHIFT) & SOF_RT5682_SSP_AMP_MASK) +#define SOF_RT5682_MCLK_BYTCHT_EN BIT(9) /* Default: MCLK on, MCLK 19.2M, SSP0 */ static unsigned long sof_rt5682_quirk = SOF_RT5682_MCLK_EN | @@ -48,6 +50,7 @@ struct sof_hdmi_pcm { }; struct sof_card_private { + struct clk *mclk; struct snd_soc_jack sof_headset; struct list_head hdmi_pcm_list; }; @@ -59,6 +62,22 @@ static int sof_rt5682_quirk_cb(const struct dmi_system_id *id) } static const struct dmi_system_id sof_rt5682_quirk_table[] = { + { + .callback = sof_rt5682_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Circuitco"), + DMI_MATCH(DMI_PRODUCT_NAME, "Minnowboard Max"), + }, + .driver_data = (void *)(SOF_RT5682_SSP_CODEC(2)), + }, + { + .callback = sof_rt5682_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "AAEON"), + DMI_MATCH(DMI_PRODUCT_NAME, "UP-CHT01"), + }, + .driver_data = (void *)(SOF_RT5682_SSP_CODEC(2)), + }, { .callback = sof_rt5682_quirk_cb, .matches = { @@ -127,6 +146,27 @@ static int sof_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd) RT5682_CLK_SEL_I2S1_ASRC); } + if (sof_rt5682_quirk & SOF_RT5682_MCLK_BYTCHT_EN) { + /* + * The firmware might enable the clock at + * boot (this information may or may not + * be reflected in the enable clock register). + * To change the rate we must disable the clock + * first to cover these cases. Due to common + * clock framework restrictions that do not allow + * to disable a clock that has not been enabled, + * we need to enable the clock first. + */ + ret = clk_prepare_enable(ctx->mclk); + if (!ret) + clk_disable_unprepare(ctx->mclk); + + ret = clk_set_rate(ctx->mclk, 19200000); + + if (ret) + dev_err(rtd->dev, "unable to set MCLK rate\n"); + } + /* * Headset buttons map to the google Reference headset. * These can be configured by userspace. @@ -161,10 +201,20 @@ static int sof_rt5682_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_dai *codec_dai = rtd->codec_dai; int clk_id, clk_freq, pll_out, ret; if (sof_rt5682_quirk & SOF_RT5682_MCLK_EN) { + if (sof_rt5682_quirk & SOF_RT5682_MCLK_BYTCHT_EN) { + ret = clk_prepare_enable(ctx->mclk); + if (ret < 0) { + dev_err(rtd->dev, + "could not configure MCLK state"); + return ret; + } + } + clk_id = RT5682_PLL1_S_MCLK; if (sof_rt5682_quirk & SOF_RT5682_MCLK_24MHZ) clk_freq = 24000000; @@ -507,7 +557,9 @@ static int sof_audio_probe(struct platform_device *pdev) dmic_num = 0; hdmi_num = 0; /* default quirk for legacy cpu */ - sof_rt5682_quirk = SOF_RT5682_SSP_CODEC(2); + sof_rt5682_quirk = SOF_RT5682_MCLK_EN | + SOF_RT5682_MCLK_BYTCHT_EN | + SOF_RT5682_SSP_CODEC(2); } else { dmic_num = 1; hdmi_num = 3; @@ -515,6 +567,17 @@ static int sof_audio_probe(struct platform_device *pdev) dmi_check_system(sof_rt5682_quirk_table); + /* need to get main clock from pmc */ + if (sof_rt5682_quirk & SOF_RT5682_MCLK_BYTCHT_EN) { + ctx->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3"); + ret = clk_prepare_enable(ctx->mclk); + if (ret < 0) { + dev_err(&pdev->dev, + "could not configure MCLK state"); + return ret; + } + } + dev_dbg(&pdev->dev, "sof_rt5682_quirk = %lx\n", sof_rt5682_quirk); ssp_amp = (sof_rt5682_quirk & SOF_RT5682_SSP_AMP_MASK) >> -- 2.17.1

3 5

[alsa-devel] [PATCH] ASoC: soc.h: fixup for_each_card_links() macro
by Kuninori Morimoto 19 Jun '19

19 Jun '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Macro is using "link", not "dai_link" Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- include/sound/soc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 9538f50..1094cd8 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1095,7 +1095,7 @@ struct snd_soc_card { (i)++) #define for_each_card_links(card, link) \ - list_for_each_entry(dai_link, &(card)->dai_link_list, list) + list_for_each_entry(link, &(card)->dai_link_list, list) #define for_each_card_links_safe(card, link, _link) \ list_for_each_entry_safe(link, _link, &(card)->dai_link_list, list) -- 2.7.4

2 1