Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7e6740e authored by Alexander Stein's avatar Alexander Stein Committed by Greg Kroah-Hartman
Browse files

ARM: dts: imx6ul: fix qspi node compatible 



[ Upstream commit 0c6cf86e1ab433b2d421880fdd9c6e954f404948 ]

imx6ul is not compatible to imx6sx, both have different erratas.
Fixes the dt_binding_check warning:
spi@21e0000: compatible: 'oneOf' conditional failed, one must be fixed:
['fsl,imx6ul-qspi', 'fsl,imx6sx-qspi'] is too long
Additional items are not allowed ('fsl,imx6sx-qspi' was unexpected)
'fsl,imx6ul-qspi' is not one of ['fsl,ls1043a-qspi']
'fsl,imx6ul-qspi' is not one of ['fsl,imx8mq-qspi']
'fsl,ls1021a-qspi' was expected
'fsl,imx7d-qspi' was expected

Signed-off-by: default avatarAlexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5db7e179

arch/arm/boot/dts/imx6ul.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -997,7 +997,7 @@ 
			qspi: spi@21e0000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,imx6ul-qspi", "fsl,imx6sx-qspi";

				compatible = "fsl,imx6ul-qspi";

				reg = <0x021e0000 0x4000>, <0x60000000 0x10000000>;

				reg-names = "QuadSPI", "QuadSPI-memory";

				interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;