Pull ARM SoC fixes from Arnd Bergmann: "Lots of small fixes for Arm SoCs this time, nothing too worrying: - omap/beaglebone boot regression fix in gpt12 timer - revert for i.mx8 soc driver breaking as a platform_driver - kexec/kdump fixes for op-tee - various fixes for incorrect DT settings on imx, mvebu, omap, stm32, and tegra causing problems. - device tree fixes for static checks in nomadik, versatile, stm32 - code fixes for issues found in build testing and with static checking on tegra, ixp4xx, imx, omap" * tag 'soc-fixes-5.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (36 commits) soc: ixp4xx/qmgr: fix invalid __iomem access soc: ixp4xx: fix printing resources ARM: ixp4xx: goramo_mlr depends on old PCI driver ARM: ixp4xx: fix compile-testing soc drivers soc/tegra: Make regulator couplers depend on CONFIG_REGULATOR ARM: dts: nomadik: Fix up interrupt controller node names ARM: dts: stm32: Fix touchscreen IRQ line assignment on DHCOM ARM: dts: stm32: Disable LAN8710 EDPD on DHCOM ARM: dts: stm32: Prefer HW RTC on DHCOM SoM omap5-board-common: remove not physically existing vdds_1v8_main fixed-regulator ARM: dts: am437x-l4: fix typo in can@0 node ARM: dts: am43x-epos-evm: Reduce i2c0 bus speed for tps65218 bus: ti-sysc: AM3: RNG is GP only ARM: omap2+: hwmod: fix potential NULL pointer access arm64: dts: armada-3720-turris-mox: remove mrvl,i2c-fast-mode arm64: dts: armada-3720-turris-mox: fixed indices for the SDHC controllers ARM: dts: imx: Swap M53Menlo pinctrl_power_button/pinctrl_power_out pins ARM: imx: fix missing 3rd argument in macro imx_mmdc_perf_init ARM: dts: colibri-imx6ull: limit SDIO clock to 25MHz arm64: dts: ls1028: sl28: fix networking for variant 2 ...
Showing the changes to include (1 of 32 files). Show all
Unified · Split
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #define TEE_SHM_USER_MAPPED BIT(4) /* Memory mapped in user space */ | 27 | #define TEE_SHM_USER_MAPPED BIT(4) /* Memory mapped in user space */ |
| 28 | #define TEE_SHM_POOL BIT(5) /* Memory allocated from pool */ | 28 | #define TEE_SHM_POOL BIT(5) /* Memory allocated from pool */ |
| 29 | #define TEE_SHM_KERNEL_MAPPED BIT(6) /* Memory mapped in kernel space */ | 29 | #define TEE_SHM_KERNEL_MAPPED BIT(6) /* Memory mapped in kernel space */ |
| 30 | #define TEE_SHM_PRIV BIT(7) /* Memory private to TEE driver */ | ||
| 30 | 31 | ||
| 31 | struct device; | 32 | struct device; |
| 32 | struct tee_device; | 33 | struct tee_device; |
| @@ -332,6 +333,7 @@ void *tee_get_drvdata(struct tee_device *teedev); · 299 unmodified lines | |||
| 332 | * @returns a pointer to 'struct tee_shm' | 333 | * @returns a pointer to 'struct tee_shm' |
| 333 | */ | 334 | */ |
| 334 | struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags); | 335 | struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags); |
| 336 | struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t size); | ||
| 335 | 337 | ||
| 336 | /** | 338 | /** |
| 337 | * tee_shm_register() - Register shared memory buffer | 339 | * tee_shm_register() - Register shared memory buffer |