Commit 15ad3332 authored by Takashi Iwai's avatar Takashi Iwai

Merge tag 'asoc-fix-v5.18-rc7' of...

Merge tag 'asoc-fix-v5.18-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fix for v5.17

This is rather late and at this point I'm expecting it to get merged in
the merge window rather than as a fix but if we get a -rc8 it's a small,
driver specific fix which should be fine to send.
parents 5c62383c 353bb6a5
...@@ -97,13 +97,13 @@ struct wm_adsp_system_config_xm_hdr { ...@@ -97,13 +97,13 @@ struct wm_adsp_system_config_xm_hdr {
__be32 wdma[8]; __be32 wdma[8];
__be32 build_job_name[3]; __be32 build_job_name[3];
__be32 build_job_number; __be32 build_job_number;
}; } __packed;
struct wm_halo_system_config_xm_hdr { struct wm_halo_system_config_xm_hdr {
__be32 halo_heartbeat; __be32 halo_heartbeat;
__be32 build_job_name[3]; __be32 build_job_name[3];
__be32 build_job_number; __be32 build_job_number;
}; } __packed;
struct wm_adsp_alg_xm_struct { struct wm_adsp_alg_xm_struct {
__be32 magic; __be32 magic;
...@@ -114,13 +114,13 @@ struct wm_adsp_alg_xm_struct { ...@@ -114,13 +114,13 @@ struct wm_adsp_alg_xm_struct {
__be32 high_water_mark; __be32 high_water_mark;
__be32 low_water_mark; __be32 low_water_mark;
__be64 smoothed_power; __be64 smoothed_power;
}; } __packed;
struct wm_adsp_host_buf_coeff_v1 { struct wm_adsp_host_buf_coeff_v1 {
__be32 host_buf_ptr; /* Host buffer pointer */ __be32 host_buf_ptr; /* Host buffer pointer */
__be32 versions; /* Version numbers */ __be32 versions; /* Version numbers */
__be32 name[4]; /* The buffer name */ __be32 name[4]; /* The buffer name */
}; } __packed;
struct wm_adsp_buffer { struct wm_adsp_buffer {
__be32 buf1_base; /* Base addr of first buffer area */ __be32 buf1_base; /* Base addr of first buffer area */
...@@ -141,7 +141,7 @@ struct wm_adsp_buffer { ...@@ -141,7 +141,7 @@ struct wm_adsp_buffer {
__be32 min_free; /* min free space since stream start */ __be32 min_free; /* min free space since stream start */
__be32 blocks_written[2]; /* total blocks written (64 bit) */ __be32 blocks_written[2]; /* total blocks written (64 bit) */
__be32 words_written[2]; /* total words written (64 bit) */ __be32 words_written[2]; /* total words written (64 bit) */
}; } __packed;
struct wm_adsp_compr; struct wm_adsp_compr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment