linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 4/4] powerpc/83xx: make mpc830x_rdb use mpc83xx_setup_pci
Date: Thu, 17 Nov 2011 18:48:50 +0400	[thread overview]
Message-ID: <1321541330-2330-4-git-send-email-dbaryshkov@gmail.com> (raw)
In-Reply-To: <1321541330-2330-1-git-send-email-dbaryshkov@gmail.com>

Traditionally mpc830x_rdb board file searched for mpc8308-pcie devices.
However both in-kernel dts from the beginning declared those pcie units
as compatible with mpc8314-pci, which is handled by mpc83xx_setup_pci().

Drop special handling for mpc8308 and use common function instead.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 arch/powerpc/platforms/83xx/mpc830x_rdb.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/arch/powerpc/platforms/83xx/mpc830x_rdb.c b/arch/powerpc/platforms/83xx/mpc830x_rdb.c
index 6e4783d..67a3030 100644
--- a/arch/powerpc/platforms/83xx/mpc830x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc830x_rdb.c
@@ -13,11 +13,8 @@
  * option) any later version.
  */
 
-#include <linux/pci.h>
-
 #include <asm/ipic.h>
 #include <asm/udbg.h>
-#include <sysdev/fsl_pci.h>
 
 #include "mpc83xx.h"
 
@@ -26,17 +23,10 @@
  */
 static void __init mpc830x_rdb_setup_arch(void)
 {
-#ifdef CONFIG_PCI
-	struct device_node *np;
-#endif
-
 	if (ppc_md.progress)
 		ppc_md.progress("mpc830x_rdb_setup_arch()", 0);
 
-#ifdef CONFIG_PCI
-	for_each_compatible_node(np, "pci", "fsl,mpc8308-pcie")
-		mpc83xx_add_bridge(np);
-#endif
+	mpc83xx_setup_pci();
 	mpc831x_usb_cfg();
 }
 
-- 
1.7.7.1

  parent reply	other threads:[~2011-11-17 14:51 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-17 14:48 [PATCH 1/4] powerpc/83xx: consolidate of_platform_bus_probe calls Dmitry Eremin-Solenikov
2011-11-17 14:48 ` [PATCH 2/4] powerpc/83xx: merge PCI bridge additions Dmitry Eremin-Solenikov
2011-11-24  6:40   ` Kumar Gala
2011-11-17 14:48 ` [PATCH 3/4] poewrpc/83xx: headers cleanup Dmitry Eremin-Solenikov
2011-11-17 21:12   ` Stephen Rothwell
2011-11-17 14:48 ` Dmitry Eremin-Solenikov [this message]
2011-11-24  6:40   ` [PATCH 4/4] powerpc/83xx: make mpc830x_rdb use mpc83xx_setup_pci Kumar Gala
2011-11-24  6:40 ` [PATCH 1/4] powerpc/83xx: consolidate of_platform_bus_probe calls Kumar Gala

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1321541330-2330-4-git-send-email-dbaryshkov@gmail.com \
    --to=dbaryshkov@gmail.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).