diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-08 09:09:27 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-08 09:09:27 +0100 |
commit | d8c849037d9398abe6a5f5d065eafc777eb3bdaf (patch) | |
tree | 2ebe56d73c84619214ee9e131c586ad98b817e81 /arch/arm64/boot/dts/freescale/imx8mp.dtsi | |
parent | 8cf9045b91382df9fb1eb420daa4d1c2697d2f44 (diff) | |
parent | 92bf22614b21a2706f4993b278017e437f7785b3 (diff) | |
download | linux-d8c849037d9398abe6a5f5d065eafc777eb3bdaf.tar.bz2 |
Merge 5.11-rc7 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm64/boot/dts/freescale/imx8mp.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mp.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi index 22db53f6438e..88615874041d 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi @@ -266,7 +266,7 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; - gpio-ranges = <&iomuxc 0 56 26>, <&iomuxc 0 144 4>; + gpio-ranges = <&iomuxc 0 56 26>, <&iomuxc 26 144 4>; }; gpio4: gpio@30230000 { |