Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7dae155 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-fixes-4.2-2' of... 

Merge tag 'imx-fixes-4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

The i.MX fixes for 4.2, 2nd round:
 - Add the required second clock for i.MX35 FlexCAN in device tree,
   so that the device can be probed by kernel successfully.

* tag 'imx-fixes-4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: dts: i.MX35: Fix can support.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a153790a e053f96b

arch/arm/boot/dts/imx35.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -286,8 +286,8 @@ 
			can1: can@53fe4000 {

				compatible = "fsl,imx35-flexcan", "fsl,p1010-flexcan";

				reg = <0x53fe4000 0x1000>;

				clocks = <&clks 33>;

				clock-names = "ipg";

				clocks = <&clks 33>, <&clks 33>;

				clock-names = "ipg", "per";

				interrupts = <43>;

				status = "disabled";

			};
@@ -295,8 +295,8 @@ 
			can2: can@53fe8000 {

				compatible = "fsl,imx35-flexcan", "fsl,p1010-flexcan";

				reg = <0x53fe8000 0x1000>;

				clocks = <&clks 34>;

				clock-names = "ipg";

				clocks = <&clks 34>, <&clks 34>;

				clock-names = "ipg", "per";

				interrupts = <44>;

				status = "disabled";

			};