History

Merge tag 'soc-fixes-6.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull SoC fixes from Arnd Bergmann: "These are mainly devicetree fixes for the arm platforms from Rockchips NXP, ASpeed and Broadcom, addressing issues with accidental overclocking, pinctrl, network and dtc warnings. There are additional fixes for regressions with the i.MX reset and memory controller drivers as well as the Tegra memory controller driver. Minor updates to the MAINTAINERS file, tee documentation and defconfigs bring those up to date with recent changes elsewhere" * tag 'soc-fixes-6.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (29 commits) MAINTAINERS: sync omap devicetree maintainers with omap platform MAINTAINERS: Update Krzysztof Kozlowski's email arm64: dts: rockchip: fix PCIe 3.3V regulator voltage on orangepi-5 arm64: dts: rockchip: disable HS400 on RK3588 Tiger arm64: dts: rockchip: drop reset from rk3576 i2c9 node tee: <uapi/linux/tee.h: fix all kernel-doc issues arm64: dts: rockchip: Fix USB power enable pin for BTT CB2 and Pi2 arm64: dts: broadcom: bcm2712: rpi-5: Add ethernet0 alias arm64: dts: broadcom: Assign clock rates in eth node for RPi5 reset: imx8mp-audiomix: Fix bad mask values ARM: dts: BCM53573: Fix address of Luxul XAP-1440's Ethernet PHY arm64: defconfig: Fix V3D deferred probe timeout arm64: dts: rockchip: Fix vccio4-supply on rk3566-pinetab2 arm64: dts: rockchip: include rk3399-base instead of rk3399 in rk3399-op1 arm64: dts: imx8mp-kontron: Fix USB OTG role switching arm64: dts: imx95: Fix MSI mapping for PCIe endpoint nodes arm64: dts: imx8-ss-img: Avoid gpio0_mipi_csi GPIOs being deferred arm: imx_v6_v7_defconfig: enable ext4 directly memory: tegra210: Fix incorrect client ids arm64: dts: rockchip: Fix indentation on rk3399 haikou demo dtso ...

Linus Torvalds committed 11 months ago

Commit 23cb64f2 parents fdeee1c 7a6013226 files · +94 −61Browse files

Showing the changes to include/uapi (1 of 26 files). Show all

Unified · Split

include/uapi/linux/tee.h+14−9
@@ -249,8 +249,9 @@ struct tee_ioctl_param { · 248 unmodified lines
249 * @cancel_id: [in] Cancellation id, a unique value to identify this request249 * @cancel_id: [in] Cancellation id, a unique value to identify this request
250 * @session: [out] Session id250 * @session: [out] Session id
251 * @ret: [out] return value251 * @ret: [out] return value
252 * @ret_origin [out] origin of the return value252 * @ret_origin: [out] origin of the return value
253 * @num_params [in] number of parameters following this struct253 * @num_params: [in] number of &struct tee_ioctl_param entries in @params
254 * @params: array of ioctl parameters
254 */255 */
255struct tee_ioctl_open_session_arg {256struct tee_ioctl_open_session_arg {
256 __u8 uuid[TEE_IOCTL_UUID_LEN];257 __u8 uuid[TEE_IOCTL_UUID_LEN];
@@ -276,14 +277,14 @@ struct tee_ioctl_open_session_arg { · 19 unmodified lines
276 struct tee_ioctl_buf_data)277 struct tee_ioctl_buf_data)
277 278
278/**279/**
279 * struct tee_ioctl_invoke_func_arg - Invokes a function in a Trusted280 * struct tee_ioctl_invoke_arg - Invokes a function in a Trusted Application
280 * Application
281 * @func: [in] Trusted Application function, specific to the TA281 * @func: [in] Trusted Application function, specific to the TA
282 * @session: [in] Session id282 * @session: [in] Session id
283 * @cancel_id: [in] Cancellation id, a unique value to identify this request283 * @cancel_id: [in] Cancellation id, a unique value to identify this request
284 * @ret: [out] return value284 * @ret: [out] return value
285 * @ret_origin [out] origin of the return value285 * @ret_origin: [out] origin of the return value
286 * @num_params [in] number of parameters following this struct286 * @num_params: [in] number of parameters following this struct
287 * @params: array of ioctl parameters
287 */288 */
288struct tee_ioctl_invoke_arg {289struct tee_ioctl_invoke_arg {
289 __u32 func;290 __u32 func;
@@ -338,7 +339,8 @@ struct tee_ioctl_close_session_arg { · 48 unmodified lines
338/**339/**
339 * struct tee_iocl_supp_recv_arg - Receive a request for a supplicant function340 * struct tee_iocl_supp_recv_arg - Receive a request for a supplicant function
340 * @func: [in] supplicant function341 * @func: [in] supplicant function
341 * @num_params [in/out] number of parameters following this struct342 * @num_params: [in/out] number of &struct tee_ioctl_param entries in @params
343 * @params: array of ioctl parameters
342 *344 *
343 * @num_params is the number of params that tee-supplicant has room to345 * @num_params is the number of params that tee-supplicant has room to
344 * receive when input, @num_params is the number of actual params346 * receive when input, @num_params is the number of actual params
@@ -363,7 +365,8 @@ struct tee_iocl_supp_recv_arg { · 18 unmodified lines
363/**365/**
364 * struct tee_iocl_supp_send_arg - Send a response to a received request366 * struct tee_iocl_supp_send_arg - Send a response to a received request
365 * @ret: [out] return value367 * @ret: [out] return value
366 * @num_params [in] number of parameters following this struct368 * @num_params: [in] number of &struct tee_ioctl_param entries in @params
369 * @params: array of ioctl parameters
367 */370 */
368struct tee_iocl_supp_send_arg {371struct tee_iocl_supp_send_arg {
369 __u32 ret;372 __u32 ret;
@@ -454,11 +457,13 @@ struct tee_ioctl_shm_register_fd_data { · 84 unmodified lines
454 */457 */
455 458
456/**459/**
457 * struct tee_ioctl_invoke_func_arg - Invokes an object in a Trusted Application460 * struct tee_ioctl_object_invoke_arg - Invokes an object in a
461 * Trusted Application
458 * @id: [in] Object id462 * @id: [in] Object id
459 * @op: [in] Object operation, specific to the object463 * @op: [in] Object operation, specific to the object
460 * @ret: [out] return value464 * @ret: [out] return value
461 * @num_params: [in] number of parameters following this struct465 * @num_params: [in] number of parameters following this struct
466 * @params: array of ioctl parameters
462 */467 */
463struct tee_ioctl_object_invoke_arg {468struct tee_ioctl_object_invoke_arg {
464 __u64 id;469 __u64 id;