Skip to content

Commit c912ac6

Browse files
westerijwrdegoede
westeri
authored and
jwrdegoede
committed
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>
1 parent d35b0b0 commit c912ac6

13 files changed

Lines changed: 16 additions & 20 deletions

File tree

‎MAINTAINERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11471,7 +11471,6 @@ M: Andy Shevchenko <andy@kernel.org>
1147111471
L: linux-kernel@vger.kernel.org
1147211472
S: Supported
1147311473
F: arch/x86/include/asm/intel-mid.h
11474-
F: arch/x86/include/asm/intel_scu_ipc.h
1147511474
F: arch/x86/pci/intel_mid_pci.c
1147611475
F: arch/x86/platform/intel-mid/
1147711476
F: drivers/extcon/extcon-intel-mrfld.c
@@ -11483,6 +11482,7 @@ F: drivers/staging/media/atomisp/
1148311482
F: drivers/watchdog/intel-mid_wdt.c
1148411483
F: include/linux/mfd/intel_soc_pmic_mrfld.h
1148511484
F: include/linux/platform_data/intel-mid_wdt.h
11485+
F: include/linux/platform_data/x86/intel_scu_ipc.h
1148611486

1148711487
INTEL P-Unit IPC DRIVER
1148811488
M: Zha Qipeng <qipeng.zha@intel.com>
@@ -11546,8 +11546,8 @@ F: drivers/counter/intel-qep.c
1154611546
INTEL SCU DRIVERS
1154711547
M: Mika Westerberg <mika.westerberg@linux.intel.com>
1154811548
S: Maintained
11549-
F: arch/x86/include/asm/intel_scu_ipc.h
1155011549
F: drivers/platform/x86/intel_scu_*
11550+
F: include/linux/platform_data/x86/intel_scu_ipc.h
1155111551

1155211552
INTEL SDSI DRIVER
1155311553
M: David E. Box <david.e.box@linux.intel.com>

‎arch/x86/include/asm/intel_telemetry.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#define TELEM_MAX_EVENTS_SRAM 28
1111
#define TELEM_MAX_OS_ALLOCATED_EVENTS 20
1212

13-
#include <asm/intel_scu_ipc.h>
13+
#include <linux/platform_data/x86/intel_scu_ipc.h>
1414

1515
enum telemetry_unit {
1616
TELEM_PSS = 0,

‎arch/x86/platform/intel-mid/intel-mid.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@
2727
#include <asm/intel-mid.h>
2828
#include <asm/io.h>
2929
#include <asm/i8259.h>
30-
#include <asm/intel_scu_ipc.h>
3130
#include <asm/reboot.h>
3231

32+
#include <linux/platform_data/x86/intel_scu_ipc.h>
33+
3334
#define IPCMSG_COLD_OFF 0x80 /* Only for Tangier */
3435
#define IPCMSG_COLD_RESET 0xF1
3536

‎drivers/mfd/intel_pmc_bxt.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
#include <linux/module.h>
2424
#include <linux/platform_device.h>
2525
#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>
2827

2928
/* Residency with clock rate at 19.2MHz to usecs */
3029
#define S0IX_RESIDENCY_IN_USECS(d, s) \

‎drivers/mfd/intel_soc_pmic_bxtwc.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
#include <linux/mfd/intel_soc_pmic.h>
1616
#include <linux/mfd/intel_soc_pmic_bxtwc.h>
1717
#include <linux/module.h>
18-
19-
#include <asm/intel_scu_ipc.h>
18+
#include <linux/platform_data/x86/intel_scu_ipc.h>
2019

2120
/* PMIC device registers */
2221
#define REG_ADDR_MASK GENMASK(15, 8)

‎drivers/mfd/intel_soc_pmic_mrfld.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
#include <linux/mfd/intel_soc_pmic.h>
1313
#include <linux/mfd/intel_soc_pmic_mrfld.h>
1414
#include <linux/module.h>
15+
#include <linux/platform_data/x86/intel_scu_ipc.h>
1516
#include <linux/platform_device.h>
1617
#include <linux/regmap.h>
1718

18-
#include <asm/intel_scu_ipc.h>
19-
2019
/*
2120
* Level 2 IRQs
2221
*

‎drivers/platform/x86/intel_scu_ipc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <linux/module.h>
2424
#include <linux/slab.h>
2525

26-
#include <asm/intel_scu_ipc.h>
26+
#include <linux/platform_data/x86/intel_scu_ipc.h>
2727

2828
/* IPC defines the following message types */
2929
#define IPCMSG_PCNTRL 0xff /* Power controller unit read/write */

‎drivers/platform/x86/intel_scu_ipcutil.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <linux/types.h>
1919
#include <linux/uaccess.h>
2020

21-
#include <asm/intel_scu_ipc.h>
21+
#include <linux/platform_data/x86/intel_scu_ipc.h>
2222

2323
static int major;
2424

‎drivers/platform/x86/intel_scu_pcidrv.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <linux/init.h>
1212
#include <linux/pci.h>
1313

14-
#include <asm/intel_scu_ipc.h>
14+
#include <linux/platform_data/x86/intel_scu_ipc.h>
1515

1616
static int intel_scu_pci_probe(struct pci_dev *pdev,
1717
const struct pci_device_id *id)

‎drivers/platform/x86/intel_scu_pltdrv.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/module.h>
1616
#include <linux/platform_device.h>
1717

18-
#include <asm/intel_scu_ipc.h>
18+
#include <linux/platform_data/x86/intel_scu_ipc.h>
1919

2020
static int intel_scu_platform_probe(struct platform_device *pdev)
2121
{

0 commit comments

Comments
 (0)