Commit fc001b36 authored by Sudeep Holla's avatar Sudeep Holla Committed by Rafael J. Wysocki
Browse files

ACPI: Move AMBA bus scan handling into arm64 specific directory 



Commit fcea0ccf ("ACPI: bus: Consolidate all arm specific
initialisation into acpi_arm_init()") moved all of the ARM-specific
initialization into acpi_arm_init(). However, acpi_amba.c being outside
of drivers/acpi/arm64 got ignored and hence acpi_amba_init() was not
moved into acpi_arm_init().

Move the AMBA platform bus support into arm64 specific folder and make
acpi_amba_init() part of acpi_arm_init().

Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 5d0c230f

drivers/acpi/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ acpi-$(CONFIG_PCI) += acpi_lpss.o 
acpi-y				+= acpi_apd.o

acpi-y				+= acpi_platform.o

acpi-y				+= acpi_pnp.o

acpi-$(CONFIG_ARM_AMBA)	+= acpi_amba.o

acpi-y				+= power.o

acpi-y				+= event.o

acpi-y				+= evged.o

drivers/acpi/arm64/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,4 +3,5 @@ obj-$(CONFIG_ACPI_AGDI) += agdi.o 
obj-$(CONFIG_ACPI_IORT) 	+= iort.o

obj-$(CONFIG_ACPI_GTDT) 	+= gtdt.o

obj-$(CONFIG_ACPI_APMT) 	+= apmt.o

obj-$(CONFIG_ARM_AMBA)		+= amba.o

obj-y				+= dma.o init.o

drivers/acpi/acpi_amba.c→drivers/acpi/arm64/amba.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/kernel.h>

#include <linux/module.h>



#include "internal.h"

#include "init.h"



static const struct acpi_device_id amba_id_list[] = {

	{"ARMH0061", 0}, /* PL061 GPIO Device */

drivers/acpi/arm64/init.c

+2 −0
Original line number Diff line number Diff line
@@ -10,4 +10,6 @@ void __init acpi_arm_init(void) 
		acpi_apmt_init();

	if (IS_ENABLED(CONFIG_ACPI_IORT))

		acpi_iort_init();

	if (IS_ENABLED(CONFIG_ARM_AMBA))

		acpi_amba_init();

}

drivers/acpi/arm64/init.h

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ 
void __init acpi_agdi_init(void);

void __init acpi_apmt_init(void);

void __init acpi_iort_init(void);

void __init acpi_amba_init(void);