diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-12-07 06:16:44 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-07 11:43:55 +1100 |
| commit | 7cc955c8fdd58c5f2c98077011a20ce10897288c (patch) | |
| tree | 5b936212e9c476d9ae0668f2748e3d4d34eb44a9 /arch | |
| parent | 43af66e1359999e3a6e306d4ee6edfc6c7d26595 (diff) | |
| download | linux-7cc955c8fdd58c5f2c98077011a20ce10897288c.tar.gz linux-7cc955c8fdd58c5f2c98077011a20ce10897288c.tar.bz2 linux-7cc955c8fdd58c5f2c98077011a20ce10897288c.zip | |
[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: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc/platforms/4xx/xparameters/xparameters.h | 8 | ||||
| -rw-r--r-- | arch/ppc/syslib/virtex_devices.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/arch/ppc/platforms/4xx/xparameters/xparameters.h b/arch/ppc/platforms/4xx/xparameters/xparameters.h index 01aa043ff381..650888b00fb0 100644 --- a/arch/ppc/platforms/4xx/xparameters/xparameters.h +++ b/arch/ppc/platforms/4xx/xparameters/xparameters.h @@ -15,8 +15,16 @@ #if defined(CONFIG_XILINX_ML300) #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) #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 /* Add other board xparameter includes here before the #else */ #error No xparameters_*.h file included diff --git a/arch/ppc/syslib/virtex_devices.c b/arch/ppc/syslib/virtex_devices.c index f658ff3b3890..7322781be1c6 100644 --- a/arch/ppc/syslib/virtex_devices.c +++ b/arch/ppc/syslib/virtex_devices.c @@ -98,13 +98,13 @@ .flags = IORESOURCE_MEM, \ }, \ { \ - .start = XPAR_OPB_INTC_0_OPB_AC97_CONTROLLER_REF_##num##_PLAYBACK_INTERRUPT_INTR, \ - .end = 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_INTC_0_AC97_CONTROLLER_REF_##num##_PLAYBACK_VEC_ID, \ .flags = IORESOURCE_IRQ, \ }, \ { \ - .start = XPAR_OPB_INTC_0_OPB_AC97_CONTROLLER_REF_##num##_RECORD_INTERRUPT_INTR, \ - .end = 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_INTC_0_AC97_CONTROLLER_REF_##num##_RECORD_VEC_ID, \ .flags = IORESOURCE_IRQ, \ }, \ }, \ |