diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-06-21 12:32:38 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-06-29 02:57:15 -0400 |
commit | 0e302a704420afe40808fbd4ba149624c4350f31 (patch) | |
tree | 6b67f624f213fbfcdd67537b28f92985082037dc | |
parent | 5ab9c4524d7edd6ae3711bdfd03e4a0deb17fc6e (diff) |
[POWERPC] 52xx: Remove support for PCI bus_offset
The hose->bus_offset is only used for PCI config cycles and the 52xx PCI
config code doesn't actually ever set bus_offset to a non-zero value.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_pci.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c index 51164c851cac..57ca2feb0799 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c | |||
@@ -117,13 +117,13 @@ mpc52xx_pci_read_config(struct pci_bus *bus, unsigned int devfn, | |||
117 | 117 | ||
118 | out_be32(hose->cfg_addr, | 118 | out_be32(hose->cfg_addr, |
119 | (1 << 31) | | 119 | (1 << 31) | |
120 | ((bus->number - hose->bus_offset) << 16) | | 120 | (bus->number << 16) | |
121 | (devfn << 8) | | 121 | (devfn << 8) | |
122 | (offset & 0xfc)); | 122 | (offset & 0xfc)); |
123 | mb(); | 123 | mb(); |
124 | 124 | ||
125 | #if defined(CONFIG_PPC_MPC5200_BUGFIX) | 125 | #if defined(CONFIG_PPC_MPC5200_BUGFIX) |
126 | if (bus->number != hose->bus_offset) { | 126 | if (bus->number) { |
127 | /* workaround for the bug 435 of the MPC5200 (L25R); | 127 | /* workaround for the bug 435 of the MPC5200 (L25R); |
128 | * Don't do 32 bits config access during type-1 cycles */ | 128 | * Don't do 32 bits config access during type-1 cycles */ |
129 | switch (len) { | 129 | switch (len) { |
@@ -174,13 +174,13 @@ mpc52xx_pci_write_config(struct pci_bus *bus, unsigned int devfn, | |||
174 | 174 | ||
175 | out_be32(hose->cfg_addr, | 175 | out_be32(hose->cfg_addr, |
176 | (1 << 31) | | 176 | (1 << 31) | |
177 | ((bus->number - hose->bus_offset) << 16) | | 177 | (bus->number << 16) | |
178 | (devfn << 8) | | 178 | (devfn << 8) | |
179 | (offset & 0xfc)); | 179 | (offset & 0xfc)); |
180 | mb(); | 180 | mb(); |
181 | 181 | ||
182 | #if defined(CONFIG_PPC_MPC5200_BUGFIX) | 182 | #if defined(CONFIG_PPC_MPC5200_BUGFIX) |
183 | if (bus->number != hose->bus_offset) { | 183 | if (bus->number) { |
184 | /* workaround for the bug 435 of the MPC5200 (L25R); | 184 | /* workaround for the bug 435 of the MPC5200 (L25R); |
185 | * Don't do 32 bits config access during type-1 cycles */ | 185 | * Don't do 32 bits config access during type-1 cycles */ |
186 | switch (len) { | 186 | switch (len) { |
@@ -394,7 +394,6 @@ mpc52xx_add_bridge(struct device_node *node) | |||
394 | hose->first_busno = bus_range ? bus_range[0] : 0; | 394 | hose->first_busno = bus_range ? bus_range[0] : 0; |
395 | hose->last_busno = bus_range ? bus_range[1] : 0xff; | 395 | hose->last_busno = bus_range ? bus_range[1] : 0xff; |
396 | 396 | ||
397 | hose->bus_offset = 0; | ||
398 | hose->ops = &mpc52xx_pci_ops; | 397 | hose->ops = &mpc52xx_pci_ops; |
399 | 398 | ||
400 | pci_regs = ioremap(rsrc.start, rsrc.end - rsrc.start + 1); | 399 | pci_regs = ioremap(rsrc.start, rsrc.end - rsrc.start + 1); |