diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-06-29 09:00:55 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-06-29 09:00:55 +0200 |
| commit | 968a6e5b505ea9d05485d3ac648cade6d9d7b7f3 (patch) | |
| tree | a89a26acbcfeb3a392634231a37e01e373a7cf70 /dts/src/arm/imx6qdl-sabreauto.dtsi | |
| parent | 6b8e6fa889c4ce24f444fb22f66f6a1dd60351cb (diff) | |
| parent | e3a36ee974dec424a555e4273589ae58a6eea1bd (diff) | |
| download | barebox-968a6e5b505ea9d05485d3ac648cade6d9d7b7f3.tar.gz barebox-968a6e5b505ea9d05485d3ac648cade6d9d7b7f3.tar.xz | |
Merge branch 'for-next/dts'
Diffstat (limited to 'dts/src/arm/imx6qdl-sabreauto.dtsi')
| -rw-r--r-- | dts/src/arm/imx6qdl-sabreauto.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dts/src/arm/imx6qdl-sabreauto.dtsi b/dts/src/arm/imx6qdl-sabreauto.dtsi index 5e58740d40..1368a47620 100644 --- a/dts/src/arm/imx6qdl-sabreauto.dtsi +++ b/dts/src/arm/imx6qdl-sabreauto.dtsi @@ -272,7 +272,7 @@ pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>; status = "disabled"; /* pin conflict with WEIM NOR */ - flash: m25p80@0 { + flash: flash@0 { #address-cells = <1>; #size-cells = <1>; compatible = "st,m25p32", "jedec,spi-nor"; |