Commit 7cc955c8 authored by Grant Likely's avatar Grant Likely Committed by Paul Mackerras

[POWERPC] virtex bug fix: Use canonical value for AC97 interrupt xparams

The ml300 and ml403 xparameters.h files use different macros for the
AC97 interrupt pin assignments.  This normalizes them to a canonical
value similar to what EDK generates for most other devices.  This is
needed to get ml300 support to compile in arch/ppc.
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 43af66e1
...@@ -15,8 +15,16 @@ ...@@ -15,8 +15,16 @@
#if defined(CONFIG_XILINX_ML300) #if defined(CONFIG_XILINX_ML300)
#include "xparameters_ml300.h" #include "xparameters_ml300.h"
#define XPAR_INTC_0_AC97_CONTROLLER_REF_0_PLAYBACK_VEC_ID \
XPAR_DCR_INTC_0_OPB_AC97_CONTROLLER_REF_0_PLAYBACK_INTERRUPT_INTR
#define XPAR_INTC_0_AC97_CONTROLLER_REF_0_RECORD_VEC_ID \
XPAR_DCR_INTC_0_OPB_AC97_CONTROLLER_REF_0_RECORD_INTERRUPT_INTR
#elif defined(CONFIG_XILINX_ML403) #elif defined(CONFIG_XILINX_ML403)
#include "xparameters_ml403.h" #include "xparameters_ml403.h"
#define XPAR_INTC_0_AC97_CONTROLLER_REF_0_PLAYBACK_VEC_ID \
XPAR_OPB_INTC_0_OPB_AC97_CONTROLLER_REF_0_PLAYBACK_INTERRUPT_INTR
#define XPAR_INTC_0_AC97_CONTROLLER_REF_0_RECORD_VEC_ID \
XPAR_OPB_INTC_0_OPB_AC97_CONTROLLER_REF_0_RECORD_INTERRUPT_INTR
#else #else
/* Add other board xparameter includes here before the #else */ /* Add other board xparameter includes here before the #else */
#error No xparameters_*.h file included #error No xparameters_*.h file included
......
...@@ -98,13 +98,13 @@ ...@@ -98,13 +98,13 @@
.flags = IORESOURCE_MEM, \ .flags = IORESOURCE_MEM, \
}, \ }, \
{ \ { \
.start = XPAR_OPB_INTC_0_OPB_AC97_CONTROLLER_REF_##num##_PLAYBACK_INTERRUPT_INTR, \ .start = XPAR_INTC_0_AC97_CONTROLLER_REF_##num##_PLAYBACK_VEC_ID, \
.end = XPAR_OPB_INTC_0_OPB_AC97_CONTROLLER_REF_##num##_PLAYBACK_INTERRUPT_INTR, \ .end = XPAR_INTC_0_AC97_CONTROLLER_REF_##num##_PLAYBACK_VEC_ID, \
.flags = IORESOURCE_IRQ, \ .flags = IORESOURCE_IRQ, \
}, \ }, \
{ \ { \
.start = XPAR_OPB_INTC_0_OPB_AC97_CONTROLLER_REF_##num##_RECORD_INTERRUPT_INTR, \ .start = XPAR_INTC_0_AC97_CONTROLLER_REF_##num##_RECORD_VEC_ID, \
.end = XPAR_OPB_INTC_0_OPB_AC97_CONTROLLER_REF_##num##_RECORD_INTERRUPT_INTR, \ .end = XPAR_INTC_0_AC97_CONTROLLER_REF_##num##_RECORD_VEC_ID, \
.flags = IORESOURCE_IRQ, \ .flags = IORESOURCE_IRQ, \
}, \ }, \
}, \ }, \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment