diff options
| author | Tom Rini <[email protected]> | 2023-12-21 15:35:03 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-12-21 15:35:03 -0500 |
| commit | ced928b1994b6dd8d133797f506c0991b0e6196d (patch) | |
| tree | e5da3ba0d1119e7f050831ebdbddc9ca139edd0e /include | |
| parent | ae797e022e6de408497a5ffaa329751893762b9b (diff) | |
| parent | fa78301a986f4c7daf31bac2ba0e9216e76acd31 (diff) | |
Merge branch '2023-12-21-assorted-updates-and-fixes' into next
- A few board fixes along with IOMMU enhancements and general fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/env/ti/ti_common.env | 5 | ||||
| -rw-r--r-- | include/iommu.h | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/env/ti/ti_common.env b/include/env/ti/ti_common.env index f5d84216e3c..f0f89a22876 100644 --- a/include/env/ti/ti_common.env +++ b/include/env/ti/ti_common.env @@ -25,7 +25,10 @@ run_fit=run get_fit_config; bootm ${addr_fit}#${name_fit_config}${overlaystring} bootcmd_ti_mmc= run findfdt; run init_${boot}; #if CONFIG_CMD_REMOTEPROC - run main_cpsw0_qsgmii_phyinit; run boot_rprocs; + if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1; + then run main_cpsw0_qsgmii_phyinit; + fi + run boot_rprocs; #endif if test ${boot_fit} -eq 1; then run get_fit_${boot}; run get_fit_overlaystring; run run_fit; diff --git a/include/iommu.h b/include/iommu.h index cf9719c5e91..b8ba0b8e707 100644 --- a/include/iommu.h +++ b/include/iommu.h @@ -5,6 +5,15 @@ struct udevice; struct iommu_ops { /** + * init() - Connect a device to it's IOMMU, called before probe() + * The iommu device can be fetched through dev->iommu + * + * @iommu_dev: IOMMU device + * @dev: Device to connect + * @return 0 if OK, -errno on error + */ + int (*connect)(struct udevice *dev); + /** * map() - map DMA memory * * @dev: device for which to map DMA memory |