QE: split function mpc85xx_qe_init() into two functions.
New QE doesn't have par_io, it doesn't need to init par_io for new QE. Split function mpc85xx_qe_init() into mpc85xx_qe_init() and mpc85xx_qe_par_io_init(). Call mpc85xx_qe_init() for both new and old while mpc85xx_qe_par_io_init() after mpc85xx_qe_init() for old. Signed-off-by: Zhao Qiang <B45475@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
parent
b0ad062cc4
commit
706f4aa035
|
@ -107,6 +107,12 @@ void __init mpc85xx_qe_init(void)
|
|||
qe_reset();
|
||||
of_node_put(np);
|
||||
|
||||
}
|
||||
|
||||
void __init mpc85xx_qe_par_io_init(void)
|
||||
{
|
||||
struct device_node *np;
|
||||
|
||||
np = of_find_node_by_name(NULL, "par_io");
|
||||
if (np) {
|
||||
struct device_node *ucc;
|
||||
|
|
|
@ -10,8 +10,10 @@ static inline void __init mpc85xx_cpm2_pic_init(void) {}
|
|||
|
||||
#ifdef CONFIG_QUICC_ENGINE
|
||||
extern void mpc85xx_qe_init(void);
|
||||
extern void mpc85xx_qe_par_io_init(void);
|
||||
#else
|
||||
static inline void __init mpc85xx_qe_init(void) {}
|
||||
static inline void __init mpc85xx_qe_par_io_init(void) {}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
@ -239,6 +239,7 @@ static void __init mpc85xx_mds_qe_init(void)
|
|||
struct device_node *np;
|
||||
|
||||
mpc85xx_qe_init();
|
||||
mpc85xx_qe_par_io_init();
|
||||
mpc85xx_mds_reset_ucc_phys();
|
||||
|
||||
if (machine_is(p1021_mds)) {
|
||||
|
|
|
@ -95,6 +95,7 @@ static void __init mpc85xx_rdb_setup_arch(void)
|
|||
|
||||
#ifdef CONFIG_QUICC_ENGINE
|
||||
mpc85xx_qe_init();
|
||||
mpc85xx_qe_par_io_init();
|
||||
#if defined(CONFIG_UCC_GETH) || defined(CONFIG_SERIAL_QE)
|
||||
if (machine_is(p1025_rdb)) {
|
||||
struct device_node *np;
|
||||
|
|
|
@ -77,6 +77,7 @@ static void __init twr_p1025_setup_arch(void)
|
|||
|
||||
#ifdef CONFIG_QUICC_ENGINE
|
||||
mpc85xx_qe_init();
|
||||
mpc85xx_qe_par_io_init();
|
||||
|
||||
#if defined(CONFIG_UCC_GETH) || defined(CONFIG_SERIAL_QE)
|
||||
if (machine_is(twr_p1025)) {
|
||||
|
|
Loading…
Reference in a new issue