-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '85xx' of git://git.kernel.org/pub/scm/linux/kernel/git/…
…galak/powerpc
- Loading branch information
Showing
5 changed files
with
166 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| # | ||
| # Makefile for the PowerPC 85xx linux kernel. | ||
| # | ||
| obj-$(CONFIG_PPC_85xx) += misc.o mpc85xx_ads.o | ||
| obj-$(CONFIG_PPC_85xx) += misc.o pci.o | ||
| obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,3 +15,4 @@ | |
| */ | ||
|
|
||
| extern void mpc85xx_restart(char *); | ||
| extern int add_bridge(struct device_node *dev); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /* | ||
| * FSL SoC setup code | ||
| * | ||
| * Maintained by Kumar Gala (see MAINTAINERS for contact information) | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License as published by the | ||
| * Free Software Foundation; either version 2 of the License, or (at your | ||
| * option) any later version. | ||
| */ | ||
|
|
||
| #include <linux/config.h> | ||
| #include <linux/stddef.h> | ||
| #include <linux/kernel.h> | ||
| #include <linux/init.h> | ||
| #include <linux/errno.h> | ||
| #include <linux/pci.h> | ||
| #include <linux/delay.h> | ||
| #include <linux/irq.h> | ||
| #include <linux/module.h> | ||
|
|
||
| #include <asm/system.h> | ||
| #include <asm/atomic.h> | ||
| #include <asm/io.h> | ||
| #include <asm/pci-bridge.h> | ||
| #include <asm/prom.h> | ||
| #include <sysdev/fsl_soc.h> | ||
|
|
||
| #undef DEBUG | ||
|
|
||
| #ifdef DEBUG | ||
| #define DBG(x...) printk(x) | ||
| #else | ||
| #define DBG(x...) | ||
| #endif | ||
|
|
||
| int mpc85xx_pci2_busno = 0; | ||
|
|
||
| #ifdef CONFIG_PCI | ||
| int __init add_bridge(struct device_node *dev) | ||
| { | ||
| int len; | ||
| struct pci_controller *hose; | ||
| struct resource rsrc; | ||
| int *bus_range; | ||
| int primary = 1, has_address = 0; | ||
| phys_addr_t immr = get_immrbase(); | ||
|
|
||
| DBG("Adding PCI host bridge %s\n", dev->full_name); | ||
|
|
||
| /* Fetch host bridge registers address */ | ||
| has_address = (of_address_to_resource(dev, 0, &rsrc) == 0); | ||
|
|
||
| /* Get bus range if any */ | ||
| bus_range = (int *) get_property(dev, "bus-range", &len); | ||
| if (bus_range == NULL || len < 2 * sizeof(int)) { | ||
| printk(KERN_WARNING "Can't get bus-range for %s, assume" | ||
| " bus 0\n", dev->full_name); | ||
| } | ||
|
|
||
| hose = pcibios_alloc_controller(); | ||
| if (!hose) | ||
| return -ENOMEM; | ||
| hose->arch_data = dev; | ||
| hose->set_cfg_type = 1; | ||
|
|
||
| hose->first_busno = bus_range ? bus_range[0] : 0; | ||
| hose->last_busno = bus_range ? bus_range[1] : 0xff; | ||
|
|
||
| /* PCI 1 */ | ||
| if ((rsrc.start & 0xfffff) == 0x8000) { | ||
| setup_indirect_pci(hose, immr + 0x8000, immr + 0x8004); | ||
| } | ||
| /* PCI 2 */ | ||
| if ((rsrc.start & 0xfffff) == 0x9000) { | ||
| setup_indirect_pci(hose, immr + 0x9000, immr + 0x9004); | ||
| primary = 0; | ||
| hose->bus_offset = hose->first_busno; | ||
| mpc85xx_pci2_busno = hose->first_busno; | ||
| } | ||
|
|
||
| printk(KERN_INFO "Found MPC85xx PCI host bridge at 0x%08lx. " | ||
| "Firmware bus number: %d->%d\n", | ||
| rsrc.start, hose->first_busno, hose->last_busno); | ||
|
|
||
| DBG(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n", | ||
| hose, hose->cfg_addr, hose->cfg_data); | ||
|
|
||
| /* Interpret the "ranges" property */ | ||
| /* This also maps the I/O region and sets isa_io/mem_base */ | ||
| pci_process_bridge_OF_ranges(hose, dev, primary); | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| #endif |