Skip to content

Commit e73f659

Browse files
committed
Merge tag 'imx-fixes-5.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
i.MX fixes for 5.2, round 3: - A recent testing by Sébastien discovers that the PWM interrupts of i.MX6UL were wrongly coded in device tree. It's a fix for it. * tag 'imx-fixes-5.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: imx6ul: fix PWM[1-4] interrupts Signed-off-by: Olof Johansson <[email protected]>
2 parents 4232db2 + 3cf1013 commit e73f659

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

arch/arm/boot/dts/imx6ul.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@
358358
pwm1: pwm@2080000 {
359359
compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
360360
reg = <0x02080000 0x4000>;
361-
interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
361+
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
362362
clocks = <&clks IMX6UL_CLK_PWM1>,
363363
<&clks IMX6UL_CLK_PWM1>;
364364
clock-names = "ipg", "per";
@@ -369,7 +369,7 @@
369369
pwm2: pwm@2084000 {
370370
compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
371371
reg = <0x02084000 0x4000>;
372-
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
372+
interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
373373
clocks = <&clks IMX6UL_CLK_PWM2>,
374374
<&clks IMX6UL_CLK_PWM2>;
375375
clock-names = "ipg", "per";
@@ -380,7 +380,7 @@
380380
pwm3: pwm@2088000 {
381381
compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
382382
reg = <0x02088000 0x4000>;
383-
interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
383+
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
384384
clocks = <&clks IMX6UL_CLK_PWM3>,
385385
<&clks IMX6UL_CLK_PWM3>;
386386
clock-names = "ipg", "per";
@@ -391,7 +391,7 @@
391391
pwm4: pwm@208c000 {
392392
compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
393393
reg = <0x0208c000 0x4000>;
394-
interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
394+
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
395395
clocks = <&clks IMX6UL_CLK_PWM4>,
396396
<&clks IMX6UL_CLK_PWM4>;
397397
clock-names = "ipg", "per";

0 commit comments

Comments
 (0)