diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2018-04-25 10:50:40 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2018-05-08 04:41:38 -0400 |
commit | 9a62dcf486c10daf5366f29df1c799f69b1510f9 (patch) | |
tree | c7d8bed332d1ede53820d53c958bc1d09bf97fe8 | |
parent | 0e030a373df3b8792b8991740fc31fe0629c6e58 (diff) |
arm: dts: imx[35]*: declare flexcan devices to be compatible to imx25's flexcan
Commit d50f4630c2e1 ("arm: dts: Remove p1010-flexcan compatible from imx
series dts") removed the fallback compatible "fsl,p1010-flexcan" from
the imx device trees. As the flexcan cores on i.MX25, i.MX35 and i.MX53
are identical, introduce the first as fallback for the two latter ones.
Fixes: d50f4630c2e1 ("arm: dts: Remove p1010-flexcan compatible from imx series dts")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: linux-stable <stable@vger.kernel.org> # >= v4.16
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r-- | arch/arm/boot/dts/imx35.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53.dtsi | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi index bf343195697e..54111ed218b1 100644 --- a/arch/arm/boot/dts/imx35.dtsi +++ b/arch/arm/boot/dts/imx35.dtsi | |||
@@ -303,7 +303,7 @@ | |||
303 | }; | 303 | }; |
304 | 304 | ||
305 | can1: can@53fe4000 { | 305 | can1: can@53fe4000 { |
306 | compatible = "fsl,imx35-flexcan"; | 306 | compatible = "fsl,imx35-flexcan", "fsl,imx25-flexcan"; |
307 | reg = <0x53fe4000 0x1000>; | 307 | reg = <0x53fe4000 0x1000>; |
308 | clocks = <&clks 33>, <&clks 33>; | 308 | clocks = <&clks 33>, <&clks 33>; |
309 | clock-names = "ipg", "per"; | 309 | clock-names = "ipg", "per"; |
@@ -312,7 +312,7 @@ | |||
312 | }; | 312 | }; |
313 | 313 | ||
314 | can2: can@53fe8000 { | 314 | can2: can@53fe8000 { |
315 | compatible = "fsl,imx35-flexcan"; | 315 | compatible = "fsl,imx35-flexcan", "fsl,imx25-flexcan"; |
316 | reg = <0x53fe8000 0x1000>; | 316 | reg = <0x53fe8000 0x1000>; |
317 | clocks = <&clks 34>, <&clks 34>; | 317 | clocks = <&clks 34>, <&clks 34>; |
318 | clock-names = "ipg", "per"; | 318 | clock-names = "ipg", "per"; |
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi index 7d647d043f52..3d65c0192f69 100644 --- a/arch/arm/boot/dts/imx53.dtsi +++ b/arch/arm/boot/dts/imx53.dtsi | |||
@@ -551,7 +551,7 @@ | |||
551 | }; | 551 | }; |
552 | 552 | ||
553 | can1: can@53fc8000 { | 553 | can1: can@53fc8000 { |
554 | compatible = "fsl,imx53-flexcan"; | 554 | compatible = "fsl,imx53-flexcan", "fsl,imx25-flexcan"; |
555 | reg = <0x53fc8000 0x4000>; | 555 | reg = <0x53fc8000 0x4000>; |
556 | interrupts = <82>; | 556 | interrupts = <82>; |
557 | clocks = <&clks IMX5_CLK_CAN1_IPG_GATE>, | 557 | clocks = <&clks IMX5_CLK_CAN1_IPG_GATE>, |
@@ -561,7 +561,7 @@ | |||
561 | }; | 561 | }; |
562 | 562 | ||
563 | can2: can@53fcc000 { | 563 | can2: can@53fcc000 { |
564 | compatible = "fsl,imx53-flexcan"; | 564 | compatible = "fsl,imx53-flexcan", "fsl,imx25-flexcan"; |
565 | reg = <0x53fcc000 0x4000>; | 565 | reg = <0x53fcc000 0x4000>; |
566 | interrupts = <83>; | 566 | interrupts = <83>; |
567 | clocks = <&clks IMX5_CLK_CAN2_IPG_GATE>, | 567 | clocks = <&clks IMX5_CLK_CAN2_IPG_GATE>, |