diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-12 12:22:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-12 12:22:43 -0400 |
| commit | 40a9546c7b6217a78a3a010a0142529a837e46b6 (patch) | |
| tree | 87ef70a898d33b0f2b9194f3f96f1283a6325c16 /arch/arm/mach-k3/include/mach/sys_proto.h | |
| parent | 02f173ca156cee8526dff87603d5e446b443cde3 (diff) | |
| parent | d2c05f50e12f87128597a28146de7092aaa847c3 (diff) | |
Merge branch '2019-04-11-ti-master-imports'
- Improve Keystone 3 SoC support (DMA, TI SCI)
- Improve Keystone 2 SoC support (PHY fixes on various platforms)
- Improve am335x families (new platforms, more boot mode options in SPL
via DM).
- General DaVinci, OMAP5 fixes.
Diffstat (limited to 'arch/arm/mach-k3/include/mach/sys_proto.h')
| -rw-r--r-- | arch/arm/mach-k3/include/mach/sys_proto.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-k3/include/mach/sys_proto.h b/arch/arm/mach-k3/include/mach/sys_proto.h index 0b2007981a..018725b4d1 100644 --- a/arch/arm/mach-k3/include/mach/sys_proto.h +++ b/arch/arm/mach-k3/include/mach/sys_proto.h @@ -10,5 +10,6 @@ void sdelay(unsigned long loops); u32 wait_on_value(u32 read_bit_mask, u32 match_value, void *read_addr, u32 bound); - +struct ti_sci_handle *get_ti_sci_handle(void); +int fdt_fixup_msmc_ram(void *blob, char *parent_path, char *node_name); #endif |