diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-04 12:57:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-04 12:57:41 -0500 |
| commit | 73b6e6ad254b36763419cdd3fdf406c0094517b7 (patch) | |
| tree | f432e1b568809834c52389b5075815700bc68026 /arch/arm/mach-imx/sip.c | |
| parent | 3b02d614b429442333ec3d82eef0bba527be4f8c (diff) | |
| parent | ae8a53ece0ff3b1ed686c3e0af14e59973d25db8 (diff) | |
Merge tag 'u-boot-imx-20191104' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20191104
-------------------
- i.MX NAND: nandbcb support for MX6UL / i.MX7
- i.MX8: support for HAB
- Convert to DM (opos6ul, mccmon6)
- Toradex i.MX6ull colibri
- sync DTS with kernel
Travis : https://travis-ci.org/sbabic/u-boot-imx/builds/606853416
Diffstat (limited to 'arch/arm/mach-imx/sip.c')
| -rw-r--r-- | arch/arm/mach-imx/sip.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/sip.c b/arch/arm/mach-imx/sip.c index 968e7cf3097..fca520c671b 100644 --- a/arch/arm/mach-imx/sip.c +++ b/arch/arm/mach-imx/sip.c @@ -7,7 +7,8 @@ #include <asm/arch/sys_proto.h> unsigned long call_imx_sip(unsigned long id, unsigned long reg0, - unsigned long reg1, unsigned long reg2) + unsigned long reg1, unsigned long reg2, + unsigned long reg3) { struct pt_regs regs; @@ -15,6 +16,7 @@ unsigned long call_imx_sip(unsigned long id, unsigned long reg0, regs.regs[1] = reg0; regs.regs[2] = reg1; regs.regs[3] = reg2; + regs.regs[4] = reg3; smc_call(®s); |