From b901d8f15c3b623e6eb01c397cc3140d31388016 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Fri, 11 Jul 2025 09:20:19 -0600
Subject: [PATCH] x86: Rename arch/x86/include/asm/pnp_def.h to
 include/pnp_def.h

There is nothing x86-centric in this include file, and moving it will
allow for some drivers to be compile-tested on sandbox.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c | 2 +-
 board/dfi/dfi-bt700/dfi-bt700.c                            | 2 +-
 board/intel/crownbay/crownbay.c                            | 2 +-
 drivers/misc/nuvoton_nct6102d.c                            | 2 +-
 drivers/misc/smsc_lpc47m.c                                 | 2 +-
 drivers/misc/winbond_w83627.c                              | 2 +-
 {arch/x86/include/asm => include}/pnp_def.h                | 0
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename {arch/x86/include/asm => include}/pnp_def.h (100%)

diff --git a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
index 4197e88fb6f..153594c42bb 100644
--- a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
+++ b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
@@ -5,10 +5,10 @@
 
 #include <i2c.h>
 #include <init.h>
+#include <pnp_def.h>
 #include <winbond_w83627.h>
 #include <asm/gpio.h>
 #include <asm/ibmpc.h>
-#include <asm/pnp_def.h>
 
 int board_early_init_f(void)
 {
diff --git a/board/dfi/dfi-bt700/dfi-bt700.c b/board/dfi/dfi-bt700/dfi-bt700.c
index 907cc985d7a..69a6860c2dd 100644
--- a/board/dfi/dfi-bt700/dfi-bt700.c
+++ b/board/dfi/dfi-bt700/dfi-bt700.c
@@ -6,9 +6,9 @@
 #include <init.h>
 #include <log.h>
 #include <nuvoton_nct6102d.h>
+#include <pnp_def.h>
 #include <asm/gpio.h>
 #include <asm/ibmpc.h>
-#include <asm/pnp_def.h>
 #include <linux/delay.h>
 
 int board_early_init_f(void)
diff --git a/board/intel/crownbay/crownbay.c b/board/intel/crownbay/crownbay.c
index 036beb1146d..6c5d03c1d49 100644
--- a/board/intel/crownbay/crownbay.c
+++ b/board/intel/crownbay/crownbay.c
@@ -4,8 +4,8 @@
  */
 
 #include <init.h>
+#include <pnp_def.h>
 #include <asm/ibmpc.h>
-#include <asm/pnp_def.h>
 #include <smsc_lpc47m.h>
 
 int board_early_init_f(void)
diff --git a/drivers/misc/nuvoton_nct6102d.c b/drivers/misc/nuvoton_nct6102d.c
index a3ca037d25f..c4a8ecaa1b3 100644
--- a/drivers/misc/nuvoton_nct6102d.c
+++ b/drivers/misc/nuvoton_nct6102d.c
@@ -4,8 +4,8 @@
  */
 
 #include <nuvoton_nct6102d.h>
+#include <pnp_def.h>
 #include <asm/io.h>
-#include <asm/pnp_def.h>
 
 static void superio_outb(int reg, int val)
 {
diff --git a/drivers/misc/smsc_lpc47m.c b/drivers/misc/smsc_lpc47m.c
index 1b15907b093..cc3d3f9de06 100644
--- a/drivers/misc/smsc_lpc47m.c
+++ b/drivers/misc/smsc_lpc47m.c
@@ -3,8 +3,8 @@
  * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
  */
 
+#include <pnp_def.h>
 #include <asm/io.h>
-#include <asm/pnp_def.h>
 
 static void pnp_enter_conf_state(u16 dev)
 {
diff --git a/drivers/misc/winbond_w83627.c b/drivers/misc/winbond_w83627.c
index 87b9043e65c..8c5b121b8e9 100644
--- a/drivers/misc/winbond_w83627.c
+++ b/drivers/misc/winbond_w83627.c
@@ -3,8 +3,8 @@
  * Copyright (C) 2016 Stefan Roese <sr@denx.de>
  */
 
+#include <pnp_def.h>
 #include <asm/io.h>
-#include <asm/pnp_def.h>
 
 #define WINBOND_ENTRY_KEY	0x87
 #define WINBOND_EXIT_KEY	0xaa
diff --git a/arch/x86/include/asm/pnp_def.h b/include/pnp_def.h
similarity index 100%
rename from arch/x86/include/asm/pnp_def.h
rename to include/pnp_def.h
-- 
2.47.3