diff options
| author | Xie Xiaobo <xiaobo.xie@nxp.com> | 2017-12-12 09:41:24 (GMT) |
|---|---|---|
| committer | Xie Xiaobo <xiaobo.xie@nxp.com> | 2017-12-12 09:41:24 (GMT) |
| commit | 96b8b743d2b8ad69614a79a2919b466ab01bb1fe (patch) | |
| tree | 3d4ebdd3e9d053c60dfe02ed79cdc9cebca22e8f /arch/arm/boot/dts/imx25.dtsi | |
| parent | 708b8b8eb67124716c8579a9e259742b040d4dd3 (diff) | |
| parent | 85464a211ccb5e3874b323623a7cf2f07bce9fc1 (diff) | |
| download | linux-96b8b743d2b8ad69614a79a2919b466ab01bb1fe.tar.xz | |
Merge branch 'linux-4.9-nxp' into linux-4.9 on Dec. 12, 2017
Signed-off-by: Xiaobo Xie <xiaobo.xie@nxp.com>
Diffstat (limited to 'arch/arm/boot/dts/imx25.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx25.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi index af6af87..2ff0773 100644 --- a/arch/arm/boot/dts/imx25.dtsi +++ b/arch/arm/boot/dts/imx25.dtsi @@ -105,7 +105,7 @@ }; can1: can@43f88000 { - compatible = "fsl,imx25-flexcan", "fsl,p1010-flexcan"; + compatible = "fsl,imx25-flexcan"; reg = <0x43f88000 0x4000>; interrupts = <43>; clocks = <&clks 75>, <&clks 75>; @@ -114,7 +114,7 @@ }; can2: can@43f8c000 { - compatible = "fsl,imx25-flexcan", "fsl,p1010-flexcan"; + compatible = "fsl,imx25-flexcan"; reg = <0x43f8c000 0x4000>; interrupts = <44>; clocks = <&clks 76>, <&clks 76>; |