Merge tag 'drm-next-2019-12-06' of git://anongit.freedesktop.org/drm/drm

[platform/kernel/linux-rpi.git] / drivers / firmware / qcom_scm.h

diff --git a/drivers/firmware/qcom_scm.h b/drivers/firmware/qcom_scm.h
index ef293ee..81dcf5f 100644 (file)
--- a/drivers/firmware/qcom_scm.h
+++ b/drivers/firmware/qcom_scm.h
@@ -100,10 +100,15 @@ extern int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id,
                                      u32 spare);
 #define QCOM_SCM_IOMMU_SECURE_PTBL_SIZE        3
 #define QCOM_SCM_IOMMU_SECURE_PTBL_INIT        4
+#define QCOM_SCM_SVC_SMMU_PROGRAM      0x15
+#define QCOM_SCM_CONFIG_ERRATA1                0x3
+#define QCOM_SCM_CONFIG_ERRATA1_CLIENT_ALL     0x2
 extern int __qcom_scm_iommu_secure_ptbl_size(struct device *dev, u32 spare,
                                             size_t *size);
 extern int __qcom_scm_iommu_secure_ptbl_init(struct device *dev, u64 addr,
                                             u32 size, u32 spare);
+extern int __qcom_scm_qsmmu500_wait_safe_toggle(struct device *dev,
+                                               bool enable);
 #define QCOM_MEM_PROT_ASSIGN_ID        0x16
 extern int  __qcom_scm_assign_mem(struct device *dev,
                                  phys_addr_t mem_region, size_t mem_sz,