Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7cc955c8fdd58c5f2c98077011a20ce10897288c
Commit:     7cc955c8fdd58c5f2c98077011a20ce10897288c
Parent:     43af66e1359999e3a6e306d4ee6edfc6c7d26595
Author:     Grant Likely <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 7 06:16:44 2007 +1100
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Fri Dec 7 11:43:55 2007 +1100

    [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 <[EMAIL PROTECTED]>
    Acked-by: Josh Boyer <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/ppc/platforms/4xx/xparameters/xparameters.h |    8 ++++++++
 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 01aa043..650888b 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 f658ff3..7322781 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, \
                }, \
        }, \
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to