diff options
author | Maxime Ripard <maxime@cerno.tech> | 2022-05-03 11:53:42 +0200 |
---|---|---|
committer | Maxime Ripard <maxime@cerno.tech> | 2022-05-03 11:53:42 +0200 |
commit | b812f646bb818ca0e1806072eb7f0006f3a65dde (patch) | |
tree | 3ba2134dcefd8127f5ad286e0fe1135588fbd0b3 /arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi | |
parent | a5fc012e6ee75a899173398573e77207542f588a (diff) | |
parent | e954d2c94d007afe487044ecfa48f2518643df0e (diff) | |
download | linux-b812f646bb818ca0e1806072eb7f0006f3a65dde.tar.gz |
Merge drm/drm-next into drm-misc-next
Christian needs a backmerge to avoid a merge conflict for amdgpu.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi index 38ffcd145b33..899e8e7dbc24 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi @@ -253,7 +253,7 @@ #address-cells = <1>; #size-cells = <1>; spi-max-frequency = <84000000>; - spi-tx-bus-width = <4>; + spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; }; }; |