Skip to content

Commit

Permalink
powerpc/83xx: factor out the common codes of setup arch functions
Browse files Browse the repository at this point in the history 
Factor out the common codes of setup arch functions to a separate
function. It does make no sense to print a board specific info
in setup arch functions, so use a more general one.

For ASP8347E board, there is no pci device node. So it is safe to
invoke mpc83xx_setup_pci() in its setup arch function even there is
no such invocation in its original setup arch function.

Signed-off-by: Kevin Hao <haokexin@gmail.com>
Signed-off-by: Scott Wood <oss@buserror.net>
  • Loading branch information
@haokexin
haokexin authored and Scott Wood committed Sep 25, 2016
1 parent 4d486e0 commit fff69fd
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 51 deletions.
4 changes: 1 addition & 3 deletions arch/powerpc/platforms/83xx/asp834x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@
*/
static void __init asp834x_setup_arch(void)
{
if (ppc_md.progress)
ppc_md.progress("asp834x_setup_arch()", 0);

mpc83xx_setup_arch();
mpc834x_usb_cfg();
}

Expand Down
5 changes: 1 addition & 4 deletions arch/powerpc/platforms/83xx/km83xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,7 @@ static void __init mpc83xx_km_setup_arch(void)
struct device_node *np;
#endif

if (ppc_md.progress)
ppc_md.progress("kmpbec83xx_setup_arch()", 0);

mpc83xx_setup_pci();
mpc83xx_setup_arch();

#ifdef CONFIG_QUICC_ENGINE
np = of_find_node_by_name(NULL, "par_io");
Expand Down
8 changes: 8 additions & 0 deletions arch/powerpc/platforms/83xx/misc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,11 @@ void __init mpc83xx_setup_pci(void)
mpc83xx_add_bridge(np);
}
#endif

void __init mpc83xx_setup_arch(void)
{
if (ppc_md.progress)
ppc_md.progress("mpc83xx_setup_arch()", 0);

mpc83xx_setup_pci();
}
5 changes: 1 addition & 4 deletions arch/powerpc/platforms/83xx/mpc830x_rdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@
*/
static void __init mpc830x_rdb_setup_arch(void)
{
if (ppc_md.progress)
ppc_md.progress("mpc830x_rdb_setup_arch()", 0);

mpc83xx_setup_pci();
mpc83xx_setup_arch();
mpc831x_usb_cfg();
}

Expand Down
5 changes: 1 addition & 4 deletions arch/powerpc/platforms/83xx/mpc831x_rdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@
*/
static void __init mpc831x_rdb_setup_arch(void)
{
if (ppc_md.progress)
ppc_md.progress("mpc831x_rdb_setup_arch()", 0);

mpc83xx_setup_pci();
mpc83xx_setup_arch();
mpc831x_usb_cfg();
}

Expand Down
5 changes: 1 addition & 4 deletions arch/powerpc/platforms/83xx/mpc832x_mds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ static void __init mpc832x_sys_setup_arch(void)
struct device_node *np;
u8 __iomem *bcsr_regs = NULL;

if (ppc_md.progress)
ppc_md.progress("mpc832x_sys_setup_arch()", 0);
mpc83xx_setup_arch();

/* Map BCSR area */
np = of_find_node_by_name(NULL, "bcsr");
Expand All @@ -71,8 +70,6 @@ static void __init mpc832x_sys_setup_arch(void)
of_node_put(np);
}

mpc83xx_setup_pci();

