Merge "[Feature][ZXW-185][POWER]add gmac power off instructions"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/files/zx297520v3/linux-5_10-vehicle_dc_ref-normal-defconfig b/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/files/zx297520v3/linux-5_10-vehicle_dc_ref-normal-defconfig
index 6edd109..8bc48e6 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/files/zx297520v3/linux-5_10-vehicle_dc_ref-normal-defconfig
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/files/zx297520v3/linux-5_10-vehicle_dc_ref-normal-defconfig
@@ -1975,12 +1975,12 @@
# CONFIG_SND_SOC_ZX29_TI3100 is not set
#dongyu@modify for codec start
# CONFIG_SND_SOC_ZX29_NAU8810 is not set
-CONFIG_SND_SOC_ZX29_TI3104=y
+# CONFIG_SND_SOC_ZX29_TI3104 is not set
# CONFIG_SND_SOC_ZX29_ES8374 is not set
# CONFIG_SND_SOC_ZX29_ES8312 is not set
# CONFIG_SND_SOC_ZX29_AK4940 is not set
# CONFIG_SND_SOC_ZX29_MAX9867 is not set
-# CONFIG_SND_SOC_ZX29_ES8311 is not set
+CONFIG_SND_SOC_ZX29_ES8311=y
CONFIG_SND_SOC_ZX_VOICE=y
CONFIG_SND_SOC_ZX297520V3=y
CONFIG_SND_SOC_ZX_I2S=y
@@ -1988,9 +1988,9 @@
# CONFIG_SND_SOC_ZX_TDM is not set
# CONFIG_SND_SOC_TLV320AIC31XX is not set
# CONFIG_SND_SOC_NAU8810 is not set
-CONFIG_SND_SOC_TLV320AIC3X=y
+# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_MAX9867 is not set
-# CONFIG_SND_SOC_ES8311 is not set
+CONFIG_SND_SOC_ES8311=y
#dongyu@modify for codec end
CONFIG_SND_EXTRA_CTRL=y
CONFIG_USE_TOP_I2S0=y
diff --git a/cap/zx297520v3/src/lynq/framework/lynq-atcid/zxic_at_func_wrapper.cpp b/cap/zx297520v3/src/lynq/framework/lynq-atcid/zxic_at_func_wrapper.cpp
index 3037e62..99794fb 100755
--- a/cap/zx297520v3/src/lynq/framework/lynq-atcid/zxic_at_func_wrapper.cpp
+++ b/cap/zx297520v3/src/lynq/framework/lynq-atcid/zxic_at_func_wrapper.cpp
@@ -29,7 +29,7 @@
template <int n>
void zxic_at_callback(unsigned char * input, unsigned char * output)
{
- char org_cmd[64] = {0};
+ char *org_cmd = NULL;
if (input == NULL || output == NULL)
{
ALOGE("zxic_at_callback invalid params %p-%p \n", input, output);
@@ -37,6 +37,12 @@
}
strcpy((char*)output, "\r\n");
struct callback_entry *pEntry = g_all_reg_entry[n];
+ org_cmd = new char [strlen(input) + 32];
+ if (org_cmd == NULL)
+ {
+ strcat(output, "+CME ERROR: 100\r\n");
+ }
+ org_cmd[0] = '\0';
strcat(org_cmd, pEntry->at_prefix);
strcat(org_cmd, (char *)input);
pEntry->plugin_entry->output_buffer = (char*)output;
@@ -44,6 +50,7 @@
pEntry->plugin_entry->atsvc_incb(org_cmd, strlen(org_cmd));
pEntry->plugin_entry->output_buffer = NULL;
ALOGD("zxic_at_callback output -- %s \n", output);
+ delete [] org_cmd;
//return 0;
}
diff --git a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3-pinctrl.dtsi b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3-pinctrl.dtsi
index f9f558d..1a6ab53 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3-pinctrl.dtsi
+++ b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3-pinctrl.dtsi
@@ -288,97 +288,97 @@
sc_ext_int0: sc_ext_int0 {
pins = "EXT_INT0";
function = "EXT_INT0";
- bias-disable;
+ //bias-disable; jb.qi changed for pullset fail on 20231107
};
sc_ext_int1: sc_ext_int1 {
pins = "EXT_INT1";
function = "EXT_INT1";
- bias-disable;
+ //bias-disable; jb.qi changed for pullset fail on 20231107
};
sc_ext_int2: sc_ext_int2 {
pins = "EXT_INT2";
function = "EXT_INT2";
- bias-disable;
+ //bias-disable; jb.qi changed for pullset fail on 20231107
};
sc_ext_int3: sc_ext_int3 {
pins = "EXT_INT3";
function = "EXT_INT3";
- bias-disable;
+ //bias-disable; jb.qi changed for pullset fail on 20231107
};
sc_ext_int4: sc_ext_int4 {
pins = "EXT_INT4";
function = "EXT_INT4";
- bias-disable;
+ //bias-disable; jb.qi changed for pullset fail on 20231107
};
sc_ext_int5: sc_ext_int5 {
pins = "EXT_INT5";
function = "EXT_INT5";
- bias-disable;
+ //bias-disable; jb.qi changed for pullset fail on 20231107
};
sc_ext_int6: sc_ext_int6 {
pins = "EXT_INT6";
function = "EXT_INT6";
- bias-disable;
+ //bias-disable; jb.qi changed for pullset fail on 20231107
};
sc_ext_int7: sc_ext_int7 {
pins = "EXT_INT7";
function = "EXT_INT7";
- bias-disable;
+ //bias-disable; jb.qi changed for pullset fail on 20231107
};
sc_ext_int8: sc_ext_int8 {
pins = "EXT_INT8";
function = "EXT_INT8";
- bias-disable;
+ //bias-disable; jb.qi changed for pullset fail on 20231107
};
sc_ext_int9: sc_ext_int9 {
pins = "EXT_INT9";
function = "EXT_INT9";
- bias-disable;
+ //bias-disable; jb.qi changed for pullset fail on 20231107
};
sc_ext_int10: sc_ext_int10 {
pins = "GPIO129"; /*jb.qi add for EXT_INIT10 success*/
function = "EXT_INT10";
- bias-disable;
+ //bias-disable; jb.qi changed for pullset fail on 20231107
};
sc_ext_int11: sc_ext_int11 {
pins = "EXT_INT11";
function = "EXT_INT11";
- bias-disable;
+ //bias-disable; jb.qi changed for pullset fail on 20231107
};
sc_ext_int12: sc_ext_int12 {
pins = "GPIO131"; //"EXT_INT12";
function = "EXT_INT12";
- bias-disable;
+ //bias-disable; jb.qi changed for pullset fail on 20231107
};
sc_ext_int13: sc_ext_int13 {
pins = "EXT_INT13";
function = "EXT_INT13";
- bias-disable;
+ //bias-disable; jb.qi changed for pullset fail on 20231107
};
sc_ext_int14: sc_ext_int14 {
pins = "EXT_INT14";
function = "EXT_INT14";
- bias-disable;
+ //bias-disable; jb.qi changed for pullset fail on 20231107
};
sc_ext_int15: sc_ext_int15 {
pins = "EXT_INT15";
function = "EXT_INT15";
- bias-disable;
+ //bias-disable; jb.qi changed for pullset fail on 20231107
};
};
diff --git a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3-vehicle_dc_ref.dts b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3-vehicle_dc_ref.dts
index da48fcc..6f7cf69 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3-vehicle_dc_ref.dts
+++ b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3-vehicle_dc_ref.dts
@@ -130,11 +130,11 @@
// status = "okay";
};
&codec_ti3104 {
- status = "okay";
+// status = "okay";
};
&zx29_ti3104 {
pinctrl-0 = <&i2s0_pins>;
- status = "okay";
+// status = "okay";
};
&codec_nau8810 {
// status = "okay";
@@ -155,11 +155,11 @@
// status = "okay";
};
&codec_es8311 {
-// status = "okay";
+ status = "okay";
};
&zx29_es8311 {
pinctrl-0 = <&i2s0_pins>;
-// status = "okay";
+ status = "okay";
};
&gmac {
port-nums = <1>;