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/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | |
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/arm64/boot/dts/freescale/fsl-ls208xa.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi index 30929586970f..331c72672ed9 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi @@ -466,7 +466,6 @@ clocks = <&clockgen 4 3>; clock-names = "dspi"; spi-num-chipselects = <5>; - bus-num = <0>; }; esdhc: esdhc@2140000 { |