#ifdef CONFIG_QUICC_ENGINE
if ((np = of_find_node_by_name(NULL, "par_io")) != NULL) {
par_io_init(np);
Expand Down
5 changes: 1 addition & 4 deletions arch/powerpc/platforms/83xx/mpc832x_rdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,7 @@ static void __init mpc832x_rdb_setup_arch(void)
struct device_node *np;
#endif

if (ppc_md.progress)
ppc_md.progress("mpc832x_rdb_setup_arch()", 0);

mpc83xx_setup_pci();
mpc83xx_setup_arch();

#ifdef CONFIG_QUICC_ENGINE
if ((np = of_find_node_by_name(NULL, "par_io")) != NULL) {
Expand Down
5 changes: 1 addition & 4 deletions arch/powerpc/platforms/83xx/mpc834x_itx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,7 @@ machine_device_initcall(mpc834x_itx, mpc834x_itx_declare_of_platform_devices);
*/
static void __init mpc834x_itx_setup_arch(void)
{
if (ppc_md.progress)
ppc_md.progress("mpc834x_itx_setup_arch()", 0);

mpc83xx_setup_pci();
mpc83xx_setup_arch();

mpc834x_usb_cfg();
}
Expand Down
5 changes: 1 addition & 4 deletions arch/powerpc/platforms/83xx/mpc834x_mds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,7 @@ static int mpc834xemds_usb_cfg(void)
*/
static void __init mpc834x_mds_setup_arch(void)
{
if (ppc_md.progress)
ppc_md.progress("mpc834x_mds_setup_arch()", 0);

mpc83xx_setup_pci();
mpc83xx_setup_arch();

mpc834xemds_usb_cfg();
}
Expand Down
5 changes: 1 addition & 4 deletions arch/powerpc/platforms/83xx/mpc836x_mds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ static void __init mpc836x_mds_setup_arch(void)
struct device_node *np;
u8 __iomem *bcsr_regs = NULL;

if (ppc_md.progress)
ppc_md.progress("mpc836x_mds_setup_arch()", 0);
mpc83xx_setup_arch();

/* Map BCSR area */
np = of_find_node_by_name(NULL, "bcsr");
Expand All @@ -79,8 +78,6 @@ static void __init mpc836x_mds_setup_arch(void)
of_node_put(np);
}

mpc83xx_setup_pci();

#ifdef CONFIG_QUICC_ENGINE
if ((np = of_find_node_by_name(NULL, "par_io")) != NULL) {
par_io_init(np);
Expand Down
5 changes: 1 addition & 4 deletions arch/powerpc/platforms/83xx/mpc836x_rdk.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ machine_device_initcall(mpc836x_rdk, mpc83xx_declare_of_platform_devices);

static void __init mpc836x_rdk_setup_arch(void)
{
if (ppc_md.progress)
ppc_md.progress("mpc836x_rdk_setup_arch()", 0);

mpc83xx_setup_pci();
mpc83xx_setup_arch();
}

/*
Expand Down
5 changes: 1 addition & 4 deletions arch/powerpc/platforms/83xx/mpc837x_mds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,7 @@ static int mpc837xmds_usb_cfg(void)
*/
static void __init mpc837x_mds_setup_arch(void)
{
if (ppc_md.progress)
ppc_md.progress("mpc837x_mds_setup_arch()", 0);

mpc83xx_setup_pci();
mpc83xx_setup_arch();
mpc837xmds_usb_cfg();
}

Expand Down
5 changes: 1 addition & 4 deletions arch/powerpc/platforms/83xx/mpc837x_rdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@ static void mpc837x_rdb_sd_cfg(void)
*/
static void __init mpc837x_rdb_setup_arch(void)
{
if (ppc_md.progress)
ppc_md.progress("mpc837x_rdb_setup_arch()", 0);

mpc83xx_setup_pci();
mpc83xx_setup_arch();
mpc837x_usb_cfg();
mpc837x_rdb_sd_cfg();
}
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/platforms/83xx/mpc83xx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,6 @@ extern void mpc83xx_setup_pci(void);
#endif

extern int mpc83xx_declare_of_platform_devices(void);
extern void mpc83xx_setup_arch(void);

#endif /* __MPC83XX_H__ */
5 changes: 1 addition & 4 deletions arch/powerpc/platforms/83xx/sbc834x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@
*/
static void __init sbc834x_setup_arch(void)
{
if (ppc_md.progress)
ppc_md.progress("sbc834x_setup_arch()", 0);

mpc83xx_setup_pci();
mpc83xx_setup_arch();
}

machine_device_initcall(sbc834x, mpc83xx_declare_of_platform_devices);
Expand Down

0 comments on commit fff69fd

Please sign in to comment.