mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 12:43:55 +08:00
powerpc/83xx: factor out the common codes of setup arch functions
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>
This commit is contained in:
parent
4d486e0083
commit
fff69fd03d
@ -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();
|
||||
}
|
||||
|
||||
|
@ -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");
|
||||
|
@ -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();
|
||||
}
|
||||
|
@ -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();
|
||||
}
|
||||
|
||||
|
@ -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();
|
||||
}
|
||||
|
||||
|
@ -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");
|
||||
@ -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);
|
||||
|
@ -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) {
|
||||
|
@ -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();
|
||||
}
|
||||
|
@ -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();
|
||||
}
|
||||
|
@ -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");
|
||||
@ -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);
|
||||
|
@ -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();
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -79,10 +79,7 @@ out:
|
||||
*/
|
||||
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();
|
||||
}
|
||||
|
||||
|
@ -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();
|
||||
}
|
||||
|
@ -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__ */
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user