Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Wolfram Sang and committed by
David S. Miller
81593c1c 3f158c25

+6 -6
+5 -4
Documentation/powerpc/dts-bindings/fsl/mpc5200.txt
··· 181 181 fsl,mpc5200-mscan nodes 182 182 ----------------------- 183 183 In addition to the required compatible-, reg- and interrupt-properites, you can 184 - also specify which clock shall be used for the bus: 184 + also 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 187 - are "ip" for IP_CLK and "sys" for SYS_XTAL. 188 - "sys" is the default in case the property is not 186 + - fsl,mscan-clock-source- a string describing the clock source. Valid values 187 + are: "ip" for ip bus clock 188 + "ref" for reference clock (XTAL) 189 + "ref" is default in case this property is not 189 190 present.
+1 -2
drivers/net/can/mscan/mpc52xx_can.c
··· 130 130 * choice as it has less jitter. For this reason, it is selected 131 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 134 if (clk_src && strcmp(clk_src, "ip") == 0) 135 135 clock_src = MSCAN_CLKSRC_BUS; 136 136 else ··· 227 227 228 228 static struct of_device_id __devinitdata mpc5xxx_can_table[] = { 229 229 {.compatible = "fsl,mpc5200-mscan"}, 230 - {.compatible = "fsl,mpc5200b-mscan"}, 231 230 {}, 232 231 }; 233 232