summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx23.dtsi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-12-11 20:47:55 +0300
committerMark Brown <broonie@kernel.org>2020-12-11 20:47:55 +0300
commit031616c434db05ce766f76c62865f55698e0924f (patch)
tree7f29aa1ff3e7b51a8058cd570fb785c6e769b245 /arch/arm/boot/dts/imx23.dtsi
parent064841ccfc49b2315dc0b797239862d3a343aa07 (diff)
parent85a7555575a0e48f9b73db310d0d762a08a46d63 (diff)
downloadlinux-031616c434db05ce766f76c62865f55698e0924f.tar.xz
Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus
Diffstat (limited to 'arch/arm/boot/dts/imx23.dtsi')
-rw-r--r--arch/arm/boot/dts/imx23.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index 18289f6fb1f3..7f4c602454a5 100644
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -76,7 +76,7 @@
status = "disabled";
};
- gpmi-nand@8000c000 {
+ nand-controller@8000c000 {
compatible = "fsl,imx23-gpmi-nand";
#address-cells = <1>;
#size-cells = <1>;