tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Olof Johansson <olof@lixom.net>
+4
-4
+4
-4
arch/arm/boot/dts/imx35.dtsi
+4
-4
arch/arm/boot/dts/imx35.dtsi
···
286
286
can1: can@53fe4000 {
287
287
compatible = "fsl,imx35-flexcan", "fsl,p1010-flexcan";
288
288
reg = <0x53fe4000 0x1000>;
289
-
clocks = <&clks 33>;
290
-
clock-names = "ipg";
289
+
clocks = <&clks 33>, <&clks 33>;
290
+
clock-names = "ipg", "per";
291
291
interrupts = <43>;
292
292
status = "disabled";
293
293
};
···
295
295
can2: can@53fe8000 {
296
296
compatible = "fsl,imx35-flexcan", "fsl,p1010-flexcan";
297
297
reg = <0x53fe8000 0x1000>;
298
-
clocks = <&clks 34>;
299
-
clock-names = "ipg";
298
+
clocks = <&clks 34>, <&clks 34>;
299
+
clock-names = "ipg", "per";
300
300
interrupts = <44>;
301
301
status = "disabled";
302
302
};