[][dts: mt7986: Add SPIM prefix to NOR dts and remove unnecessary ones]
[Description]
Add SPIM prefix to NOR dts and remove unnecessary ones. To avoid
misunderstanding, add spim prefix to nor images, too.
[Release-log]
N/A
Change-Id: I61f8ce68c7cc9ac87ac5a00b660a6ae7abb0541f
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/5395822
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-2500wan-nor-rfb.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-2500wan-spim-nor-rfb.dts
similarity index 100%
rename from target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-2500wan-nor-rfb.dts
rename to target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-2500wan-spim-nor-rfb.dts
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-snand-rfb.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-snand-rfb.dts
deleted file mode 100644
index eb6af6a..0000000
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-snand-rfb.dts
+++ /dev/null
@@ -1,60 +0,0 @@
-/dts-v1/;
-#include "mt7986a-rfb.dtsi"
-/ {
- model = "MediaTek MT7986a RFB";
- compatible = "mediatek,mt7986a-snand-rfb";
-
- nmbm_spim_nand {
- compatible = "generic,nmbm";
-
- #address-cells = <1>;
- #size-cells = <1>;
-
- lower-mtd-device = <&spi_nand>;
- forced-create;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition@0 {
- label = "BL2";
- reg = <0x00000 0x0100000>;
- read-only;
- };
-
- partition@100000 {
- label = "u-boot-env";
- reg = <0x0100000 0x0080000>;
- };
-
- factory: partition@180000 {
- label = "Factory";
- reg = <0x180000 0x0200000>;
- };
-
- partition@380000 {
- label = "FIP";
- reg = <0x380000 0x0200000>;
- };
-
- partition@580000 {
- label = "ubi";
- reg = <0x580000 0x4000000>;
- };
- };
- };
-};
-
-&spi0 {
- status = "okay";
-};
-
-&snand {
- status = "okay";
-};
-
-&mmc0 {
- status = "disabled";
-};
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-nor-rfb.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-spim-nor-rfb.dts
similarity index 100%
rename from target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-nor-rfb.dts
rename to target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-spim-nor-rfb.dts
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-2500wan-nor-rfb.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-2500wan-spim-nor-rfb.dts
similarity index 100%
rename from target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-2500wan-nor-rfb.dts
rename to target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-2500wan-spim-nor-rfb.dts
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-snand-rfb.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-snand-rfb.dts
deleted file mode 100644
index 5215812..0000000
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-snand-rfb.dts
+++ /dev/null
@@ -1,60 +0,0 @@
-/dts-v1/;
-#include "mt7986b-rfb.dtsi"
-/ {
- model = "MediaTek MT7986b RFB";
- compatible = "mediatek,mt7986b-snand-rfb";
-
- nmbm_spim_nand {
- compatible = "generic,nmbm";
-
- #address-cells = <1>;
- #size-cells = <1>;
-
- lower-mtd-device = <&spi_nand>;
- forced-create;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition@0 {
- label = "BL2";
- reg = <0x00000 0x0100000>;
- read-only;
- };
-
- partition@100000 {
- label = "u-boot-env";
- reg = <0x0100000 0x0080000>;
- };
-
- factory: partition@180000 {
- label = "Factory";
- reg = <0x180000 0x0200000>;
- };
-
- partition@380000 {
- label = "FIP";
- reg = <0x380000 0x0200000>;
- };
-
- partition@580000 {
- label = "ubi";
- reg = <0x580000 0x4000000>;
- };
- };
- };
-};
-
-&spi0 {
- status = "okay";
-};
-
-&snand {
- status = "okay";
-};
-
-&mmc0 {
- status = "disabled";
-};
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-nor-rfb.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-spim-nor-rfb.dts
similarity index 100%
rename from target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-nor-rfb.dts
rename to target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-spim-nor-rfb.dts
diff --git a/target/linux/mediatek/image/mt7986.mk b/target/linux/mediatek/image/mt7986.mk
index 65031a9..9e99b16 100644
--- a/target/linux/mediatek/image/mt7986.mk
+++ b/target/linux/mediatek/image/mt7986.mk
@@ -1,12 +1,12 @@
KERNEL_LOADADDR := 0x48080000
-define Device/mt7986a-ax6000-nor-rfb
+define Device/mt7986a-ax6000-spim-nor-rfb
DEVICE_VENDOR := MediaTek
- DEVICE_MODEL := mt7986a-ax6000-nor-rfb
- DEVICE_DTS := mt7986a-nor-rfb
+ DEVICE_MODEL := mt7986a-ax6000-spim-nor-rfb
+ DEVICE_DTS := mt7986a-spim-nor-rfb
DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
endef
-TARGET_DEVICES += mt7986a-ax6000-nor-rfb
+TARGET_DEVICES += mt7986a-ax6000-spim-nor-rfb
define Device/mt7986a-ax6000-spim-nand-rfb
DEVICE_VENDOR := MediaTek
@@ -72,13 +72,13 @@
endef
TARGET_DEVICES += mt7986a-ax6000-emmc-rfb
-define Device/mt7986a-ax6000-2500wan-nor-rfb
+define Device/mt7986a-ax6000-2500wan-spim-nor-rfb
DEVICE_VENDOR := MediaTek
- DEVICE_MODEL := mt7986a-ax6000-2500wan-nor-rfb
- DEVICE_DTS := mt7986a-2500wan-nor-rfb
+ DEVICE_MODEL := mt7986a-ax6000-2500wan-spim-nor-rfb
+ DEVICE_DTS := mt7986a-2500wan-spim-nor-rfb
DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
endef
-TARGET_DEVICES += mt7986a-ax6000-2500wan-nor-rfb
+TARGET_DEVICES += mt7986a-ax6000-2500wan-spim-nor-rfb
define Device/mt7986a-ax6000-2500wan-spim-nand-rfb
DEVICE_VENDOR := MediaTek
@@ -114,13 +114,13 @@
endef
TARGET_DEVICES += mt7986a-ax8400-2500wan-spim-nand-rfb
-define Device/mt7986a-ax7800-nor-rfb
+define Device/mt7986a-ax7800-spim-nor-rfb
DEVICE_VENDOR := MediaTek
- DEVICE_MODEL := mt7986a-ax7800-nor-rfb
- DEVICE_DTS := mt7986a-nor-rfb
+ DEVICE_MODEL := mt7986a-ax7800-spim-nor-rfb
+ DEVICE_DTS := mt7986a-spim-nor-rfb
DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
endef
-TARGET_DEVICES += mt7986a-ax7800-nor-rfb
+TARGET_DEVICES += mt7986a-ax7800-spim-nor-rfb
define Device/mt7986a-ax7800-spim-nand-rfb
DEVICE_VENDOR := MediaTek
@@ -139,13 +139,13 @@
endef
TARGET_DEVICES += mt7986a-ax7800-spim-nand-rfb
-define Device/mt7986a-ax7800-2500wan-nor-rfb
+define Device/mt7986a-ax7800-2500wan-spim-nor-rfb
DEVICE_VENDOR := MediaTek
- DEVICE_MODEL := mt7986a-ax7800-2500wan-nor-rfb
- DEVICE_DTS := mt7986a-2500wan-nor-rfb
+ DEVICE_MODEL := mt7986a-ax7800-2500wan-spim-nor-rfb
+ DEVICE_DTS := mt7986a-2500wan-spim-nor-rfb
DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
endef
-TARGET_DEVICES += mt7986a-ax7800-2500wan-nor-rfb
+TARGET_DEVICES += mt7986a-ax7800-2500wan-spim-nor-rfb
define Device/mt7986a-ax7800-2500wan-spim-nand-rfb
DEVICE_VENDOR := MediaTek
@@ -164,13 +164,13 @@
endef
TARGET_DEVICES += mt7986a-ax7800-2500wan-spim-nand-rfb
-define Device/mt7986b-ax6000-nor-rfb
+define Device/mt7986b-ax6000-spim-nor-rfb
DEVICE_VENDOR := MediaTek
- DEVICE_MODEL := mt7986b-ax6000-nor-rfb
- DEVICE_DTS := mt7986b-nor-rfb
+ DEVICE_MODEL := mt7986b-ax6000-spim-nor-rfb
+ DEVICE_DTS := mt7986b-spim-nor-rfb
DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
endef
-TARGET_DEVICES += mt7986b-ax6000-nor-rfb
+TARGET_DEVICES += mt7986b-ax6000-spim-nor-rfb
define Device/mt7986b-ax6000-spim-nand-rfb
DEVICE_VENDOR := MediaTek
@@ -219,13 +219,13 @@
endef
TARGET_DEVICES += mt7986b-ax6000-emmc-rfb
-define Device/mt7986b-ax6000-2500wan-nor-rfb
+define Device/mt7986b-ax6000-2500wan-spim-nor-rfb
DEVICE_VENDOR := MediaTek
- DEVICE_MODEL := mt7986b-ax6000-2500wan-nor-rfb
- DEVICE_DTS := mt7986b-2500wan-nor-rfb
+ DEVICE_MODEL := mt7986b-ax6000-2500wan-spim-nor-rfb
+ DEVICE_DTS := mt7986b-2500wan-spim-nor-rfb
DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
endef
-TARGET_DEVICES += mt7986b-ax6000-2500wan-nor-rfb
+TARGET_DEVICES += mt7986b-ax6000-2500wan-spim-nor-rfb
define Device/mt7986b-ax6000-2500wan-spim-nand-rfb
DEVICE_VENDOR := MediaTek