diff options
| author | Will Deacon <will.deacon@arm.com> | 2018-03-09 15:28:43 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-03-09 15:28:43 +0000 |
| commit | 654c39c7982c5314748eda50352dbc35099a2595 (patch) | |
| tree | 43ed8fe28476276c882c4ab13956b2b19f1739ec | |
| parent | af40ff687bc9d351030685fde2f57ba45ab4fc14 (diff) | |
| parent | 8dc12538dd14480ffcbcbf18b80dc641ee37e9de (diff) | |
| download | linux-654c39c7982c5314748eda50352dbc35099a2595.tar.gz linux-654c39c7982c5314748eda50352dbc35099a2595.tar.xz | |
Merge tag 'acpi/iort-for-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/linux into aarch64/for-next/core
Three ACPI IORT clean-up patches aimed at v4.17 release cycle:
- Removal of IORT linker script entry re-introduced by mistake by clocksource
drivers refactoring (J.He)
- Two ACPICA guards removal of previously introduced guards to prevent
ACPICA<->kernel patches dependencies (L.Pieralisi)
| -rw-r--r-- | drivers/acpi/arm64/iort.c | 12 | ||||
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index 95255ecfae7c..9e702bc4960f 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -31,11 +31,6 @@ #define IORT_IOMMU_TYPE ((1 << ACPI_IORT_NODE_SMMU) | \ (1 << ACPI_IORT_NODE_SMMU_V3)) -/* Until ACPICA headers cover IORT rev. C */ -#ifndef ACPI_IORT_SMMU_V3_CAVIUM_CN99XX -#define ACPI_IORT_SMMU_V3_CAVIUM_CN99XX 0x2 -#endif - struct iort_its_msi_chip { struct list_head list; struct fwnode_handle *fw_node; @@ -366,7 +361,6 @@ static struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node, return NULL; } -#if (ACPI_CA_VERSION > 0x20170929) static int iort_get_id_mapping_index(struct acpi_iort_node *node) { struct acpi_iort_smmu_v3 *smmu; @@ -400,12 +394,6 @@ static int iort_get_id_mapping_index(struct acpi_iort_node *node) return -EINVAL; } } -#else -static inline int iort_get_id_mapping_index(struct acpi_iort_node *node) -{ - return -EINVAL; -} -#endif static struct acpi_iort_node *iort_node_map_id(struct acpi_iort_node *node, u32 id_in, u32 *id_out, diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 1ab0e520d6fc..58b1dab0cf59 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -589,7 +589,6 @@ IRQCHIP_OF_MATCH_TABLE() \ ACPI_PROBE_TABLE(irqchip) \ ACPI_PROBE_TABLE(timer) \ - ACPI_PROBE_TABLE(iort) \ EARLYCON_TABLE() #define INIT_TEXT \ |