diff mbox

[U-Boot,v2,2/8] x86: acpi: Make irqroute.asl common

Message ID 1464229153-23917-3-git-send-email-bmeng.cn@gmail.com
State Accepted
Delegated to: Bin Meng
Headers show

Commit Message

Bin Meng May 26, 2016, 2:19 a.m. UTC 
The irqroute.asl file is already common enough to all x86 platforms.
Platform ASL files need only provide a irqroute.h to describe how
internal PCI devices and PCIe downstream port devices' INTx pins are
routed to which PIRQ pin.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None

 arch/x86/include/asm/{arch-baytrail => }/acpi/irq_helper.h | 2 +-
 arch/x86/include/asm/{arch-baytrail => }/acpi/irqroute.asl | 0
 arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl   | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename arch/x86/include/asm/{arch-baytrail => }/acpi/irq_helper.h (98%)
 rename arch/x86/include/asm/{arch-baytrail => }/acpi/irqroute.asl (100%)

Comments

Bin Meng May 27, 2016, 2:14 a.m. UTC | #1 
On Thu, May 26, 2016 at 10:19 AM, Bin Meng <bmeng.cn@gmail.com> wrote:
> The irqroute.asl file is already common enough to all x86 platforms.
> Platform ASL files need only provide a irqroute.h to describe how
> internal PCI devices and PCIe downstream port devices' INTx pins are
> routed to which PIRQ pin.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v2: None
>
>  arch/x86/include/asm/{arch-baytrail => }/acpi/irq_helper.h | 2 +-
>  arch/x86/include/asm/{arch-baytrail => }/acpi/irqroute.asl | 0
>  arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl   | 2 +-
>  3 files changed, 2 insertions(+), 2 deletions(-)
>  rename arch/x86/include/asm/{arch-baytrail => }/acpi/irq_helper.h (98%)
>  rename arch/x86/include/asm/{arch-baytrail => }/acpi/irqroute.asl (100%)
>

applied to u-boot-x86, thanks!
diff mbox

Patch

diff --git a/arch/x86/include/asm/arch-baytrail/acpi/irq_helper.h b/arch/x86/include/asm/acpi/irq_helper.h
similarity index 98%
rename from arch/x86/include/asm/arch-baytrail/acpi/irq_helper.h
rename to arch/x86/include/asm/acpi/irq_helper.h
index 2c3585a..f0b3a6b 100644
--- a/arch/x86/include/asm/arch-baytrail/acpi/irq_helper.h
+++ b/arch/x86/include/asm/acpi/irq_helper.h
@@ -108,4 +108,4 @@  Device (prefix_ ## 0 ## func_) \
 }
 
 /* SoC specific PIRQ route configuration */
-#include "irqroute.h"
+#include <asm/arch/acpi/irqroute.h>
diff --git a/arch/x86/include/asm/arch-baytrail/acpi/irqroute.asl b/arch/x86/include/asm/acpi/irqroute.asl
similarity index 100%
rename from arch/x86/include/asm/arch-baytrail/acpi/irqroute.asl
rename to arch/x86/include/asm/acpi/irqroute.asl
diff --git a/arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl b/arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl
index 34d3951..e89ff26 100644
--- a/arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl
+++ b/arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl
@@ -207,5 +207,5 @@  Device (PCI0)
 	#include "xhci.asl"
 
 	/* IRQ routing for each PCI device */
-	#include "irqroute.asl"
+	#include <asm/acpi/irqroute.asl>
 }