Commit 654c39c7 authored by Will Deacon's avatar Will Deacon
Browse files

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

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)
parents af40ff68 8dc12538

drivers/acpi/arm64/iort.c

+0 −12
Original line number Diff line number Diff line
@@ -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,

include/asm-generic/vmlinux.lds.h

+0 −1
Original line number Diff line number Diff line
@@ -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							\

CRA Git | Maintained and supported by SUSTech CRA and CCSE