diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-08-04 14:25:42 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-08-04 14:25:42 +0000 |
| commit | 90c98361bbdcca1a50305b71d5a8aebb1e8918b3 (patch) | |
| tree | 80f9693d75279ed576d003cf74e59a82cc9a5682 /arch/arm/mach-imx | |
| parent | e3b082933caab27829e775606708381fe1b7c3ba (diff) | |
| parent | 0a0beb1f9120cf49a429e12f4ea69ddd74471d68 (diff) | |
Merge tag 'v5.4.135' into 5.4-2.3.x-imx
This is the 5.4.135 stable release
Conflicts (manual resolve):
- drivers/usb/cdns3/gadget.c:
Use NXP version, as upstream commit f53729b828db7 ("usb: cdns3: Enable
TDL_CHK only for OUT ep") is already applied.
- arch/arm64/boot/dts/freescale/imx8mq.dtsi:
Merge upstream commit 556cf02830351 ("arm64: dts: imx8mq: assign PCIe
clocks") manually into NXP tree.
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/suspend-imx53.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/suspend-imx53.S b/arch/arm/mach-imx/suspend-imx53.S index 41b8aad65363..46570ec2fbcf 100644 --- a/arch/arm/mach-imx/suspend-imx53.S +++ b/arch/arm/mach-imx/suspend-imx53.S @@ -28,11 +28,11 @@ * ^ * ^ * imx53_suspend code - * PM_INFO structure(imx53_suspend_info) + * PM_INFO structure(imx5_cpu_suspend_info) * ======================== low address ======================= */ -/* Offsets of members of struct imx53_suspend_info */ +/* Offsets of members of struct imx5_cpu_suspend_info */ #define SUSPEND_INFO_MX53_M4IF_V_OFFSET 0x0 #define SUSPEND_INFO_MX53_IOMUXC_V_OFFSET 0x4 #define SUSPEND_INFO_MX53_IO_COUNT_OFFSET 0x8 |