[POWERPC] Rename MPIC_BROKEN_U3 to MPIC_U3_HT_IRQS

Rename MPIC_BROKEN_U3 to something a little more descriptive. Its
effect is to enable support for HT irqs behind the PCI-X/HT bridge on
U3/U4 (aka. CPC9x5) parts.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

5 files changed, 5 insertions, 5 deletions

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 86be82a4b9ef..ac62fa08f5e6 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -115,7 +115,7 @@ config MMIO_NVRAM
         bool
         default n
 
-config MPIC_BROKEN_U3
+config MPIC_U3_HT_IRQS
         bool
         depends on PPC_MAPLE
         default y
diff --git a/arch/powerpc/platforms/maple/Kconfig b/arch/powerpc/platforms/maple/Kconfig
index 5f364b8e5c0f..f7c95eb5d8ba 100644
--- a/arch/powerpc/platforms/maple/Kconfig
+++ b/arch/powerpc/platforms/maple/Kconfig
@@ -3,7 +3,7 @@ config PPC_MAPLE
         bool "Maple 970FX Evaluation Board"
         select MPIC
         select U3_DART
-        select MPIC_BROKEN_U3
+        select MPIC_U3_HT_IRQS
         select GENERIC_TBSYNC
         select PPC_UDBG_16550
         select PPC_970_NAP
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index 120cd048e0cc..2a30c5b2532e 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -264,7 +264,7 @@ static void __init maple_init_IRQ(void)
                 flags |= MPIC_BIG_ENDIAN;
 
         /* XXX Maple specific bits */
-        flags |= MPIC_BROKEN_U3 | MPIC_WANTS_RESET;
+        flags |= MPIC_U3_HT_IRQS | MPIC_WANTS_RESET;
         /* All U3/U4 are big-endian, older SLOF firmware doesn't encode this */
         flags |= MPIC_BIG_ENDIAN;
 
diff --git a/arch/powerpc/platforms/powermac/Kconfig b/arch/powerpc/platforms/powermac/Kconfig
index 02d9c7dba876..5b7afe50039a 100644
--- a/arch/powerpc/platforms/powermac/Kconfig
+++ b/arch/powerpc/platforms/powermac/Kconfig
@@ -12,7 +12,7 @@ config PPC_PMAC64
         depends on PPC_PMAC && POWER4
         select MPIC
         select U3_DART
-        select MPIC_BROKEN_U3
+        select MPIC_U3_HT_IRQS
         select GENERIC_TBSYNC
         select PPC_970_NAP
         default y
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index f59d311e25da..ae5097ac0378 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -489,7 +489,7 @@ static struct mpic * __init pmac_setup_one_mpic(struct device_node *np,
          * but works until I find a better way
          */
         if (master && (flags & MPIC_BIG_ENDIAN))
-                flags |= MPIC_BROKEN_U3;
+                flags |= MPIC_U3_HT_IRQS;
 
         mpic = mpic_alloc(np, r.start, flags, 0, 0, name);
         if (mpic == NULL)