Skip to content

Commit 7a6e806

Browse files
retro98boyigorpecovnik
authored andcommitted
CAINIAO CNIoT-CORE: fix memory address range
1 parent 1faf639 commit 7a6e806

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

patch/kernel/archive/meson64-6.12/dt/meson-g12b-a311d-cainiao-cniot-core.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
1616

1717
/ {
18-
compatible = "CAINIAO,CNIoT-CORE", "amlogic,a311d", "amlogic,g12b";
18+
compatible = "cainiao,cniot-core", "amlogic,a311d", "amlogic,g12b";
1919
model = "CAINIAO CNIoT-CORE";
2020

2121
aliases {
@@ -30,7 +30,7 @@
3030

3131
memory@0 {
3232
device_type = "memory";
33-
reg = <0x0 0x0 0x0 0x80000000>;
33+
reg = <0x0 0x0 0x0 0x77359400>; /* 2GB */
3434
};
3535

3636
fan0: pwm-fan {
@@ -68,7 +68,7 @@
6868

6969
emmc_pwrseq: emmc-pwrseq {
7070
compatible = "mmc-pwrseq-emmc";
71-
reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; /* In the vendor DTS, this is BOOT_10, but the actual test result is BOOT_12. */
71+
reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
7272
};
7373

7474
hdmi-connector {

patch/kernel/archive/meson64-6.15/dt/meson-g12b-a311d-cainiao-cniot-core.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
1616

1717
/ {
18-
compatible = "CAINIAO,CNIoT-CORE", "amlogic,a311d", "amlogic,g12b";
18+
compatible = "cainiao,cniot-core", "amlogic,a311d", "amlogic,g12b";
1919
model = "CAINIAO CNIoT-CORE";
2020

2121
aliases {
@@ -30,7 +30,7 @@
3030

3131
memory@0 {
3232
device_type = "memory";
33-
reg = <0x0 0x0 0x0 0x80000000>;
33+
reg = <0x0 0x0 0x0 0x77359400>; /* 2GB */
3434
};
3535

3636
fan0: pwm-fan {
@@ -68,7 +68,7 @@
6868

6969
emmc_pwrseq: emmc-pwrseq {
7070
compatible = "mmc-pwrseq-emmc";
71-
reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; /* In the vendor DTS, this is BOOT_10, but the actual test result is BOOT_12. */
71+
reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
7272
};
7373

7474
hdmi-connector {

patch/u-boot/v2025.04/board_cainiao-cniot-core/add-board-cainiao-cniot-core.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ index 00000000..345d9b86
128128
+CONFIG_ZSTD=y
129129
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
130130
new file mode 100644
131-
index 00000000..bdfcce04
131+
index 00000000..1907347f
132132
--- /dev/null
133133
+++ b/dts/upstream/src/arm64/amlogic/meson-g12b-a311d-cainiao-cniot-core.dts
134134
@@ -0,0 +1,600 @@
@@ -149,7 +149,7 @@ index 00000000..bdfcce04
149149
+#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
150150
+
151151
+/ {
152-
+ compatible = "CAINIAO,CNIoT-CORE", "amlogic,a311d", "amlogic,g12b";
152+
+ compatible = "cainiao,cniot-core", "amlogic,a311d", "amlogic,g12b";
153153
+ model = "CAINIAO CNIoT-CORE";
154154
+
155155
+ aliases {
@@ -164,7 +164,7 @@ index 00000000..bdfcce04
164164
+
165165
+ memory@0 {
166166
+ device_type = "memory";
167-
+ reg = <0x0 0x0 0x0 0x80000000>;
167+
+ reg = <0x0 0x0 0x0 0x77359400>; /* 2GB */
168168
+ };
169169
+
170170
+ fan0: pwm-fan {
@@ -202,7 +202,7 @@ index 00000000..bdfcce04
202202
+
203203
+ emmc_pwrseq: emmc-pwrseq {
204204
+ compatible = "mmc-pwrseq-emmc";
205-
+ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; /* In the vendor DTS, this is BOOT_10, but the actual test result is BOOT_12. */
205+
+ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
206206
+ };
207207
+
208208
+ hdmi-connector {

0 commit comments

Comments
 (0)