Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Mika Westerberg and committed by
Hans de Goede
c912ac66 d35b0b0e

+16 -20
+2 -2
MAINTAINERS
··· 11471 11471 L: linux-kernel@vger.kernel.org 11472 11472 S: Supported 11473 11473 F: arch/x86/include/asm/intel-mid.h 11474 - F: arch/x86/include/asm/intel_scu_ipc.h 11475 11474 F: arch/x86/pci/intel_mid_pci.c 11476 11475 F: arch/x86/platform/intel-mid/ 11477 11476 F: drivers/extcon/extcon-intel-mrfld.c ··· 11482 11483 F: drivers/watchdog/intel-mid_wdt.c 11483 11484 F: include/linux/mfd/intel_soc_pmic_mrfld.h 11484 11485 F: include/linux/platform_data/intel-mid_wdt.h 11486 + F: include/linux/platform_data/x86/intel_scu_ipc.h 11485 11487 11486 11488 INTEL P-Unit IPC DRIVER 11487 11489 M: Zha Qipeng <qipeng.zha@intel.com> ··· 11546 11546 INTEL SCU DRIVERS 11547 11547 M: Mika Westerberg <mika.westerberg@linux.intel.com> 11548 11548 S: Maintained 11549 - F: arch/x86/include/asm/intel_scu_ipc.h 11550 11549 F: drivers/platform/x86/intel_scu_* 11550 + F: include/linux/platform_data/x86/intel_scu_ipc.h 11551 11551 11552 11552 INTEL SDSI DRIVER 11553 11553 M: David E. Box <david.e.box@linux.intel.com>
+2 -2
arch/x86/include/asm/intel_scu_ipc.h include/linux/platform_data/x86/intel_scu_ipc.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 - #ifndef _ASM_X86_INTEL_SCU_IPC_H_ 3 - #define _ASM_X86_INTEL_SCU_IPC_H_ 2 + #ifndef __PLATFORM_X86_INTEL_SCU_IPC_H_ 3 + #define __PLATFORM_X86_INTEL_SCU_IPC_H_ 4 4 5 5 #include <linux/ioport.h> 6 6
+1 -1
arch/x86/include/asm/intel_telemetry.h
··· 10 10 #define TELEM_MAX_EVENTS_SRAM 28 11 11 #define TELEM_MAX_OS_ALLOCATED_EVENTS 20 12 12 13 - #include <asm/intel_scu_ipc.h> 13 + #include <linux/platform_data/x86/intel_scu_ipc.h> 14 14 15 15 enum telemetry_unit { 16 16 TELEM_PSS = 0,
+2 -1
arch/x86/platform/intel-mid/intel-mid.c
··· 27 27 #include <asm/intel-mid.h> 28 28 #include <asm/io.h> 29 29 #include <asm/i8259.h> 30 - #include <asm/intel_scu_ipc.h> 31 30 #include <asm/reboot.h> 31 + 32 + #include <linux/platform_data/x86/intel_scu_ipc.h> 32 33 33 34 #define IPCMSG_COLD_OFF 0x80 /* Only for Tangier */ 34 35 #define IPCMSG_COLD_RESET 0xF1
+1 -2
drivers/mfd/intel_pmc_bxt.c
··· 23 23 #include <linux/module.h> 24 24 #include <linux/platform_device.h> 25 25 #include <linux/platform_data/itco_wdt.h> 26 - 27 - #include <asm/intel_scu_ipc.h> 26 + #include <linux/platform_data/x86/intel_scu_ipc.h> 28 27 29 28 /* Residency with clock rate at 19.2MHz to usecs */ 30 29 #define S0IX_RESIDENCY_IN_USECS(d, s) \
+1 -2
drivers/mfd/intel_soc_pmic_bxtwc.c
··· 15 15 #include <linux/mfd/intel_soc_pmic.h> 16 16 #include <linux/mfd/intel_soc_pmic_bxtwc.h> 17 17 #include <linux/module.h> 18 - 19 - #include <asm/intel_scu_ipc.h> 18 + #include <linux/platform_data/x86/intel_scu_ipc.h> 20 19 21 20 /* PMIC device registers */ 22 21 #define REG_ADDR_MASK GENMASK(15, 8)
+1 -2
drivers/mfd/intel_soc_pmic_mrfld.c
··· 12 12 #include <linux/mfd/intel_soc_pmic.h> 13 13 #include <linux/mfd/intel_soc_pmic_mrfld.h> 14 14 #include <linux/module.h> 15 + #include <linux/platform_data/x86/intel_scu_ipc.h> 15 16 #include <linux/platform_device.h> 16 17 #include <linux/regmap.h> 17 - 18 - #include <asm/intel_scu_ipc.h> 19 18 20 19 /* 21 20 * Level 2 IRQs
+1 -1
drivers/platform/x86/intel_scu_ipc.c
··· 23 23 #include <linux/module.h> 24 24 #include <linux/slab.h> 25 25 26 - #include <asm/intel_scu_ipc.h> 26 + #include <linux/platform_data/x86/intel_scu_ipc.h> 27 27 28 28 /* IPC defines the following message types */ 29 29 #define IPCMSG_PCNTRL 0xff /* Power controller unit read/write */
+1 -1
drivers/platform/x86/intel_scu_ipcutil.c
··· 18 18 #include <linux/types.h> 19 19 #include <linux/uaccess.h> 20 20 21 - #include <asm/intel_scu_ipc.h> 21 + #include <linux/platform_data/x86/intel_scu_ipc.h> 22 22 23 23 static int major; 24 24
+1 -1
drivers/platform/x86/intel_scu_pcidrv.c
··· 11 11 #include <linux/init.h> 12 12 #include <linux/pci.h> 13 13 14 - #include <asm/intel_scu_ipc.h> 14 + #include <linux/platform_data/x86/intel_scu_ipc.h> 15 15 16 16 static int intel_scu_pci_probe(struct pci_dev *pdev, 17 17 const struct pci_device_id *id)
+1 -1
drivers/platform/x86/intel_scu_pltdrv.c
··· 15 15 #include <linux/module.h> 16 16 #include <linux/platform_device.h> 17 17 18 - #include <asm/intel_scu_ipc.h> 18 + #include <linux/platform_data/x86/intel_scu_ipc.h> 19 19 20 20 static int intel_scu_platform_probe(struct platform_device *pdev) 21 21 {
+1 -2
drivers/usb/typec/mux/intel_pmc_mux.c
··· 8 8 9 9 #include <linux/acpi.h> 10 10 #include <linux/module.h> 11 + #include <linux/platform_data/x86/intel_scu_ipc.h> 11 12 #include <linux/platform_device.h> 12 13 #include <linux/property.h> 13 14 #include <linux/usb/pd.h> ··· 18 17 #include <linux/usb/typec_tbt.h> 19 18 #include <linux/debugfs.h> 20 19 #include <linux/usb.h> 21 - 22 - #include <asm/intel_scu_ipc.h> 23 20 24 21 #define PMC_USBC_CMD 0xa7 25 22
+1 -2
drivers/watchdog/intel-mid_wdt.c
··· 21 21 #include <linux/watchdog.h> 22 22 23 23 #include <linux/platform_data/intel-mid_wdt.h> 24 - 25 - #include <asm/intel_scu_ipc.h> 24 + #include <linux/platform_data/x86/intel_scu_ipc.h> 26 25 27 26 #define IPC_WATCHDOG 0xf8 28 27