From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
"Sébastien Szymanski" <sebastien.szymanski@armadeus.com>,
"Fabio Estevam" <festevam@gmail.com>,
"Shawn Guo" <shawnguo@kernel.org>,
"Sasha Levin" <sashal@kernel.org>
Subject: [PATCH 4.14 69/80] ARM: dts: imx6ul: fix PWM[1-4] interrupts
Date: Thu, 18 Jul 2019 12:02:00 +0900 [thread overview]
Message-ID: <20190718030103.959302646@linuxfoundation.org> (raw)
In-Reply-To: <20190718030058.615992480@linuxfoundation.org>
[ Upstream commit 3cf10132ac8d536565f2c02f60a3aeb315863a52 ]
According to the i.MX6UL/L RM, table 3.1 "ARM Cortex A7 domain interrupt
summary", the interrupts for the PWM[1-4] go from 83 to 86.
Fixes: b9901fe84f02 ("ARM: dts: imx6ul: add pwm[1-4] nodes")
Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/boot/dts/imx6ul.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 036aeba4f02c..49f4bdc0d864 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -342,7 +342,7 @@
pwm1: pwm@02080000 {
compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
reg = <0x02080000 0x4000>;
- interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6UL_CLK_PWM1>,
<&clks IMX6UL_CLK_PWM1>;
clock-names = "ipg", "per";
@@ -353,7 +353,7 @@
pwm2: pwm@02084000 {
compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
reg = <0x02084000 0x4000>;
- interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6UL_CLK_PWM2>,
<&clks IMX6UL_CLK_PWM2>;
clock-names = "ipg", "per";
@@ -364,7 +364,7 @@
pwm3: pwm@02088000 {
compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
reg = <0x02088000 0x4000>;
- interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6UL_CLK_PWM3>,
<&clks IMX6UL_CLK_PWM3>;
clock-names = "ipg", "per";
@@ -375,7 +375,7 @@
pwm4: pwm@0208c000 {
compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
reg = <0x0208c000 0x4000>;
- interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6UL_CLK_PWM4>,
<&clks IMX6UL_CLK_PWM4>;
clock-names = "ipg", "per";
--
2.20.1
next prev parent reply other threads:[~2019-07-18 3:10 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-18 3:00 [PATCH 4.14 00/80] 4.14.134-stable review Greg Kroah-Hartman
2019-07-18 3:00 ` [PATCH 4.14 01/80] Revert "e1000e: fix cyclic resets at link up with active tx" Greg Kroah-Hartman
2019-07-18 3:00 ` [PATCH 4.14 02/80] e1000e: start network tx queue only when link is up Greg Kroah-Hartman
2019-07-18 3:00 ` [PATCH 4.14 03/80] Input: synaptics - enable SMBUS on T480 thinkpad trackpad Greg Kroah-Hartman
2019-07-18 3:00 ` [PATCH 4.14 04/80] nilfs2: do not use unexported cpu_to_le32()/le32_to_cpu() in uapi header Greg Kroah-Hartman
2019-07-18 3:00 ` [PATCH 4.14 05/80] drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT Greg Kroah-Hartman
2019-07-18 3:00 ` [PATCH 4.14 06/80] crypto: talitos - rename alternative AEAD algos Greg Kroah-Hartman
2019-07-18 3:00 ` [PATCH 4.14 07/80] Input: elantech - enable middle button support on 2 ThinkPads Greg Kroah-Hartman
2019-07-18 3:00 ` [PATCH 4.14 08/80] samples, bpf: fix to change the buffer size for read() Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 09/80] bpf: sockmap, fix use after free from sleep in psock backlog workqueue Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 10/80] staging:iio:ad7150: fix threshold mode config bit Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 11/80] mac80211: mesh: fix RCU warning Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 12/80] mac80211: free peer keys before vif down in mesh Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 13/80] mwifiex: Fix possible buffer overflows at parsing bss descriptor Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 14/80] iwlwifi: Fix double-free problems in iwl_req_fw_callback() Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 15/80] netfilter: ipv6: nf_defrag: fix leakage of unqueued fragments Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 16/80] netfilter: ipv6: nf_defrag: accept duplicate fragments again Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 17/80] dt-bindings: can: mcp251x: add mcp25625 support Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 18/80] can: mcp251x: add support for mcp25625 Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 19/80] can: m_can: implement errata "Needless activation of MRAF irq" Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 20/80] can: af_can: Fix error path of can_init() Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 21/80] ibmvnic: Refresh device multicast list after reset Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 22/80] ARM: dts: am335x phytec boards: Fix cd-gpios active level Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 23/80] Input: imx_keypad - make sure keyboard can always wake up system Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 24/80] KVM: arm/arm64: vgic: Fix kvm_device leak in vgic_its_destroy Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 25/80] mlxsw: spectrum: Disallow prio-tagged packets when PVID is removed Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 26/80] ARM: davinci: da850-evm: call regulator_has_full_constraints() Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 27/80] ARM: davinci: da8xx: specify dma_coherent_mask for lcdc Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 28/80] mac80211: only warn once on chanctx_conf being NULL Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 29/80] qmi_wwan: add support for QMAP padding in the RX path Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 30/80] qmi_wwan: avoid RCU stalls on device disconnect when in QMAP mode Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 31/80] qmi_wwan: extend permitted QMAP mux_id value range Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 32/80] md: fix for divide error in status_resync Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 33/80] bnx2x: Check if transceiver implements DDM before access Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 34/80] drm: return -EFAULT if copy_to_user() fails Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 35/80] ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 36/80] net: lio_core: fix potential sign-extension overflow on large shift Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 37/80] quota: fix a problem about transfer quota Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 38/80] net: dsa: mv88e6xxx: fix shift of FID bits in mv88e6185_g1_vtu_loadpurge() Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 39/80] net :sunrpc :clnt :Fix xps refcount imbalance on the error path Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 40/80] fscrypt: dont set policy for a dead directory Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 41/80] udf: Fix incorrect final NOT_ALLOCATED (hole) extent length Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 42/80] ALSA: hda/realtek - Headphone Mic cant record after S3 Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 43/80] block, bfq: NULL out the bic when its no longer valid Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 44/80] x86/ptrace: Fix possible spectre-v1 in ptrace_get_debugreg() Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 45/80] x86/tls: Fix possible spectre-v1 in do_get_thread_area() Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 46/80] Documentation: Add section about CPU vulnerabilities for Spectre Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 47/80] mwifiex: Abort at too short BSS descriptor element Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 48/80] mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies() Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 49/80] mwifiex: Dont abort on small, spec-compliant vendor IEs Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 50/80] USB: serial: ftdi_sio: add ID for isodebug v1 Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 51/80] USB: serial: option: add support for GosunCn ME3630 RNDIS mode Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 52/80] Revert "serial: 8250: Dont service RX FIFO if interrupts are disabled" Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 53/80] p54usb: Fix race between disconnect and firmware loading Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 54/80] usb: gadget: ether: Fix race between gether_disconnect and rx_submit Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 55/80] usb: renesas_usbhs: add a workaround for a race condition of workqueue Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 56/80] staging: comedi: dt282x: fix a null pointer deref on interrupt Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 57/80] staging: comedi: amplc_pci230: fix " Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 58/80] binder: fix memory leak in error path Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 59/80] carl9170: fix misuse of device driver API Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 60/80] VMCI: Fix integer overflow in VMCI handle arrays Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 61/80] MIPS: Remove superfluous check for __linux__ Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 62/80] clk: ti: clkctrl: Fix returning uninitialized data Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 63/80] efi/bgrt: Drop BGRT status field reserved bits check Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 64/80] perf/core: Fix perf_sample_regs_user() mm check Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 65/80] ARM: omap2: remove incorrect __init annotation Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 66/80] be2net: fix link failure after ethtool offline test Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 67/80] ppp: mppe: Add softdep to arc4 Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.14 68/80] sis900: fix TX completion Greg Kroah-Hartman
2019-07-18 3:02 ` Greg Kroah-Hartman [this message]
2019-07-18 3:02 ` [PATCH 4.14 70/80] dm verity: use message limit for data block corruption message Greg Kroah-Hartman
2019-07-18 3:02 ` [PATCH 4.14 71/80] x86/boot/64: Fix crash if kernel image crosses page table boundary Greg Kroah-Hartman
2019-07-18 3:02 ` [PATCH 4.14 72/80] cpu/hotplug: Fix out-of-bounds read when setting fail state Greg Kroah-Hartman
2019-07-18 3:02 ` [PATCH 4.14 73/80] linux/kernel.h: fix overflow for DIV_ROUND_UP_ULL Greg Kroah-Hartman
2019-07-18 3:02 ` [PATCH 4.14 74/80] ARC: hide unused function unw_hdr_alloc Greg Kroah-Hartman
2019-07-18 3:02 ` [PATCH 4.14 75/80] s390: fix stfle zero padding Greg Kroah-Hartman
2019-07-18 3:02 ` [PATCH 4.14 76/80] s390/qdio: (re-)initialize tiqdio list entries Greg Kroah-Hartman
2019-07-18 3:02 ` [PATCH 4.14 77/80] s390/qdio: dont touch the dsci in tiqdio_add_input_queues() Greg Kroah-Hartman
2019-07-18 3:02 ` [PATCH 4.14 78/80] crypto/NX: Set receive window credits to max number of CRBs in RxFIFO Greg Kroah-Hartman
2019-07-18 3:02 ` [PATCH 4.14 79/80] drm/udl: introduce a macro to convert dev to udl Greg Kroah-Hartman
2019-07-18 3:02 ` [PATCH 4.14 80/80] drm/udl: move to embedding drm device inside udl device Greg Kroah-Hartman
2019-07-18 9:18 ` [PATCH 4.14 00/80] 4.14.134-stable review Naresh Kamboju
2019-07-18 9:20 ` Jon Hunter
2019-07-18 10:53 ` kernelci.org bot
2019-07-18 19:48 ` Guenter Roeck
2019-07-18 20:55 ` Kelsey Skunberg
2019-07-19 4:44 ` Bharath Vedartham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190718030103.959302646@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=festevam@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=sebastien.szymanski@armadeus.com \
--cc=shawnguo@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).