You've already forked linux-rockchip
mirror of
https://github.com/armbian/linux-rockchip.git
synced 2026-01-06 11:08:10 -08:00
ARM: dts: imx: align SPI NOR node name with dtschema
[ Upstream commitba9fe460dc] The node names should be generic and SPI NOR dtschema expects "flash". Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Stable-dep-of:af7d78c957("ARM: dts: imx6qdl-kontron-samx6i: fix spi-flash compatible") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
f1101295c1
commit
a381cac2ab
@@ -129,7 +129,7 @@
|
||||
pinctrl-0 = <&spi2_pins_a>;
|
||||
status = "okay";
|
||||
|
||||
flash: m25p80@0 {
|
||||
flash: flash@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
compatible = "sst,sst25vf016b", "jedec,spi-nor";
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
pinctrl-0 = <&spi2_pins_a>;
|
||||
status = "okay";
|
||||
|
||||
flash: m25p80@0 {
|
||||
flash: flash@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
compatible = "m25p80", "jedec,spi-nor";
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
pinctrl-0 = <&spi2_pins_a>;
|
||||
status = "okay";
|
||||
|
||||
flash: m25p80@0 {
|
||||
flash: flash@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
compatible = "everspin,mr25h256", "mr25h256";
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
};
|
||||
|
||||
&ecspi3 {
|
||||
flash: m25p80@0 {
|
||||
flash: flash@0 {
|
||||
compatible = "sst,sst25vf016b", "jedec,spi-nor";
|
||||
spi-max-frequency = <20000000>;
|
||||
reg = <0>;
|
||||
|
||||
@@ -139,7 +139,7 @@
|
||||
pinctrl-0 = <&pinctrl_ecspi1>;
|
||||
status = "okay";
|
||||
|
||||
flash: n25q032@0 {
|
||||
flash: flash@0 {
|
||||
compatible = "jedec,spi-nor";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
pinctrl-0 = <&pinctrl_ecspi5>;
|
||||
status = "okay";
|
||||
|
||||
m25_eeprom: m25p80@0 {
|
||||
m25_eeprom: flash@0 {
|
||||
compatible = "atmel,at25";
|
||||
spi-max-frequency = <10000000>;
|
||||
size = <0x8000>;
|
||||
|
||||
@@ -260,7 +260,7 @@
|
||||
pinctrl-0 = <&pinctrl_ecspi1>;
|
||||
status = "okay";
|
||||
|
||||
m25p80@0 {
|
||||
flash@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
compatible = "st,m25p", "jedec,spi-nor";
|
||||
|
||||
@@ -102,7 +102,7 @@
|
||||
cs-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
|
||||
status = "okay";
|
||||
|
||||
flash: m25p80@0 {
|
||||
flash: flash@0 {
|
||||
compatible = "m25p80", "jedec,spi-nor";
|
||||
spi-max-frequency = <40000000>;
|
||||
reg = <0>;
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
pinctrl-0 = <&pinctrl_ecspi5>;
|
||||
status = "okay";
|
||||
|
||||
m25_eeprom: m25p80@0 {
|
||||
m25_eeprom: flash@0 {
|
||||
compatible = "atmel,at25256B", "atmel,at25";
|
||||
spi-max-frequency = <20000000>;
|
||||
size = <0x8000>;
|
||||
|
||||
@@ -137,7 +137,7 @@
|
||||
pinctrl-0 = <&pinctrl_ecspi1>;
|
||||
status = "okay";
|
||||
|
||||
flash: m25p80@0 {
|
||||
flash: flash@0 {
|
||||
compatible = "sst,w25q256", "jedec,spi-nor";
|
||||
spi-max-frequency = <30000000>;
|
||||
reg = <0>;
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
cs-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>;
|
||||
status = "okay";
|
||||
|
||||
m25p80@0 {
|
||||
flash@0 {
|
||||
compatible = "microchip,sst25vf016b";
|
||||
spi-max-frequency = <20000000>;
|
||||
reg = <0>;
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
};
|
||||
|
||||
&ecspi3 {
|
||||
flash: m25p80@0 {
|
||||
flash: flash@0 {
|
||||
compatible = "sst,sst25vf032b", "jedec,spi-nor";
|
||||
spi-max-frequency = <20000000>;
|
||||
reg = <0>;
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
pinctrl-0 = <&pinctrl_ecspi4>;
|
||||
status = "okay";
|
||||
|
||||
flash: m25p80@0 {
|
||||
flash: flash@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
compatible = "micron,n25q128a11", "jedec,spi-nor";
|
||||
|
||||
@@ -131,7 +131,7 @@
|
||||
pinctrl-0 = <&pinctrl_ecspi4>;
|
||||
status = "okay";
|
||||
|
||||
flash: m25p80@1 {
|
||||
flash: flash@1 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
compatible = "micron,n25q128a11", "jedec,spi-nor";
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
pinctrl-0 = <&pinctrl_ecspi3>;
|
||||
status = "okay";
|
||||
|
||||
flash: m25p80@0 {
|
||||
flash: flash@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
compatible = "sst,sst25vf040b", "jedec,spi-nor";
|
||||
|
||||
@@ -248,7 +248,7 @@
|
||||
status = "okay";
|
||||
|
||||
/* default boot source: workaround #1 for errata ERR006282 */
|
||||
smarc_flash: spi-flash@0 {
|
||||
smarc_flash: flash@0 {
|
||||
compatible = "winbond,w25q16dw", "jedec,spi-nor";
|
||||
reg = <0>;
|
||||
spi-max-frequency = <20000000>;
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
pinctrl-0 = <&pinctrl_ecspi1>;
|
||||
status = "okay";
|
||||
|
||||
flash: m25p80@0 {
|
||||
flash: flash@0 {
|
||||
compatible = "microchip,sst25vf016b";
|
||||
spi-max-frequency = <20000000>;
|
||||
reg = <0>;
|
||||
|
||||
@@ -321,7 +321,7 @@
|
||||
pinctrl-0 = <&pinctrl_ecspi1>;
|
||||
status = "okay";
|
||||
|
||||
flash: m25p80@0 {
|
||||
flash: flash@0 {
|
||||
compatible = "microchip,sst25vf016b";
|
||||
spi-max-frequency = <20000000>;
|
||||
reg = <0>;
|
||||
|
||||
@@ -252,7 +252,7 @@
|
||||
pinctrl-0 = <&pinctrl_ecspi1>;
|
||||
status = "okay";
|
||||
|
||||
flash: m25p80@0 {
|
||||
flash: flash@0 {
|
||||
compatible = "microchip,sst25vf016b";
|
||||
spi-max-frequency = <20000000>;
|
||||
reg = <0>;
|
||||
|
||||
@@ -237,7 +237,7 @@
|
||||
pinctrl-0 = <&pinctrl_ecspi1>;
|
||||
status = "okay";
|
||||
|
||||
flash: m25p80@0 {
|
||||
flash: flash@0 {
|
||||
compatible = "sst,sst25vf016b", "jedec,spi-nor";
|
||||
spi-max-frequency = <20000000>;
|
||||
reg = <0>;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user