ARM: dts: sunxi: Fix SPI NOR campatible on Orange Pi Zero

stable inclusion
from stable-v5.10.132
commit 359f2bca798968f6e680b0dcb79776abb2a205c6
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5YS3T

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=359f2bca798968f6e680b0dcb79776abb2a205c6

--------------------------------

[ Upstream commit 884b6697 ]

The device tree should include generic "jedec,spi-nor" compatible, and a
manufacturer-specific one.
The macronix part is what is shipped on the boards that come with a
flash chip.

Fixes: 45857ae9 ("ARM: dts: orange-pi-zero: add node for SPI NOR")
Signed-off-by: NMichal Suchanek <msuchanek@suse.de>
Acked-by: NJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: NJernej Skrabec <jernej.skrabec@gmail.com>
Link: https://lore.kernel.org/r/20220708174529.3360-1-msuchanek@suse.deSigned-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>

arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts

@@ -169,7 +169,7 @@
 	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "mxicy,mx25l1606e", "winbond,w25q128";
+		compatible = "mxicy,mx25l1606e", "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <40000000>;
 	};