projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 1fddcc8e SL |
1 | From debf7ea2b5976805180d9a5b59621917676af143 Mon Sep 17 00:00:00 2001 |
| 2 | From: Sasha Levin <sashal@kernel.org> | |
| 3 | Date: Thu, 10 Jun 2021 02:25:52 +0200 | |
| 4 | Subject: ARM: dts: stm32: Rename spi-flash/mx66l51235l@N to flash@N on DHCOM | |
| 5 | SoM | |
| 6 | ||
| 7 | From: Marek Vasut <marex@denx.de> | |
| 8 | ||
| 9 | [ Upstream commit 9b8a9b389d8464e1ca5a4e92c6a4422844ad4ef3 ] | |
| 10 | ||
| 11 | Fix the following dtbs_check warning: | |
| 12 | spi-flash@0: $nodename:0: 'spi-flash@0' does not match '^flash(@.*)?$' | |
| 13 | ||
| 14 | Signed-off-by: Marek Vasut <marex@denx.de> | |
| 15 | Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> | |
| 16 | Cc: Patrice Chotard <patrice.chotard@foss.st.com> | |
| 17 | Cc: Patrick Delaunay <patrick.delaunay@foss.st.com> | |
| 18 | Cc: kernel@dh-electronics.com | |
| 19 | Cc: linux-stm32@st-md-mailman.stormreply.com | |
| 20 | To: linux-arm-kernel@lists.infradead.org | |
| 21 | Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com> | |
| 22 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
| 23 | --- | |
| 24 | arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 2 +- | |
| 25 | arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 2 +- | |
| 26 | 2 files changed, 2 insertions(+), 2 deletions(-) | |
| 27 | ||
| 28 | diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | |
| 29 | index c3e3466dacaa..8f4fd3a06a31 100644 | |
| 30 | --- a/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | |
| 31 | +++ b/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | |
| 32 | @@ -437,7 +437,7 @@ | |
| 33 | #size-cells = <0>; | |
| 34 | status = "okay"; | |
| 35 | ||
| 36 | - flash0: mx66l51235l@0 { | |
| 37 | + flash0: flash@0 { | |
| 38 | compatible = "jedec,spi-nor"; | |
| 39 | reg = <0>; | |
| 40 | spi-rx-bus-width = <4>; | |
| 41 | diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | |
| 42 | index 013ae369791d..2b0ac605549d 100644 | |
| 43 | --- a/arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | |
| 44 | +++ b/arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | |
| 45 | @@ -198,7 +198,7 @@ | |
| 46 | #size-cells = <0>; | |
| 47 | status = "okay"; | |
| 48 | ||
| 49 | - flash0: spi-flash@0 { | |
| 50 | + flash0: flash@0 { | |
| 51 | compatible = "jedec,spi-nor"; | |
| 52 | reg = <0>; | |
| 53 | spi-rx-bus-width = <4>; | |
| 54 | -- | |
| 55 | 2.30.2 | |
| 56 |