From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Subject: Re: [PATCH] of: Fix address decoding on Bimini and js2x machines Date: Wed, 03 Jul 2013 09:10:15 -0500 Message-ID: <51D430C7.8030100@gmail.com> References: <1372831270.4122.36.camel@pasglop> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1372831270.4122.36.camel@pasglop> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Sender: "devicetree-discuss" To: Benjamin Herrenschmidt Cc: Grant Likely , devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, Thierry Reding , linuxppc-dev List-Id: devicetree@vger.kernel.org On 07/03/2013 01:01 AM, Benjamin Herrenschmidt wrote: > Commit: > > e38c0a1fbc5803cbacdaac0557c70ac8ca5152e7 > 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 > CC: [v3.6+] > --- > > Rob, if you have no objection I will put that in powerpc -next NP. Acked-by: Rob Herring Rob > > diff --git a/drivers/of/address.c b/drivers/of/address.c > index 04da786..7c8221d 100644 > --- a/drivers/of/address.c > +++ b/drivers/of/address.c > @@ -106,8 +106,12 @@ static unsigned int of_bus_default_get_flags(const __be32 * > > 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, > >