From afa17a500a3667f66df450100538d06769529bba Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Fri, 13 Nov 2009 06:14:52 +0000 Subject: net/can: add driver for mscan family & mpc52xx_mscan Taken from socketcan-svn, fixed remaining todos, cleaned up, tested with a phyCORE-MPC5200B-IO and a custom board. Signed-off-by: Wolfram Sang Cc: Wolfgang Grandegger Cc: Grant Likely Cc: David Miller Signed-off-by: David S. Miller --- Documentation/powerpc/dts-bindings/fsl/mpc5200.txt | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Documentation/powerpc') diff --git a/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt b/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt index 8447fd7090d0..b151fb1ddef0 100644 --- a/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt +++ b/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt @@ -178,3 +178,12 @@ External interrupts: external irq3: interrupts = <1 3 n>; 'n' is sense (0: level high, 1: edge rising, 2: edge falling 3: level low) +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: + +- 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 + present. -- cgit v1.2.3 From 81593c1cea7afdcd653c77d626aa186993e39c91 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Mon, 16 Nov 2009 12:57:51 +0000 Subject: net/can/mpc52xx_can: improve properties and their description Signed-off-by: Wolfram Sang Cc: devicetree-discuss@ozlabs.org Signed-off-by: David S. Miller --- Documentation/powerpc/dts-bindings/fsl/mpc5200.txt | 9 +++++---- drivers/net/can/mscan/mpc52xx_can.c | 3 +-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Documentation/powerpc') 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"}, {}, }; -- cgit v1.2.3