mediatek: filogic: fix HF-M7986R1 typo

This commit is contained in:
coolsnowwolf 2024-07-10 22:09:11 +08:00
parent 6a9ab8e562
commit 8a8bf45736
4 changed files with 117 additions and 120 deletions

View File

@ -8,7 +8,81 @@
compatible = "hf,m7986r1-emmc", "mediatek,mt7986a"; compatible = "hf,m7986r1-emmc", "mediatek,mt7986a";
chosen { chosen {
bootargs = "root=PARTLABEL=rootfs rootwait rootfstype=squashfs,f2fs"; bootargs = "root=PARTLABEL=rootfs rootwait";
}; };
}; };
&mmc0 {
bus-width = <8>;
cap-mmc-highspeed;
hs400-ds-delay = <0x14014>;
max-frequency = <200000000>;
mmc-hs200-1_8v;
non-removable;
pinctrl-names = "default", "state_uhs";
pinctrl-0 = <&mmc0_pins_default>;
pinctrl-1 = <&mmc0_pins_uhs>;
vmmc-supply = <&reg_3p3v>;
vqmmc-supply = <&reg_1p8v>;
status = "okay";
};
&pio {
mmc0_pins_default: mmc0-pins-default {
mux {
function = "emmc";
groups = "emmc_51";
};
conf-cmd-dat {
pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
"EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
"EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
input-enable;
drive-strength = <4>;
mediatek,pull-up-adv = <1>;
};
conf-clk {
pins = "EMMC_CK";
drive-strength = <6>;
mediatek,pull-down-adv = <2>;
};
conf-ds {
pins = "EMMC_DSL";
mediatek,pull-down-adv = <2>;
};
conf-rst {
pins = "EMMC_RSTB";
drive-strength = <4>;
mediatek,pull-up-adv = <1>;
};
};
mmc0_pins_uhs: mmc0-uhs-pins {
mux {
function = "emmc";
groups = "emmc_51";
};
conf-cmd-dat {
pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
"EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
"EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
input-enable;
drive-strength = <4>;
mediatek,pull-up-adv = <1>;
};
conf-clk {
pins = "EMMC_CK";
drive-strength = <6>;
mediatek,pull-down-adv = <2>;
};
conf-ds {
pins = "EMMC_DSL";
mediatek,pull-down-adv = <2>;
};
conf-rst {
pins = "EMMC_RSTB";
drive-strength = <4>;
mediatek,pull-up-adv = <1>;
};
};
};

View File

@ -15,7 +15,7 @@
led-running = &sys_led; led-running = &sys_led;
led-upgrade = &sys_led; led-upgrade = &sys_led;
}; };
chosen { chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
@ -68,6 +68,15 @@
}; };
}; };
reg_1p8v: regulator-1p8v {
compatible = "regulator-fixed";
regulator-name = "fixed-1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-boot-on;
regulator-always-on;
};
reg_3p3v: regulator-3p3v { reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "fixed-3.3V"; regulator-name = "fixed-3.3V";
@ -85,15 +94,6 @@
regulator-boot-on; regulator-boot-on;
regulator-always-on; regulator-always-on;
}; };
reg_1p8v: regulator-1p8v {
compatible = "regulator-fixed";
regulator-name = "fixed-1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-boot-on;
regulator-always-on;
};
}; };
&crypto { &crypto {
@ -188,64 +188,6 @@
output-low; output-low;
}; };
}; };
mmc0_pins_default: mmc0-pins-default {
mux {
function = "emmc";
groups = "emmc_51";
};
conf-cmd-dat {
pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
"EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
"EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
input-enable;
drive-strength = <4>;
mediatek,pull-up-adv = <1>;
};
conf-clk {
pins = "EMMC_CK";
drive-strength = <6>;
mediatek,pull-down-adv = <2>;
};
conf-ds {
pins = "EMMC_DSL";
mediatek,pull-down-adv = <2>;
};
conf-rst {
pins = "EMMC_RSTB";
drive-strength = <4>;
mediatek,pull-up-adv = <1>;
};
};
mmc0_pins_uhs: mmc0-uhs-pins {
mux {
function = "emmc";
groups = "emmc_51";
};
conf-cmd-dat {
pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
"EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
"EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
input-enable;
drive-strength = <4>;
mediatek,pull-up-adv = <1>;
};
conf-clk {
pins = "EMMC_CK";
drive-strength = <6>;
mediatek,pull-down-adv = <2>;
};
conf-ds {
pins = "EMMC_DSL";
mediatek,pull-down-adv = <2>;
};
conf-rst {
pins = "EMMC_RSTB";
drive-strength = <4>;
mediatek,pull-up-adv = <1>;
};
};
}; };
&ssusb { &ssusb {
@ -310,21 +252,3 @@
&watchdog { &watchdog {
status = "okay"; status = "okay";
}; };
&mmc0 {
bus-width = <8>;
cap-mmc-highspeed;
hs400-ds-delay = <0x14014>;
max-frequency = <200000000>;
mmc-hs200-1_8v;
no-sd;
no-sdio;
non-removable;
pinctrl-names = "default", "state_uhs";
pinctrl-0 = <&mmc0_pins_default>;
pinctrl-1 = <&mmc0_pins_uhs>;
vmmc-supply = <&reg_3p3v>;
vqmmc-supply = <&reg_1p8v>;
status = "okay";
};

View File

@ -34,13 +34,13 @@ mediatek_setup_interfaces()
qihoo,360t7) qihoo,360t7)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan
;; ;;
hf,m7986r1*)
ucidef_set_interfaces_lan_wan "lan2 lan3 lan4" "lan1 usb0"
;;
glinet,gl-mt2500|\ glinet,gl-mt2500|\
glinet,gl-mt3000) glinet,gl-mt3000)
ucidef_set_interfaces_lan_wan eth1 eth0 ucidef_set_interfaces_lan_wan eth1 eth0
;; ;;
hf,m7986r1*)
ucidef_set_interfaces_lan_wan "lan2 lan3 lan4" "lan1 usb0"
;;
mediatek,mt7986a-rfb|\ mediatek,mt7986a-rfb|\
mediatek,mt7986b-rfb) mediatek,mt7986b-rfb)
ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" eth1 ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" eth1

