Skip to content

Commit

Permalink
of: Fix address decoding on Bimini and js2x machines
Browse files Browse the repository at this point in the history
 Commit:

  e38c0a1
  of/address: Handle #address-cells > 2 specially

broke real time clock access on Bimini, js2x, and similar powerpc
machines using the "maple" platform. That code was indirectly relying
on the old (broken) behaviour of the translation for the hypertransport
to ISA bridge.

This fixes it by treating hypertransport as a PCI bus

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
  • Loading branch information
Benjamin Herrenschmidt authored and Grant Likely committed Jul 4, 2013
1 parent ba166e9 commit 6dd18e4
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/of/address.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,12 @@ static unsigned int of_bus_default_get_flags(const __be32 *addr)

static int of_bus_pci_match(struct device_node *np)
{
/* "vci" is for the /chaos bridge on 1st-gen PCI powermacs */
return !strcmp(np->type, "pci") || !strcmp(np->type, "vci");
/*
* "vci" is for the /chaos bridge on 1st-gen PCI powermacs
* "ht" is hypertransport
*/
return !strcmp(np->type, "pci") || !strcmp(np->type, "vci") ||
!strcmp(np->type, "ht");
}

static void of_bus_pci_count_cells(struct device_node *np,
Expand Down

0 comments on commit 6dd18e4

Please sign in to comment.