Commit 0515ce0f authored by Will Deacon's avatar Will Deacon

Merge tag 'acpi/iort-for-v4.15' of...

Merge tag 'acpi/iort-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/linux into aarch64/for-next/core

Pull arm64 ACPI IORT updates from Lorenzo Pieralisi:

- Code clean-ups (A.Yadav, L.Pieralisi)
- Platform devices inizialization rework in preparation for IORT PMCG
  handling (L.Pieralisi)
- Mapping API rework to enable MSIs for IORT components as defined in
  IORT specification issue C (H.Guo, L.Pieralisi)
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parents 7b77452e 65637901
...@@ -199,7 +199,7 @@ static int __init gtdt_parse_timer_block(struct acpi_gtdt_timer_block *block, ...@@ -199,7 +199,7 @@ static int __init gtdt_parse_timer_block(struct acpi_gtdt_timer_block *block,
struct acpi_gtdt_timer_entry *gtdt_frame; struct acpi_gtdt_timer_entry *gtdt_frame;
if (!block->timer_count) { if (!block->timer_count) {
pr_err(FW_BUG "GT block present, but frame count is zero."); pr_err(FW_BUG "GT block present, but frame count is zero.\n");
return -ENODEV; return -ENODEV;
} }
......
This diff is collapsed.
...@@ -49,8 +49,8 @@ static inline void acpi_configure_pmsi_domain(struct device *dev) { } ...@@ -49,8 +49,8 @@ static inline void acpi_configure_pmsi_domain(struct device *dev) { }
/* IOMMU interface */ /* IOMMU interface */
static inline void iort_dma_setup(struct device *dev, u64 *dma_addr, static inline void iort_dma_setup(struct device *dev, u64 *dma_addr,
u64 *size) { } u64 *size) { }
static inline static inline const struct iommu_ops *iort_iommu_configure(
const struct iommu_ops *iort_iommu_configure(struct device *dev) struct device *dev)
{ return NULL; } { return NULL; }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment