Commit e720a6c8 authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

drivers: firmware: psci: Move psci to separate directory 



Some following changes extends the PSCI driver with some additional
files.  Avoid to continue cluttering the toplevel firmware directory
and first move the PSCI files into a PSCI sub-directory.

Suggested-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 15ade5d2

drivers/firmware/Kconfig

+1 −14
Original line number Diff line number Diff line
@@ -5,20 +5,6 @@ 


menu "Firmware Drivers"



config ARM_PSCI_FW

	bool



config ARM_PSCI_CHECKER

	bool "ARM PSCI checker"

	depends on ARM_PSCI_FW && HOTPLUG_CPU && CPU_IDLE && !TORTURE_TEST

	help

	  Run the PSCI checker during startup. This checks that hotplug and

	  suspend operations work correctly when using PSCI.



	  The torture tests may interfere with the PSCI checker by turning CPUs

	  on and off through hotplug, so for now torture tests and PSCI checker

	  are mutually exclusive.



config ARM_SCMI_PROTOCOL

	bool "ARM System Control and Management Interface (SCMI) Message Protocol"

	depends on ARM || ARM64 || COMPILE_TEST
@@ -270,6 +256,7 @@ config TI_SCI_PROTOCOL 
config HAVE_ARM_SMCCC

	bool



source "drivers/firmware/psci/Kconfig"

source "drivers/firmware/broadcom/Kconfig"

source "drivers/firmware/google/Kconfig"

source "drivers/firmware/efi/Kconfig"

drivers/firmware/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
#

# Makefile for the linux kernel.

#

obj-$(CONFIG_ARM_PSCI_FW)	+= psci.o

obj-$(CONFIG_ARM_PSCI_CHECKER)	+= psci_checker.o

obj-$(CONFIG_ARM_SCPI_PROTOCOL)	+= arm_scpi.o

obj-$(CONFIG_ARM_SCPI_POWER_DOMAIN) += scpi_pm_domain.o

obj-$(CONFIG_ARM_SDE_INTERFACE)	+= arm_sdei.o
@@ -25,6 +23,7 @@ CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch armv7-a\n.arch_extension sec,-DREQU 
obj-$(CONFIG_TI_SCI_PROTOCOL)	+= ti_sci.o



obj-$(CONFIG_ARM_SCMI_PROTOCOL)	+= arm_scmi/

obj-y				+= psci/

obj-y				+= broadcom/

obj-y				+= meson/

obj-$(CONFIG_GOOGLE_FIRMWARE)	+= google/

drivers/firmware/psci/Kconfig

0 → 100644
+13 −0
Original line number Diff line number Diff line 
config ARM_PSCI_FW

	bool



config ARM_PSCI_CHECKER

	bool "ARM PSCI checker"

	depends on ARM_PSCI_FW && HOTPLUG_CPU && CPU_IDLE && !TORTURE_TEST

	help

	  Run the PSCI checker during startup. This checks that hotplug and

	  suspend operations work correctly when using PSCI.



	  The torture tests may interfere with the PSCI checker by turning CPUs

	  on and off through hotplug, so for now torture tests and PSCI checker

	  are mutually exclusive.

drivers/firmware/psci/Makefile

0 → 100644
+4 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

obj-$(CONFIG_ARM_PSCI_FW)	+= psci.o

obj-$(CONFIG_ARM_PSCI_CHECKER)	+= psci_checker.o

drivers/firmware/psci.c→drivers/firmware/psci/psci.c

+0 −0

File moved.

View file