diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2018-05-26 13:45:49 +0200 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2018-05-26 13:45:49 +0200 |
| commit | f33ecec9bb5199c5a4dd296af604f70273d2636e (patch) | |
| tree | ba12665fe8f7952a64013bef9125bfac27ff1fda /arch/arm/boot/dts/imx35.dtsi | |
| parent | 0ea3286e2df74c9ec2fadbf91170cd3edd14e3e5 (diff) | |
| parent | 2d2ccf24939cf369f7473c7e4ea309891be91848 (diff) | |
| download | blackbird-obmc-linux-f33ecec9bb5199c5a4dd296af604f70273d2636e.tar.gz blackbird-obmc-linux-f33ecec9bb5199c5a4dd296af604f70273d2636e.zip | |
Merge branch 'x86/hyperv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
To resolve conflicts with the PV TLB flush series.
Diffstat (limited to 'arch/arm/boot/dts/imx35.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx35.dtsi | 4 |
1 files changed, 2 insertions, 2 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 @@ }; can1: can@53fe4000 { - compatible = "fsl,imx35-flexcan"; + compatible = "fsl,imx35-flexcan", "fsl,imx25-flexcan"; reg = <0x53fe4000 0x1000>; clocks = <&clks 33>, <&clks 33>; clock-names = "ipg", "per"; @@ -312,7 +312,7 @@ }; can2: can@53fe8000 { - compatible = "fsl,imx35-flexcan"; + compatible = "fsl,imx35-flexcan", "fsl,imx25-flexcan"; reg = <0x53fe8000 0x1000>; clocks = <&clks 34>, <&clks 34>; clock-names = "ipg", "per"; |
