diff options
Diffstat (limited to 'arch/powerpc/platforms/83xx')
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc832x_mds.c | 11 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc832x_rdb.c | 11 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc836x_mds.c | 11 |
3 files changed, 21 insertions, 12 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c index dbdd4adef645..6dbc6eabcb02 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c | |||
@@ -105,6 +105,7 @@ static struct of_device_id mpc832x_ids[] = { | |||
105 | { .type = "soc", }, | 105 | { .type = "soc", }, |
106 | { .compatible = "soc", }, | 106 | { .compatible = "soc", }, |
107 | { .type = "qe", }, | 107 | { .type = "qe", }, |
108 | { .compatible = "fsl,qe", }, | ||
108 | {}, | 109 | {}, |
109 | }; | 110 | }; |
110 | 111 | ||
@@ -134,10 +135,12 @@ static void __init mpc832x_sys_init_IRQ(void) | |||
134 | of_node_put(np); | 135 | of_node_put(np); |
135 | 136 | ||
136 | #ifdef CONFIG_QUICC_ENGINE | 137 | #ifdef CONFIG_QUICC_ENGINE |
137 | np = of_find_node_by_type(NULL, "qeic"); | 138 | np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic"); |
138 | if (!np) | 139 | if (!np) { |
139 | return; | 140 | np = of_find_node_by_type(NULL, "qeic"); |
140 | 141 | if (!np) | |
142 | return; | ||
143 | } | ||
141 | qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic); | 144 | qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic); |
142 | of_node_put(np); | 145 | of_node_put(np); |
143 | #endif /* CONFIG_QUICC_ENGINE */ | 146 | #endif /* CONFIG_QUICC_ENGINE */ |
diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c index 5fddd2285abb..9f0fd88b2b1f 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c | |||
@@ -115,6 +115,7 @@ static struct of_device_id mpc832x_ids[] = { | |||
115 | { .type = "soc", }, | 115 | { .type = "soc", }, |
116 | { .compatible = "soc", }, | 116 | { .compatible = "soc", }, |
117 | { .type = "qe", }, | 117 | { .type = "qe", }, |
118 | { .compatible = "fsl,qe", }, | ||
118 | {}, | 119 | {}, |
119 | }; | 120 | }; |
120 | 121 | ||
@@ -145,10 +146,12 @@ void __init mpc832x_rdb_init_IRQ(void) | |||
145 | of_node_put(np); | 146 | of_node_put(np); |
146 | 147 | ||
147 | #ifdef CONFIG_QUICC_ENGINE | 148 | #ifdef CONFIG_QUICC_ENGINE |
148 | np = of_find_node_by_type(NULL, "qeic"); | 149 | np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic"); |
149 | if (!np) | 150 | if (!np) { |
150 | return; | 151 | np = of_find_node_by_type(NULL, "qeic"); |
151 | 152 | if (!np) | |
153 | return; | ||
154 | } | ||
152 | qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic); | 155 | qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic); |
153 | of_node_put(np); | 156 | of_node_put(np); |
154 | #endif /* CONFIG_QUICC_ENGINE */ | 157 | #endif /* CONFIG_QUICC_ENGINE */ |
diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c index db491ec006e0..c2e5de60c055 100644 --- a/arch/powerpc/platforms/83xx/mpc836x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c | |||
@@ -136,6 +136,7 @@ static struct of_device_id mpc836x_ids[] = { | |||
136 | { .type = "soc", }, | 136 | { .type = "soc", }, |
137 | { .compatible = "soc", }, | 137 | { .compatible = "soc", }, |
138 | { .type = "qe", }, | 138 | { .type = "qe", }, |
139 | { .compatible = "fsl,qe", }, | ||
139 | {}, | 140 | {}, |
140 | }; | 141 | }; |
141 | 142 | ||
@@ -165,10 +166,12 @@ static void __init mpc836x_mds_init_IRQ(void) | |||
165 | of_node_put(np); | 166 | of_node_put(np); |
166 | 167 | ||
167 | #ifdef CONFIG_QUICC_ENGINE | 168 | #ifdef CONFIG_QUICC_ENGINE |
168 | np = of_find_node_by_type(NULL, "qeic"); | 169 | np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic"); |
169 | if (!np) | 170 | if (!np) { |
170 | return; | 171 | np = of_find_node_by_type(NULL, "qeic"); |
171 | 172 | if (!np) | |
173 | return; | ||
174 | } | ||
172 | qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic); | 175 | qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic); |
173 | of_node_put(np); | 176 | of_node_put(np); |
174 | #endif /* CONFIG_QUICC_ENGINE */ | 177 | #endif /* CONFIG_QUICC_ENGINE */ |