diff --git a/patch/kernel/archive/meson64-6.12/dt/meson-g12b-a311d-cainiao-cniot-core.dts b/patch/kernel/archive/meson64-6.12/dt/meson-g12b-a311d-cainiao-cniot-core.dts index 5f20ba5621..b4a8db2ed8 100644 --- a/patch/kernel/archive/meson64-6.12/dt/meson-g12b-a311d-cainiao-cniot-core.dts +++ b/patch/kernel/archive/meson64-6.12/dt/meson-g12b-a311d-cainiao-cniot-core.dts @@ -15,7 +15,7 @@ #include / { - compatible = "CAINIAO,CNIoT-CORE", "amlogic,a311d", "amlogic,g12b"; + compatible = "cainiao,cniot-core", "amlogic,a311d", "amlogic,g12b"; model = "CAINIAO CNIoT-CORE"; aliases { @@ -30,7 +30,7 @@ memory@0 { device_type = "memory"; - reg = <0x0 0x0 0x0 0x80000000>; + reg = <0x0 0x0 0x0 0x77359400>; /* 2GB */ }; fan0: pwm-fan { @@ -68,7 +68,7 @@ emmc_pwrseq: emmc-pwrseq { compatible = "mmc-pwrseq-emmc"; - reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; /* In the vendor DTS, this is BOOT_10, but the actual test result is BOOT_12. */ + reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; }; hdmi-connector { diff --git a/patch/kernel/archive/meson64-6.15/dt/meson-g12b-a311d-cainiao-cniot-core.dts b/patch/kernel/archive/meson64-6.15/dt/meson-g12b-a311d-cainiao-cniot-core.dts index 5f20ba5621..b4a8db2ed8 100644 --- a/patch/kernel/archive/meson64-6.15/dt/meson-g12b-a311d-cainiao-cniot-core.dts +++ b/patch/kernel/archive/meson64-6.15/dt/meson-g12b-a311d-cainiao-cniot-core.dts @@ -15,7 +15,7 @@ #include / { - compatible = "CAINIAO,CNIoT-CORE", "amlogic,a311d", "amlogic,g12b"; + compatible = "cainiao,cniot-core", "amlogic,a311d", "amlogic,g12b"; model = "CAINIAO CNIoT-CORE"; aliases { @@ -30,7 +30,7 @@ memory@0 { device_type = "memory"; - reg = <0x0 0x0 0x0 0x80000000>; + reg = <0x0 0x0 0x0 0x77359400>; /* 2GB */ }; fan0: pwm-fan { @@ -68,7 +68,7 @@ emmc_pwrseq: emmc-pwrseq { compatible = "mmc-pwrseq-emmc"; - reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; /* In the vendor DTS, this is BOOT_10, but the actual test result is BOOT_12. */ + reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; }; hdmi-connector { diff --git a/patch/u-boot/v2025.04/board_cainiao-cniot-core/add-board-cainiao-cniot-core.patch b/patch/u-boot/v2025.04/board_cainiao-cniot-core/add-board-cainiao-cniot-core.patch index c1b3387c0f..7a7f05650f 100644 --- a/patch/u-boot/v2025.04/board_cainiao-cniot-core/add-board-cainiao-cniot-core.patch +++ b/patch/u-boot/v2025.04/board_cainiao-cniot-core/add-board-cainiao-cniot-core.patch @@ -128,7 +128,7 @@ index 00000000..345d9b86 +CONFIG_ZSTD=y diff --git a/dts/upstream/src/arm64/amlogic/meson-g12b-a311d-cainiao-cniot-core.dts b/dts/upstream/src/arm64/amlogic/meson-g12b-a311d-cainiao-cniot-core.dts new file mode 100644 -index 00000000..bdfcce04 +index 00000000..1907347f --- /dev/null +++ b/dts/upstream/src/arm64/amlogic/meson-g12b-a311d-cainiao-cniot-core.dts @@ -0,0 +1,600 @@ @@ -149,7 +149,7 @@ index 00000000..bdfcce04 +#include + +/ { -+ compatible = "CAINIAO,CNIoT-CORE", "amlogic,a311d", "amlogic,g12b"; ++ compatible = "cainiao,cniot-core", "amlogic,a311d", "amlogic,g12b"; + model = "CAINIAO CNIoT-CORE"; + + aliases { @@ -164,7 +164,7 @@ index 00000000..bdfcce04 + + memory@0 { + device_type = "memory"; -+ reg = <0x0 0x0 0x0 0x80000000>; ++ reg = <0x0 0x0 0x0 0x77359400>; /* 2GB */ + }; + + fan0: pwm-fan { @@ -202,7 +202,7 @@ index 00000000..bdfcce04 + + emmc_pwrseq: emmc-pwrseq { + compatible = "mmc-pwrseq-emmc"; -+ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; /* In the vendor DTS, this is BOOT_10, but the actual test result is BOOT_12. */ ++ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; + }; + + hdmi-connector {