View File

@ -340,6 +340,35 @@ define Device/h3c_magic-nx30-pro
endef endef
TARGET_DEVICES += h3c_magic-nx30-pro TARGET_DEVICES += h3c_magic-nx30-pro
define Device/hf_m7986r1-emmc
DEVICE_VENDOR := HF
DEVICE_MODEL := M7986R1 (eMMC)
DEVICE_DTS := mt7986a-hf-m7986r1-emmc
DEVICE_DTS_DIR := ../dts
DEVICE_PACKAGES := kmod-usb3 kmod-mt7921e kmod-usb-net-rndis kmod-usb-serial-option f2fsck mkf2fs
SUPPORTED_DEVICES += HF-M7986R1
KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
KERNEL_INITRAMFS := kernel-bin | lzma | \
fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
endef
TARGET_DEVICES += hf_m7986r1-emmc
define Device/hf_m7986r1-nand
DEVICE_VENDOR := HF
DEVICE_MODEL := M7986R1 (NAND)
DEVICE_DTS := mt7986a-hf-m7986r1-nand
DEVICE_DTS_DIR := ../dts
UBINIZE_OPTS := -E 5
BLOCKSIZE := 128k
PAGESIZE := 2048
KERNEL_IN_UBI := 1
DEVICE_PACKAGES := kmod-usb3 kmod-mt7921e kmod-usb-net-rndis kmod-usb-serial-option
SUPPORTED_DEVICES += HF-M7986R1
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
endef
TARGET_DEVICES += hf_m7986r1-nand
define Device/imou_lc-hx3001 define Device/imou_lc-hx3001
DEVICE_VENDOR := IMOU DEVICE_VENDOR := IMOU
DEVICE_MODEL := LC-HX3001 DEVICE_MODEL := LC-HX3001
@ -479,36 +508,6 @@ define Device/mediatek_mt7988a-rfb
endef endef
TARGET_DEVICES += mediatek_mt7988a-rfb TARGET_DEVICES += mediatek_mt7988a-rfb
define Device/hf_m7986r1-emmc
DEVICE_VENDOR := HF
DEVICE_MODEL := M7986R1 (eMMC version)
DEVICE_DTS := mt7986a-hf-m7986r1-emmc
DEVICE_DTS_DIR := ../dts
DEVICE_PACKAGES := kmod-usb3 kmod-mt7921e kmod-usb-serial-option kmod-usb-net-rndis f2fsck mkf2fs
SUPPORTED_DEVICES += HF-M7986R1
KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
KERNEL_INITRAMFS := kernel-bin | lzma | \
fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
endef
TARGET_DEVICES +=hf_m7986r1-emmc
define Device/hf_m7986r1-nand
DEVICE_VENDOR := HF
DEVICE_MODEL := M7986R1 (NAND version)
DEVICE_DTS := mt7986a-hf-m7986r1-nand
DEVICE_DTS_DIR := ../dts
UBINIZE_OPTS := -E 5
BLOCKSIZE := 128k
PAGESIZE := 2048
IMAGE_SIZE := 116736k
KERNEL_IN_UBI := 1
DEVICE_PACKAGES := kmod-usb3 kmod-mt7921e kmod-usb-serial-option kmod-usb-net-rndis mmc-utils
SUPPORTED_DEVICES += HF-M7986R1
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
endef
TARGET_DEVICES +=hf_m7986r1-nand
define Device/netcore_n60 define Device/netcore_n60
DEVICE_VENDOR := Netcore DEVICE_VENDOR := Netcore
DEVICE_MODEL := N60 DEVICE_MODEL := N60