diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-11-11 07:59:06 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-11 07:59:06 +0100 |
| commit | 1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38 (patch) | |
| tree | 548d3518b41341b93c88ee4ff5661e1eb42bd7f4 /include/linux/platform_data | |
| parent | d44f821b0e13275735e8f3fe4db8703b45f05d52 (diff) | |
| parent | 31f4f5b495a62c9a8b15b1c3581acd5efeb9af8c (diff) | |
| download | cachepc-linux-1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38.tar.gz cachepc-linux-1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38.zip | |
Merge tag 'v5.4-rc7' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/dma-imx-sdma.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/platform_data/dma-imx-sdma.h b/include/linux/platform_data/dma-imx-sdma.h index 6eaa53cef0bd..30e676b36b24 100644 --- a/include/linux/platform_data/dma-imx-sdma.h +++ b/include/linux/platform_data/dma-imx-sdma.h @@ -51,7 +51,10 @@ struct sdma_script_start_addrs { /* End of v2 array */ s32 zcanfd_2_mcu_addr; s32 zqspi_2_mcu_addr; + s32 mcu_2_ecspi_addr; /* End of v3 array */ + s32 mcu_2_zqspi_addr; + /* End of v4 array */ }; /** |