diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-09-03 21:14:49 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-09-03 21:14:49 +0000 |
| commit | a9364a050b42c82de635a00e086b94214f305454 (patch) | |
| tree | b2a6b894380debb206c586c36bb57290c6597cb6 /arch/arm/boot/dts/ls1021a.dtsi | |
| parent | c874333fa0bea09c0cb6dc5466a48f8bb4499fac (diff) | |
| parent | 933cf1c2c075f44c7b6837b6201e0db2d488835a (diff) | |
Merge tag 'v5.4.62' into 5.4-2.1.x-imx
This is the 5.4.62 stable release
Conflicts (manual resolve):
- drivers/usb/dwc3/gadget.c
Fix a hickup during applying of the patch 4bc5d90a7dce1 from upstream,
that version is taken over the NXP one.
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'arch/arm/boot/dts/ls1021a.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/ls1021a.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi index edc0fc9f4738..3ba67beabacb 100644 --- a/arch/arm/boot/dts/ls1021a.dtsi +++ b/arch/arm/boot/dts/ls1021a.dtsi @@ -759,7 +759,7 @@ fsl,tmr-prsc = <2>; fsl,tmr-add = <0xaaaaaaab>; fsl,tmr-fiper1 = <999999995>; - fsl,tmr-fiper2 = <99990>; + fsl,tmr-fiper2 = <999999995>; fsl,max-adj = <499999999>; fsl,extts-fifo; }; |