Merge "Revert "[Feature][ZXW-229]add sim change api""
diff --git a/ap/app/Script/scripts/wan_ipv4.sh b/ap/app/Script/scripts/wan_ipv4.sh
index 0473738..687e65a 100755
--- a/ap/app/Script/scripts/wan_ipv4.sh
+++ b/ap/app/Script/scripts/wan_ipv4.sh
@@ -236,8 +236,9 @@
#if [ "-$c_id" == "-0" -o "-$c_id" == "-$def_cid" ]; then
#echo 0 > /proc/sys/net/ipv4/ip_forward
#fi
-
- ifconfig $wan_if 0.0.0.0 2>>$test_log
+ #xf.li@20240228 delete for T106BUG-520 start
+ #ifconfig $wan_if 0.0.0.0 2>>$test_log
+ #xf.li@20240228 delete for T106BUG-520 end
if [ $? -ne 0 ];then
echo "Error: ifconfig $wan_if 0.0.0.0 failed." >> $test_log
fi
diff --git a/ap/app/zte_comm/zte_mainctrl/netdev_proc.c b/ap/app/zte_comm/zte_mainctrl/netdev_proc.c
index 1715310..241ad2c 100755
--- a/ap/app/zte_comm/zte_mainctrl/netdev_proc.c
+++ b/ap/app/zte_comm/zte_mainctrl/netdev_proc.c
@@ -1138,8 +1138,10 @@
snprintf(cmd, sizeof(cmd),"ifconfig %s down", wan_name);
system_cmd_ex(cmd);
//ifconfig ip
- snprintf(cmd, sizeof(cmd),"ifconfig %s 0.0.0.0 down", wan_name);
- system_cmd_ex(cmd);
+ //xf.li@20240228 delete for T106BUG-520 start
+ //snprintf(cmd, sizeof(cmd),"ifconfig %s 0.0.0.0 down", wan_name);
+ //system_cmd_ex(cmd);
+ //xf.li@20240228 delete for T106BUG-520 end
sc_cfg_get("default_wan_name", default_wan_name, sizeof(default_wan_name));
sc_cfg_get("default_wan6_name", default_wan6_name, sizeof(default_wan6_name));
diff --git a/ap/os/linux/linux-3.4.x/drivers/tty/serial/zx29_uart.c b/ap/os/linux/linux-3.4.x/drivers/tty/serial/zx29_uart.c
index 43a208a..e599f79 100755
--- a/ap/os/linux/linux-3.4.x/drivers/tty/serial/zx29_uart.c
+++ b/ap/os/linux/linux-3.4.x/drivers/tty/serial/zx29_uart.c
@@ -3366,11 +3366,11 @@
#endif
#if CONFIG_SERIAL_ZX29_DMA
-// if(pdev->id == 0)
-// {
+ if(pdev->id != 1) //zw.wang modify for T106BUG-531 on 20240304
+ {
uart_dma_init(port);
printk(KERN_INFO "[%s][%d]UART DMA is OPENED%d\n",__func__,__LINE__,pdev->id);
-// }
+ }
#endif
ret=uart_add_one_port(&zx29_uart_driver, &port->port);
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc/init.d/fscheck.sh b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc/init.d/fscheck.sh
index 73e88e9..568d77a 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc/init.d/fscheck.sh
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc/init.d/fscheck.sh
@@ -20,17 +20,18 @@
/sbin/ubi_mount.sh /mnt/oem oem2 vol_oem squashfs
fi
-#l.yang modify for T106BUG-387 start
-if [ -e /dev/mmcblk1p1 ]; then
- mount -t ext4 /dev/mmcblk1p1 /var/log
-else
- mkdir -p /mnt/oemdata/log
- mount /mnt/oemdata/log /var/log
-fi
-#l.yang modify for T106BUG-387 start
-
if [ $? -ne 0 ]; then
flags_tool_static --switch
reboot
fi
+#l.yang modify for T106BUG-387 start
+if [ -e /dev/mmcblk1p1 ]; then
+ mount -t ext4 /dev/mmcblk1p1 /var/log
+else
+ mkdir -p /mnt/oemdata/log
+ mount /mnt/oemdata/log /var/log
+fi
+#l.yang modify for T106BUG-387 start
+
+
diff --git a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/net/ethernet/zte/zx29_gmac.c b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/net/ethernet/zte/zx29_gmac.c
index 797ec4d..a090e12 100644
--- a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/net/ethernet/zte/zx29_gmac.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/net/ethernet/zte/zx29_gmac.c
@@ -1735,7 +1735,7 @@
base = devm_platform_ioremap_resource(pdev, 1);
gmac_phy_release();
base_phy_release = base;
- mdelay(500);
+ mdelay(10); //Here, the jl3103 is set as an example, and other phy peripherals need to be optimized according to different reset stability times
ret = mdiobus_register(mb);
if (ret < 0) {
diff --git a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/sound/soc/codecs/es8311.c b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/sound/soc/codecs/es8311.c
index 215c905..b903b2b 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/sound/soc/codecs/es8311.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/sound/soc/codecs/es8311.c
@@ -1224,21 +1224,6 @@
struct es8311_private *info = dev_get_drvdata(dev);
struct device_node *np = dev->of_node;
- unsigned tmp;
- printk("Enter into %s()\n", __func__);
-
-
- #if 1
- void __iomem *reg_base;
- reg_base = ioremap(0x13B000+0x94 ,4);
- tmp = ioread32(reg_base);
- tmp |= (1<<0)|(1<<2);
- iowrite32(tmp,reg_base);
-
-
- #endif
-
-
dev_info(dev, "%s:start!\n", __func__);
if(dev == NULL){
diff --git a/update_version.sh b/update_version.sh
index 718b937..381e04f 100755
--- a/update_version.sh
+++ b/update_version.sh
@@ -1,8 +1,8 @@
#!/bin/bash
#export LYNQ_VERSION="T106_lynq_version_ap_build_sh"
-LYNQ_AP_VERSION="T106-V2.01.01.02P54U03.AP.11.01"
-LYNQ_CAP_INSIDE_VERSION="CAP.11.01"
-LYNQ_CAP_VERSION="CAP.11.01"
+LYNQ_AP_VERSION="T106-V2.01.01.02P54U03.AP.11.02"
+LYNQ_CAP_INSIDE_VERSION="CAP.11.02"
+LYNQ_CAP_VERSION="CAP.11.02"
COMMIT_ID="$(git rev-parse HEAD)"
LYNQ_SW_INSIDE_VERSION="LYNQ_CONFIG_VERSION = \"${LYNQ_AP_VERSION}_${LYNQ_CAP_INSIDE_VERSION}\""