aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/powerpc/dts-bindings/fsl/mpc5200.txt9
-rw-r--r--drivers/net/can/mscan/mpc52xx_can.c3
2 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt b/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt
index b151fb1ddef0..cabc780f7258 100644
--- a/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt
@@ -181,9 +181,10 @@ External interrupts:
181fsl,mpc5200-mscan nodes 181fsl,mpc5200-mscan nodes
182----------------------- 182-----------------------
183In addition to the required compatible-, reg- and interrupt-properites, you can 183In addition to the required compatible-, reg- and interrupt-properites, you can
184also specify which clock shall be used for the bus: 184also specify which clock source shall be used for the controller:
185 185
186- fsl,mscan-clk-src - a string describing the clock source. Valid values 186- fsl,mscan-clock-source- a string describing the clock source. Valid values
187 are "ip" for IP_CLK and "sys" for SYS_XTAL. 187 are: "ip" for ip bus clock
188 "sys" is the default in case the property is not 188 "ref" for reference clock (XTAL)
189 "ref" is default in case this property is not
189 present. 190 present.
diff --git a/drivers/net/can/mscan/mpc52xx_can.c b/drivers/net/can/mscan/mpc52xx_can.c
index a915959b6b36..1de6f6349b16 100644
--- a/drivers/net/can/mscan/mpc52xx_can.c
+++ b/drivers/net/can/mscan/mpc52xx_can.c
@@ -130,7 +130,7 @@ static int __devinit mpc5xxx_can_probe(struct of_device *ofdev,
130 * choice as it has less jitter. For this reason, it is selected 130 * choice as it has less jitter. For this reason, it is selected
131 * by default. 131 * by default.
132 */ 132 */
133 clk_src = of_get_property(np, "fsl,mscan-clk-src", NULL); 133 clk_src = of_get_property(np, "fsl,mscan-clock-source", NULL);
134 if (clk_src && strcmp(clk_src, "ip") == 0) 134 if (clk_src && strcmp(clk_src, "ip") == 0)
135 clock_src = MSCAN_CLKSRC_BUS; 135 clock_src = MSCAN_CLKSRC_BUS;
136 else 136 else
@@ -227,7 +227,6 @@ static int mpc5xxx_can_resume(struct of_device *ofdev)
227 227
228static struct of_device_id __devinitdata mpc5xxx_can_table[] = { 228static struct of_device_id __devinitdata mpc5xxx_can_table[] = {
229 {.compatible = "fsl,mpc5200-mscan"}, 229 {.compatible = "fsl,mpc5200-mscan"},
230 {.compatible = "fsl,mpc5200b-mscan"},
231 {}, 230 {},
232}; 231};
233 232