aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/powermac
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-26 03:16:38 -0400
committerPaul Mackerras <paulus@samba.org>2005-10-26 03:16:38 -0400
commit830825d6c37a28061c0b6ca538a6411001cf3b2a (patch)
tree99ead002881c53e0eda644175ba43d4a166fa26e /arch/powerpc/platforms/powermac
parent03501dab035ab7da5e1373f5e130cfd6346d3f21 (diff)
powerpc: Pull out MPC106 (grackle) initialization code into its own file
This is so that the 32-bit CHRP code can use it. The MPC106 initialization code is now in arch/powerpc/sysdev/grackle.c and is controlled by CONFIG_PPC_MPC106. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/powermac')
-rw-r--r--arch/powerpc/platforms/powermac/pci.c45
1 files changed, 1 insertions, 44 deletions
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index ebe22a2267d2..8f818d092e2b 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -23,6 +23,7 @@
23#include <asm/pci-bridge.h> 23#include <asm/pci-bridge.h>
24#include <asm/machdep.h> 24#include <asm/machdep.h>
25#include <asm/pmac_feature.h> 25#include <asm/pmac_feature.h>
26#include <asm/grackle.h>
26#ifdef CONFIG_PPC64 27#ifdef CONFIG_PPC64
27#include <asm/iommu.h> 28#include <asm/iommu.h>
28#include <asm/ppc-pci.h> 29#include <asm/ppc-pci.h>
@@ -584,50 +585,6 @@ static void __init fixup_nec_usb2(void)
584 } 585 }
585} 586}
586 587
587#define GRACKLE_CFA(b, d, o) (0x80 | ((b) << 8) | ((d) << 16) \
588 | (((o) & ~3) << 24))
589
590#define GRACKLE_PICR1_STG 0x00000040
591#define GRACKLE_PICR1_LOOPSNOOP 0x00000010
592
593/* N.B. this is called before bridges is initialized, so we can't
594 use grackle_pcibios_{read,write}_config_dword. */
595static inline void grackle_set_stg(struct pci_controller* bp, int enable)
596{
597 unsigned int val;
598
599 out_be32(bp->cfg_addr, GRACKLE_CFA(0, 0, 0xa8));
600 val = in_le32(bp->cfg_data);
601 val = enable? (val | GRACKLE_PICR1_STG) :
602 (val & ~GRACKLE_PICR1_STG);
603 out_be32(bp->cfg_addr, GRACKLE_CFA(0, 0, 0xa8));
604 out_le32(bp->cfg_data, val);
605 (void)in_le32(bp->cfg_data);
606}
607
608static inline void grackle_set_loop_snoop(struct pci_controller *bp, int enable)
609{
610 unsigned int val;
611
612 out_be32(bp->cfg_addr, GRACKLE_CFA(0, 0, 0xa8));
613 val = in_le32(bp->cfg_data);
614 val = enable? (val | GRACKLE_PICR1_LOOPSNOOP) :
615 (val & ~GRACKLE_PICR1_LOOPSNOOP);
616 out_be32(bp->cfg_addr, GRACKLE_CFA(0, 0, 0xa8));
617 out_le32(bp->cfg_data, val);
618 (void)in_le32(bp->cfg_data);
619}
620
621void __init setup_grackle(struct pci_controller *hose)
622{
623 setup_indirect_pci(hose, 0xfec00000, 0xfee00000);
624 if (machine_is_compatible("AAPL,PowerBook1998"))
625 grackle_set_loop_snoop(hose, 1);
626#if 0 /* Disabled for now, HW problems ??? */
627 grackle_set_stg(hose, 1);
628#endif
629}
630
631static void __init setup_bandit(struct pci_controller *hose, 588static void __init setup_bandit(struct pci_controller *hose,
632 struct reg_property *addr) 589 struct reg_property *addr)
633{ 590{