platform/x86: intel_scu_ipc: Move intel_scu_ipc.h out of arch/x86/include/asm

This is a platform/x86 library that is mostly being used by other
drivers not directly under arch/x86 anyway (with the exception of the
Intel MID setup code) so it makes sense that it lives under the
platform_data/x86/ directory instead.

No functional changes intended.

Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240909124952.1152017-3-andriy.shevchenko@linux.intel.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Mika Westerberg 2024-09-09 15:41:05 +03:00 committed by Hans de Goede
parent d35b0b0e14
commit c912ac66b3
13 changed files with 16 additions and 20 deletions

View File

@ -11471,7 +11471,6 @@ M: Andy Shevchenko <andy@kernel.org>
L: linux-kernel@vger.kernel.org L: linux-kernel@vger.kernel.org
S: Supported S: Supported
F: arch/x86/include/asm/intel-mid.h F: arch/x86/include/asm/intel-mid.h
F: arch/x86/include/asm/intel_scu_ipc.h
F: arch/x86/pci/intel_mid_pci.c F: arch/x86/pci/intel_mid_pci.c
F: arch/x86/platform/intel-mid/ F: arch/x86/platform/intel-mid/
F: drivers/extcon/extcon-intel-mrfld.c F: drivers/extcon/extcon-intel-mrfld.c
@ -11483,6 +11482,7 @@ F: drivers/staging/media/atomisp/
F: drivers/watchdog/intel-mid_wdt.c F: drivers/watchdog/intel-mid_wdt.c
F: include/linux/mfd/intel_soc_pmic_mrfld.h F: include/linux/mfd/intel_soc_pmic_mrfld.h
F: include/linux/platform_data/intel-mid_wdt.h F: include/linux/platform_data/intel-mid_wdt.h
F: include/linux/platform_data/x86/intel_scu_ipc.h
INTEL P-Unit IPC DRIVER INTEL P-Unit IPC DRIVER
M: Zha Qipeng <qipeng.zha@intel.com> M: Zha Qipeng <qipeng.zha@intel.com>
@ -11546,8 +11546,8 @@ F: drivers/counter/intel-qep.c
INTEL SCU DRIVERS INTEL SCU DRIVERS
M: Mika Westerberg <mika.westerberg@linux.intel.com> M: Mika Westerberg <mika.westerberg@linux.intel.com>
S: Maintained S: Maintained
F: arch/x86/include/asm/intel_scu_ipc.h
F: drivers/platform/x86/intel_scu_* F: drivers/platform/x86/intel_scu_*
F: include/linux/platform_data/x86/intel_scu_ipc.h
INTEL SDSI DRIVER INTEL SDSI DRIVER
M: David E. Box <david.e.box@linux.intel.com> M: David E. Box <david.e.box@linux.intel.com>

View File

@ -10,7 +10,7 @@
#define TELEM_MAX_EVENTS_SRAM 28 #define TELEM_MAX_EVENTS_SRAM 28
#define TELEM_MAX_OS_ALLOCATED_EVENTS 20 #define TELEM_MAX_OS_ALLOCATED_EVENTS 20
#include <asm/intel_scu_ipc.h> #include <linux/platform_data/x86/intel_scu_ipc.h>
enum telemetry_unit { enum telemetry_unit {
TELEM_PSS = 0, TELEM_PSS = 0,

View File

@ -27,9 +27,10 @@
#include <asm/intel-mid.h> #include <asm/intel-mid.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/i8259.h> #include <asm/i8259.h>
#include <asm/intel_scu_ipc.h>
#include <asm/reboot.h> #include <asm/reboot.h>
#include <linux/platform_data/x86/intel_scu_ipc.h>
#define IPCMSG_COLD_OFF 0x80 /* Only for Tangier */ #define IPCMSG_COLD_OFF 0x80 /* Only for Tangier */
#define IPCMSG_COLD_RESET 0xF1 #define IPCMSG_COLD_RESET 0xF1

View File

@ -23,8 +23,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/platform_data/itco_wdt.h> #include <linux/platform_data/itco_wdt.h>
#include <linux/platform_data/x86/intel_scu_ipc.h>
#include <asm/intel_scu_ipc.h>
/* Residency with clock rate at 19.2MHz to usecs */ /* Residency with clock rate at 19.2MHz to usecs */
#define S0IX_RESIDENCY_IN_USECS(d, s) \ #define S0IX_RESIDENCY_IN_USECS(d, s) \

View File

@ -15,8 +15,7 @@
#include <linux/mfd/intel_soc_pmic.h> #include <linux/mfd/intel_soc_pmic.h>
#include <linux/mfd/intel_soc_pmic_bxtwc.h> #include <linux/mfd/intel_soc_pmic_bxtwc.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_data/x86/intel_scu_ipc.h>
#include <asm/intel_scu_ipc.h>
/* PMIC device registers */ /* PMIC device registers */
#define REG_ADDR_MASK GENMASK(15, 8) #define REG_ADDR_MASK GENMASK(15, 8)

View File

@ -12,11 +12,10 @@
#include <linux/mfd/intel_soc_pmic.h> #include <linux/mfd/intel_soc_pmic.h>
#include <linux/mfd/intel_soc_pmic_mrfld.h> #include <linux/mfd/intel_soc_pmic_mrfld.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_data/x86/intel_scu_ipc.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <asm/intel_scu_ipc.h>
/* /*
* Level 2 IRQs * Level 2 IRQs
* *

View File

@ -23,7 +23,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/intel_scu_ipc.h> #include <linux/platform_data/x86/intel_scu_ipc.h>
/* IPC defines the following message types */ /* IPC defines the following message types */
#define IPCMSG_PCNTRL 0xff /* Power controller unit read/write */ #define IPCMSG_PCNTRL 0xff /* Power controller unit read/write */

View File

@ -18,7 +18,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/intel_scu_ipc.h> #include <linux/platform_data/x86/intel_scu_ipc.h>
static int major; static int major;

View File

@ -11,7 +11,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/intel_scu_ipc.h> #include <linux/platform_data/x86/intel_scu_ipc.h>
static int intel_scu_pci_probe(struct pci_dev *pdev, static int intel_scu_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)

View File

@ -15,7 +15,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <asm/intel_scu_ipc.h> #include <linux/platform_data/x86/intel_scu_ipc.h>
static int intel_scu_platform_probe(struct platform_device *pdev) static int intel_scu_platform_probe(struct platform_device *pdev)
{ {

View File

@ -8,6 +8,7 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_data/x86/intel_scu_ipc.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/property.h> #include <linux/property.h>
#include <linux/usb/pd.h> #include <linux/usb/pd.h>
@ -18,8 +19,6 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <asm/intel_scu_ipc.h>
#define PMC_USBC_CMD 0xa7 #define PMC_USBC_CMD 0xa7
/* Response status bits */ /* Response status bits */

View File

@ -21,8 +21,7 @@
#include <linux/watchdog.h> #include <linux/watchdog.h>
#include <linux/platform_data/intel-mid_wdt.h> #include <linux/platform_data/intel-mid_wdt.h>
#include <linux/platform_data/x86/intel_scu_ipc.h>
#include <asm/intel_scu_ipc.h>
#define IPC_WATCHDOG 0xf8 #define IPC_WATCHDOG 0xf8

View File

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_INTEL_SCU_IPC_H_ #ifndef __PLATFORM_X86_INTEL_SCU_IPC_H_
#define _ASM_X86_INTEL_SCU_IPC_H_ #define __PLATFORM_X86_INTEL_SCU_IPC_H_
#include <linux/ioport.h> #include <linux/ioport.h>