From patchwork Tue Aug 5 16:11:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Minter X-Patchwork-Id: 376752 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 411E81400E4 for ; Wed, 6 Aug 2014 02:12:19 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755086AbaHEQMP (ORCPT ); Tue, 5 Aug 2014 12:12:15 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:35225 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755102AbaHEQMK (ORCPT ); Tue, 5 Aug 2014 12:12:10 -0400 Received: by mail-wg0-f43.google.com with SMTP id l18so1205734wgh.2 for ; Tue, 05 Aug 2014 09:12:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=myport.ac.uk; s=google-20130730; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=dKNMrhy3A6PH0b+k9wJzpaAcT+LwfY/sraW+vCtaIMA=; b=QMxcBUuxOLHXpMqdCHNbv406GXTntk38IPP4e40pCV2TDqTmX+ULGAUWim+QfOvP1q A0OfQUl1xpYw805fVXN2+W/rB2HB9wU0aJIPAHwwVIg1/vK8+rSvBfW9qGUdNlLmJaKW NIdSb529XT1YklvTsoXoe+d6knJ8I0OCmFGfU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=dKNMrhy3A6PH0b+k9wJzpaAcT+LwfY/sraW+vCtaIMA=; b=Fpa/vxClAu0Kz78pZjlWHEpTtBGCCKnhdL5/CPw3dj/apNKAfOHkzPKRof4SkisYxQ drLGzIFKlKxN9r6LjyDOLXbZu+xL6XsMAPTqbufMZhfXja0tRc6TGDdyOktIFfQSN7sE WEEBeocqSwEGtZcNGAG40S7PSogA2whRtfEVnFlsrxGawz1Kl6ZkRjnPFXpr3CNXG0jU 6FHXkOg42BbBJyXkRTNw/wv2crIv1MmVoKV107EKt0U7wgqnF6ueiy9qYk51gioPYkhE zAsGxl1NursrN7h2djiQfRL3/QgykoZcwe3dynqx4kiRVxRrur8dsAnnPYKNIzTT32Hd 6RFQ== X-Gm-Message-State: ALoCoQl1fAkK5HGYlrvBtNHTnDm3qgV5y55lWJVg1G1654M+bkqfhSzHvnNPc0k3jiI3rud11ODX X-Received: by 10.194.134.228 with SMTP id pn4mr7053318wjb.111.1407255129040; Tue, 05 Aug 2014 09:12:09 -0700 (PDT) Received: from localhost.xy01.xyratex.com (xyratex195.xyratex.com. [194.131.166.195]) by mx.google.com with ESMTPSA id e3sm5169369wjp.4.2014.08.05.09.12.07 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 05 Aug 2014 09:12:08 -0700 (PDT) From: matthew_minter@xyratex.com To: bhelgaas@google.com, linux-pci@vger.kernel.org Cc: matthew_minter Subject: [PATCH 15/22] Added (untested) support to m68k architecture to accomodate new irq init code Date: Tue, 5 Aug 2014 17:11:16 +0100 Message-Id: <1407255083-9356-16-git-send-email-matthew_minter@xyratex.com> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1407255083-9356-1-git-send-email-matthew_minter@xyratex.com> References: <1407255083-9356-1-git-send-email-matthew_minter@xyratex.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: matthew_minter --- arch/m68k/platform/coldfire/pci.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/m68k/platform/coldfire/pci.c b/arch/m68k/platform/coldfire/pci.c index df96792..058ca86 100644 --- a/arch/m68k/platform/coldfire/pci.c +++ b/arch/m68k/platform/coldfire/pci.c @@ -316,10 +316,16 @@ static int __init mcf_pci_init(void) rootbus->resource[0] = &mcf_pci_io; rootbus->resource[1] = &mcf_pci_mem; - pci_fixup_irqs(pci_common_swizzle, mcf_pci_map_irq); pci_bus_size_bridges(rootbus); pci_bus_assign_resources(rootbus); return 0; } +int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) +{ + bridge->swizzle_irq = pci_common_swizzle; + bridge->map_irq = mcf_pci_map_irq; + return 0; +} + subsys_initcall(mcf_pci_init);