Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm63xx', 'spi/fix/mpc512x...

[karo-tx-linux.git] / arch / arm / boot / dts / imx27-phytec-phycore-rdk.dts

diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
index e7ed9786920a75121327b75fdd216aa90aa25fd9..0fc6551786c6817216045c8ddfc86a6c5790d58e 100644 (file)
--- a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
@@ -35,3 +35,16 @@
        fsl,uart-has-rtscts;
        status = "okay";
 };
+
+&weim {
+       can@d4000000 {
+               compatible = "nxp,sja1000";
+               reg = <4 0x00000000 0x00000100>;
+               interrupt-parent = <&gpio5>;
+               interrupts = <19 0x2>;
+               nxp,external-clock-frequency = <16000000>;
+               nxp,tx-output-config = <0x16>;
+               nxp,no-comparator-bypass;
+               fsl,weim-cs-timing = <0x0000dcf6 0x444a0301 0x44443302>;
+       };
+};