diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-30 23:21:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-01 07:25:51 -0400 |
| commit | b4ee6daad7a2604ca9466b2ba48de86cc27d381f (patch) | |
| tree | f28b8d6bfeface9e9f188ffc37322c89e9d1fe77 /arch/arm/include/asm/mach-imx/sys_proto.h | |
| parent | a69120a0d7c8d4044cdaceea9eb03913ba4e49c7 (diff) | |
| parent | 0d3912fcd41dc2a85891f78e8fc255a379323619 (diff) | |
Merge tag 'u-boot-imx-20190426' of git://git.denx.de/u-boot-imx
Porting to DM and i.MX8
------------------------
- warp7 to DM
- kp_imx53 to DM
- Warnings in DT
- MX8QM support
- colibri-imx6ull to DM
- imx7d-pico to DM
- ocotp for MX8
Diffstat (limited to 'arch/arm/include/asm/mach-imx/sys_proto.h')
| -rw-r--r-- | arch/arm/include/asm/mach-imx/sys_proto.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index d0f866b630..4925dd7894 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -134,4 +134,7 @@ int mxs_wait_mask_clr(struct mxs_register_32 *reg, u32 mask, u32 timeout); unsigned long call_imx_sip(unsigned long id, unsigned long reg0, unsigned long reg1, unsigned long reg2); +unsigned long call_imx_sip_ret2(unsigned long id, unsigned long reg0, + unsigned long *reg1, unsigned long reg2, + unsigned long reg3); #endif |