summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2009-11-16 12:57:51 +0000
committerDavid S. Miller <davem@davemloft.net>2009-11-17 03:54:04 -0800
commit81593c1cea7afdcd653c77d626aa186993e39c91 (patch)
treef70cc7dd8dc272a941cd7710e7115ac20c62d692
parent3f158c253214bb783e7072f6848b61c1999631e7 (diff)
net/can/mpc52xx_can: improve properties and their description
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: devicetree-discuss@ozlabs.org Signed-off-by: David S. Miller <davem@davemloft.net>
-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:
fsl,mpc5200-mscan nodes
-----------------------
In addition to the required compatible-, reg- and interrupt-properites, you can
-also specify which clock shall be used for the bus:
+also specify which clock source shall be used for the controller:
-- fsl,mscan-clk-src - a string describing the clock source. Valid values
- are "ip" for IP_CLK and "sys" for SYS_XTAL.
- "sys" is the default in case the property is not
+- fsl,mscan-clock-source- a string describing the clock source. Valid values
+ are: "ip" for ip bus clock
+ "ref" for reference clock (XTAL)
+ "ref" is default in case this property is not
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,
* choice as it has less jitter. For this reason, it is selected
* by default.
*/
- clk_src = of_get_property(np, "fsl,mscan-clk-src", NULL);
+ clk_src = of_get_property(np, "fsl,mscan-clock-source", NULL);
if (clk_src && strcmp(clk_src, "ip") == 0)
clock_src = MSCAN_CLKSRC_BUS;
else
@@ -227,7 +227,6 @@ static int mpc5xxx_can_resume(struct of_device *ofdev)
static struct of_device_id __devinitdata mpc5xxx_can_table[] = {
{.compatible = "fsl,mpc5200-mscan"},
- {.compatible = "fsl,mpc5200b-mscan"},
{},
};