Commit e73f6593 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'imx-fixes-5.2-3' of...

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: default avatarOlof Johansson <olof@lixom.net>
parents 4232db2e 3cf10132
...@@ -358,7 +358,7 @@ tsc: tsc@2040000 { ...@@ -358,7 +358,7 @@ tsc: tsc@2040000 {
pwm1: pwm@2080000 { pwm1: pwm@2080000 {
compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm"; compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
reg = <0x02080000 0x4000>; reg = <0x02080000 0x4000>;
interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6UL_CLK_PWM1>, clocks = <&clks IMX6UL_CLK_PWM1>,
<&clks IMX6UL_CLK_PWM1>; <&clks IMX6UL_CLK_PWM1>;
clock-names = "ipg", "per"; clock-names = "ipg", "per";
...@@ -369,7 +369,7 @@ pwm1: pwm@2080000 { ...@@ -369,7 +369,7 @@ pwm1: pwm@2080000 {
pwm2: pwm@2084000 { pwm2: pwm@2084000 {
compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm"; compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
reg = <0x02084000 0x4000>; reg = <0x02084000 0x4000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6UL_CLK_PWM2>, clocks = <&clks IMX6UL_CLK_PWM2>,
<&clks IMX6UL_CLK_PWM2>; <&clks IMX6UL_CLK_PWM2>;
clock-names = "ipg", "per"; clock-names = "ipg", "per";
...@@ -380,7 +380,7 @@ pwm2: pwm@2084000 { ...@@ -380,7 +380,7 @@ pwm2: pwm@2084000 {
pwm3: pwm@2088000 { pwm3: pwm@2088000 {
compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm"; compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
reg = <0x02088000 0x4000>; reg = <0x02088000 0x4000>;
interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6UL_CLK_PWM3>, clocks = <&clks IMX6UL_CLK_PWM3>,
<&clks IMX6UL_CLK_PWM3>; <&clks IMX6UL_CLK_PWM3>;
clock-names = "ipg", "per"; clock-names = "ipg", "per";
...@@ -391,7 +391,7 @@ pwm3: pwm@2088000 { ...@@ -391,7 +391,7 @@ pwm3: pwm@2088000 {
pwm4: pwm@208c000 { pwm4: pwm@208c000 {
compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm"; compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
reg = <0x0208c000 0x4000>; reg = <0x0208c000 0x4000>;
interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6UL_CLK_PWM4>, clocks = <&clks IMX6UL_CLK_PWM4>,
<&clks IMX6UL_CLK_PWM4>; <&clks IMX6UL_CLK_PWM4>;
clock-names = "ipg", "per"; clock-names = "ipg", "per";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment