tobi/M7350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46ba6f09ec
M7350/tp-product/m7350v6/kernel/kernel_diff.patch
T 46ba6f09ec M7350v7_en_gpl
2024-09-09 08:59:52 +00:00

1002 lines
24 KiB
Diff
Executable File
Raw Blame History

diff --git a/arch/arm/boot/dts/qcom/mdm9607-cdp.dtsi b/arch/arm/boot/dts/qcom/mdm9607-cdp.dtsi
index 698a935..ef0170b 100644
--- a/arch/arm/boot/dts/qcom/mdm9607-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/mdm9607-cdp.dtsi
@@ -45,6 +45,10 @@
status = "ok";
};
+&spi_5 {
+ status = "ok";
+};
+
&blsp1_uart3 {
status = "ok";
};
diff --git a/arch/arm/boot/dts/qcom/mdm9607-ion.dtsi b/arch/arm/boot/dts/qcom/mdm9607-ion.dtsi
index 2f1968f..43513ef 100644
--- a/arch/arm/boot/dts/qcom/mdm9607-ion.dtsi
+++ b/arch/arm/boot/dts/qcom/mdm9607-ion.dtsi
@@ -26,6 +26,7 @@
reg = <28>;
memory-region = <&audio_mem>;
qcom,ion-heap-type = "DMA";
+ status = "disabled";
};
};
};
diff --git a/arch/arm/boot/dts/qcom/mdm9607-mtp.dts b/arch/arm/boot/dts/qcom/mdm9607-mtp.dts
index 6674491..4deed09 100644
--- a/arch/arm/boot/dts/qcom/mdm9607-mtp.dts
+++ b/arch/arm/boot/dts/qcom/mdm9607-mtp.dts
@@ -20,3 +20,7 @@
compatible = "qcom,mdm9607-mtp", "qcom,mdm9607", "qcom,mtp";
qcom,board-id = <8 0>;
};
+
+&sdhc_2 {
+ status = "ok";
+};
diff --git a/arch/arm/boot/dts/qcom/mdm9607-mtp.dtsi b/arch/arm/boot/dts/qcom/mdm9607-mtp.dtsi
index 5e6d2f2..9498828 100644
--- a/arch/arm/boot/dts/qcom/mdm9607-mtp.dtsi
+++ b/arch/arm/boot/dts/qcom/mdm9607-mtp.dtsi
@@ -27,6 +27,18 @@
};
&soc {
+ mp2617 {
+ cell-index = <0>;
+ compatible = "mps,mp2617";
+ mps,chg-current-ma = <1000>;
+ mps,chg-vbat-div = <3>; /* Divided by 3 before input */
+ mps,chg-en-gpio = <&tlmm_pinmux 27 0>;
+ mps,chg-ok-gpio = <&tlmm_pinmux 28 0>;
+ mps,chg-m0-gpio = <&tlmm_pinmux 26 0>;
+ mps,ac-ok-gpio = <&tlmm_pinmux 4 0>;
+ qcom,client-vadc = <&pm8019_vadc>;
+ status = "disabled";
+ };
};
&blsp1_uart5 {
@@ -36,10 +48,14 @@
};
&i2c_4 {
- status = "ok";
+ status = "disabled";
};
&spi_1 {
+ status = "disabled";
+};
+
+&spi_5 {
status = "ok";
};
@@ -55,14 +71,15 @@
status = "ok";
};
-/* MPP pin 2 configs for SMB358 interrupt line */
+/* MPP pin 2 configs for MP2617 interrupt line */
&pm8019_mpps {
- mpp@a100 {
- qcom,mode = <0>; /* Digital input */
- qcom,vin-sel = <3>; /* 1.8V (L11) */
- qcom,src-sel = <0>; /* QPNP_PIN_SEL_FUNC_CONSTANT */
- qcom,pull = <2>; /* PULL UP 10KOHM */
+ mpp@a100{ /* MPP_02 */
+ /* VADC channel 17 */
+ qcom,mode = <4>;
+ qcom,ain-route = <1>; /* AMUX 6 */
qcom,master-en = <1>;
+ qcom,src-sel = <0>; /* Function constant */
+ qcom,invert = <1>;
};
};
@@ -141,21 +158,21 @@
};
};
-&i2c_4 {
+/*&i2c_4 {
/* SMB358 charger configuration */
- smb358_otg_vreg: smb358-charger@57 {
+ /*smb358_otg_vreg: smb358-charger@57 {
compatible = "qcom,smb358-charger";
regulator-name = "smb358_otg_vreg";
reg = <0x57>;
interrupt-parent = <&spmi_bus>;
interrupts = <0x0 0xa1 0x0>; /* PMIC MPP 2 */
- qcom,float-voltage-mv = <4200>;
+ /*qcom,float-voltage-mv = <4200>;
qcom,irq-gpio = <&pm8019_mpps 2 0>;
qcom,chg-vadc = <&pm8019_vadc>;
qcom,batt-id-vref-uv = <1800000>;
qcom,batt-id-rpullup-kohm = <220>;
};
-};
+};*/
&sdhc_2 {
vdd-supply = <&sdcard_ext_vreg>;
@@ -175,7 +192,7 @@
1 &intc 0 221 0
2 &tlmm_pinmux 26 0>;
interrupt-names = "hc_irq", "pwr_irq", "status_irq";
- cd-gpios = <&tlmm_pinmux 26 0x1>;
+ /*cd-gpios = <&tlmm_pinmux 26 0x1>;*/
pinctrl-names = "active", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
diff --git a/arch/arm/boot/dts/qcom/mdm9607-pinctrl.dtsi b/arch/arm/boot/dts/qcom/mdm9607-pinctrl.dtsi
index 6d4344b..285c284 100644
--- a/arch/arm/boot/dts/qcom/mdm9607-pinctrl.dtsi
+++ b/arch/arm/boot/dts/qcom/mdm9607-pinctrl.dtsi
@@ -123,6 +123,68 @@
};
};
+ spi5 {
+
+ spi5_default: spi5_default {
+ /* active state */
+ mux {
+ /* MOSI, MISO, CLK */
+ pins = "gpio20", "gpio21", "gpio23";
+ function = "blsp_spi6";
+ };
+
+ config {
+ pins = "gpio20", "gpio21", "gpio23";
+ drive-strength = <12>; /* 12 MA */
+ bias-disable = <0>; /* No PULL */
+ };
+ };
+
+
+ spi5_sleep: spi5_sleep {
+ /* suspended state */
+ mux {
+ /* MOSI, MISO, CLK */
+ pins = "gpio20", "gpio21", "gpio23";
+ function = "gpio";
+ };
+
+ config {
+ pins = "gpio20", "gpio21", "gpio23";
+ drive-strength = <2>; /* 2 MA */
+ bias-pull-down; /* PULL Down */
+ };
+ };
+
+ spi5_cs0_active: cs0_active {
+ /* CS */
+ mux {
+ pins = "gpio22";
+ function = "blsp_spi6";
+ };
+
+ config {
+ pins = "gpio22";
+ drive-strength = <2>;
+ bias-disable = <0>;
+ };
+ };
+
+ spi5_cs0_sleep: cs0_sleep {
+ /* CS */
+ mux {
+ pins = "gpio22";
+ function = "gpio";
+ };
+
+ config {
+ pins = "gpio22";
+ drive-strength = <2>;
+ bias-disable = <0>;
+ };
+ };
+ };
+
/* SDC pin type */
pmx_sdc1_cmd {
@@ -166,7 +228,7 @@
config {
pins = "sdc1_data";
bias-pull-up;
- drive-strength = <10>;
+ drive-strength = <16>;
};
};
@@ -182,11 +244,11 @@
sdc1_wlan_gpio {
sdc1_wlan_gpio_active: sdc1_wlan_gpio_active {
mux {
- pins = "gpio38", "gpio25";
+ pins = "gpio38";
function = "gpio";
};
config {
- pins = "gpio38", "gpio25";
+ pins = "gpio38";
output-high;
drive-strength = <8>;
bias-pull-up;
@@ -195,11 +257,11 @@
sdc1_wlan_gpio_sleep: sdc1_wlan_gpio_sleep {
mux {
- pins = "gpio38", "gpio25";
+ pins = "gpio38";
function = "gpio";
};
config {
- pins = "gpio38", "gpio25";
+ pins = "gpio38";
drive-strength = <2>;
bias-disable;
output-low;
@@ -211,11 +273,11 @@
i2c_4_active: i2c_4_active {
/* active state */
mux {
- pins = "gpio18", "gpio19";
+ pins = "gpio42", "gpio43";
function = "blsp_i2c4";
};
config {
- pins = "gpio18", "gpio19";
+ pins = "gpio42", "gpio43";
drive-strength = <2>;
bias-disable;
};
@@ -224,17 +286,43 @@
i2c_4_sleep: i2c_4_sleep {
/* suspended state */
mux {
- pins = "gpio18", "gpio19";
+ pins = "gpio42", "gpio43";
function = "gpio";
};
config {
- pins = "gpio18", "gpio19";
+ pins = "gpio42", "gpio43";
drive-strength = <2>;
bias-pull-down;
};
};
};
+ i2c_2 {
+ i2c_2_active: i2c_2_active {
+ mux {
+ pins = "gpio6", "gpio7";
+ function = "blsp_i2c2";
+ };
+ config {
+ pins = "gpio6", "gpio7";
+ drive-strength = <2>;
+ bias-pull-up;
+ };
+ };
+
+ i2c_2_sleep: i2c_2_sleep {
+ mux {
+ pins = "gpio6", "gpio7";
+ function = "blsp_i2c2";
+ };
+ config {
+ pins = "gpio6", "gpio7";
+ drive-strength = <2>;
+ bias-pull-up;
+ };
+ };
+ };
+
codec_reset {
codec_reset_active: codec_reset_active {
mux {
@@ -1013,5 +1101,32 @@
output-low;
};
};
+
+ /* [yangjihong start] tlmm gpio key */
+ tlmm_gpio_key {
+ gpio_key_active: gpio_key_active {
+ mux {
+ pins = "gpio30", "gpio29";
+ function = "gpio";
+ };
+ config {
+ pins = "gpio30", "gpio29";
+ drive-strength = <2>;
+ bias-pull-up;
+ };
+ };
+ gpio_key_suspend: gpio_key_suspend {
+ mux {
+ pins = "gpio30", "gpio29";
+ function = "gpio";
+ };
+ config {
+ pins = "gpio30", "gpio29";
+ drive-strength = <2>;
+ bias-pull-up;
+ };
+ };
+ };
+ /* [yangjihong end] */
};
};
diff --git a/arch/arm/boot/dts/qcom/mdm9607.dtsi b/arch/arm/boot/dts/qcom/mdm9607.dtsi
index 1a9e273..ac96a27 100644
--- a/arch/arm/boot/dts/qcom/mdm9607.dtsi
+++ b/arch/arm/boot/dts/qcom/mdm9607.dtsi
@@ -36,13 +36,14 @@
modem_adsp_mem: modem_adsp_region@0 {
compatible = "removed-dma-pool";
no-map-fixup;
- reg = <0x82a00000 0x5000000>;
+ reg = <0x82a00000 0x3600000>;
};
cnss_debug_mem: cnss_debug_region@0 {
compatible = "removed-dma-pool";
no-map;
reg = <0x87a00000 0x200000>;
+ status = "disabled";
};
external_image_mem: external_image_region@0 {
@@ -56,6 +57,7 @@
reusable;
alignment = <0x400000>;
size = <0x400000>;
+ status = "disabled";
};
};
@@ -68,7 +70,9 @@
smd36 = &smdtty_loopback;
/* spi device */
spi1 = &spi_1;
+ spi5 = &spi_5;
i2c4 = &i2c_4;
+ i2c2 = &i2c_2; // new charge IC: BQ25601
sdhc2 = &sdhc_2; /* SDC2 SD card slot */
};
@@ -355,7 +359,7 @@
dma_blsp1: qcom,sps-dma@7884000 { /* BLSP1 */
#dma-cells = <4>;
compatible = "qcom,sps-dma";
- reg = <0x7884000 0x2b000>;
+ reg = <0x7884000 0x23000>;
interrupts = <0 238 0>;
qcom,summing-threshold = <10>;
};
@@ -519,6 +523,59 @@
};
};
+ /* refer to doc: 80-nu767-1 (qcom) & Documentation/devicetree/bindings/i2c/i2c-msm-v2.txt (kernel) */
+ i2c_2: i2c@78b6000 { /* BLSP1 QUP1 */
+ compatible = "qcom,i2c-msm-v2";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg-names = "qup_phys_addr";
+ reg = <0x78b6000 0x1000>;
+
+ interrupt-names = "qup_irq";
+ interrupts = <0 96 0>;
+
+ dmas = <&dma_blsp1 14 32 0x20000020 0x20>,
+ <&dma_blsp1 15 64 0x20000020 0x20>;
+ dma-names = "tx", "rx";
+
+ qcom,clk-freq-out = <100000>; // 100 KHz
+ qcom,clk-freq-in = <19200000>;
+
+ clock-names = "iface_clk", "core_clk";
+ clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,
+ <&clock_gcc clk_gcc_blsp1_qup2_i2c_apps_clk>;
+
+ pinctrl-names = "i2c_active", "i2c_sleep";
+ pinctrl-0 = <&i2c_2_active>;
+ pinctrl-1 = <&i2c_2_sleep>;
+
+ qcom,noise-rjct-scl = <0>;
+ qcom,noise-rjct-sda = <0>;
+ qcom,fs-clk-div = <96>;
+ qcom,high-time-clk-div = <90>;
+ qcom,master-id = <86>;
+
+ bq25601: bq25601-charger@6b {
+ compatible = "ti,bq25601-charger";
+ reg = <0x6b>;
+
+ ti,irq-gpio = <&tlmm_pinmux 28 0>;
+ ti,chg-en-gpio = <&tlmm_pinmux 27 0>;
+ ti,chg-vbat-div = <3>;
+ qcom,chg-vadc = <&pm8019_vadc>;
+ };
+
+ sgm41513-charger@1a {
+ compatible = "ti,sgm41513-charger";
+ reg = <0x1a>;
+
+ ti,irq-gpio = <&tlmm_pinmux 28 0>;
+ ti,chg-en-gpio = <&tlmm_pinmux 27 0>;
+ ti,chg-vbat-div = <3>;
+ qcom,chg-vadc = <&pm8019_vadc>;
+ };
+ };
+
blsp1_uart3: uart@78b1000 {
compatible = "qcom,msm-hsuart-v14";
reg = <0x78b1000 0x200>,
@@ -586,7 +643,7 @@
<0x44 0x80 0x38 0x81 0x24 0x82 0x13 0x83 0xffffffff>;
qcom,hsusb-otg-phy-type = <3>; /* SNPS Femto PHY */
- qcom,hsusb-otg-mode = <3>; /* OTG mode */
+ qcom,hsusb-otg-mode = <1>; /* PERIPHERAL mode */
qcom,hsusb-otg-otg-control = <2>; /* PMIC control */
qcom,usbid-gpio = <&pm8019_mpps 1 0>;
qcom,hsusb-log2-itc = <4>;
@@ -829,6 +886,7 @@
sound-9330 {
compatible = "qcom,mdm9607-audio-tomtom";
qcom,model = "mdm9607-tomtom-i2s-snd-card";
+ status = "disabled";
qcom,audio-routing =
"RX_BIAS", "MCLK",
@@ -1202,6 +1260,12 @@
qcom,sensor-type = "adc";
qcom,sensor-name = "xo_therm_amux";
};
+
+ sensor_information9: qcom,sensor-information-9 {
+ qcom,sensor-type = "adc";
+ qcom,sensor-name = "battery";
+ qcom,scaling-factor = <100>;
+ };
};
mitigation_profile0: qcom,limit_info-0 {
@@ -1346,7 +1410,7 @@
reg = <0x4044000 0x19000>;
interrupts = <0 29 1>;
qcom,rx-ring-size = <32>;
- qcom,max-rx-mtu = <4096>;
+ qcom,max-rx-mtu = <2048>;
qcom,fast-shutdown;
};
@@ -1396,6 +1460,51 @@
status = "disabled";
};
+ spi_5: spi@78ba000 { /* BLSP1 QUP6 */
+ compatible = "qcom,spi-qup-v2";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg-names = "spi_physical", "spi_bam_physical";
+ reg = <0x78ba000 0x600>,
+ <0x7884000 0x2b000>;
+ interrupt-names = "spi_irq", "spi_bam_irq";
+ interrupts = <0 100 0>, <0 238 0>;
+ spi-max-frequency = <19200000>;
+ qcom,use-pinctrl;
+ pinctrl-names = "spi_default", "spi_sleep";
+ pinctrl-0 = <&spi5_default &spi5_cs0_active>;
+ pinctrl-1 = <&spi5_sleep &spi5_cs0_sleep>;
+ clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,
+ <&clock_gcc clk_gcc_blsp1_qup6_spi_apps_clk>;
+ clock-names = "iface_clk", "core_clk";
+ qcom,infinite-mode = <0>;
+ qcom,use-bam;
+ qcom,ver-reg-exists;
+ qcom,bam-consumer-pipe-index = <22>;
+ qcom,bam-producer-pipe-index = <23>;
+ qcom,master-id = <86>;
+ #qcom,rt-priority;
+ #status = "disabled";
+
+ qcom-spi-oled@1 {
+ compatible = "tplink,oled";
+ reg = <0>;
+ spi-max-frequency = <9600000>;
+ };
+ };
+
+ oled_s90319_pt {
+ compatible = "qcom,oled_s90319_pt";
+ qcom,oled-cs-gpio = <&tlmm_pinmux 22 0>;
+ qcom,oled-rsx-gpio = <&tlmm_pinmux 25 0>;
+ qcom,oled-reset-gpio = <&tlmm_pinmux 24 0>;
+ qcom,oled-vdd0-gpio = <&tlmm_pinmux 18 0>;
+ qcom,oled-vdd1-gpio = <&tlmm_pinmux 19 0>;
+ qcom,oled-mosi-gpio = <&tlmm_pinmux 20 0>;
+ qcom,oled-clk-gpio = <&tlmm_pinmux 23 0>;
+ qcom,oled-boost-en-gpio = <&tlmm_pinmux 4 0>;
+ };
+
qcom,mss@4080000 {
compatible = "qcom,pil-q6v55-mss";
reg = <0x04080000 0x100>,
@@ -1525,6 +1634,35 @@
phy-addr = <0>;
status = "disable";
};
+
+ /* [yangjihong start] gpio keys */
+ gpio_keys {
+ compatible = "gpio-keys";
+ //autorepeat;
+ input-name = "gpio-keys";
+ pinctrl-names = "tlmm_gpio_key_active","tlmm_gpio_key_suspend";
+ pinctrl-0 = <&gpio_key_active>;
+ pinctrl-1 = <&gpio_key_suspend>;
+
+ key-up {
+ label = "WPS";
+ gpios = <&tlmm_pinmux 29 1>;
+ linux,input-type = <1>;
+ linux,code = <103>;
+ gpio-key,wakeup;
+ debounce-interval = <15>;
+ };
+
+ key-back {
+ label = "RESET";
+ gpios = <&tlmm_pinmux 30 1>;
+ linux,input-type = <1>;
+ linux,code = <158>;
+ gpio-key,wakeup;
+ debounce-interval = <15>;
+ };
+ };
+ /* [yangjihong end] */
};
#include "mdm9607-rpm-regulator.dtsi"
@@ -1543,9 +1681,9 @@
};
};
-&usb_otg {
+/*&usb_otg {
vbus_otg-supply = <&smb358_otg_vreg>;
-};
+};*/
&pm8019_vadc {
chan@6 {
@@ -1570,6 +1708,17 @@
qcom,fast-avg-setup = <0>;
};
+ chan@11 {
+ label = "batt_voltage";
+ reg = <0x11>;
+ qcom,decimation = <0>;
+ qcom,pre-div-channel-scaling = <0>;
+ qcom,calibration-type = "ratiometric";
+ qcom,scale-function = <0>;
+ qcom,hw-settle-time = <1>;
+ qcom,fast-avg-setup = <0>;
+ };
+
chan@31 {
label = "batt_id_therm";
reg = <0x31>;
diff --git a/arch/arm/configs/mdm9607_debug_defconfig b/arch/arm/configs/mdm9607_debug_defconfig
index d385ae6..e87ef38 100644
--- a/arch/arm/configs/mdm9607_debug_defconfig
+++ b/arch/arm/configs/mdm9607_debug_defconfig
@@ -18,3 +18,20 @@ CONFIG_DEBUG_PAGEALLOC=y
CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_DYNAMIC_DEBUG=y
CONFIG_DEBUG_USER=y
+CONFIG_CORESIGHT=y
+CONFIG_CORESIGHT_EVENT=y
+CONFIG_CORESIGHT_FUSE=y
+CONFIG_CORESIGHT_CTI=y
+CONFIG_CORESIGHT_TMC=y
+CONFIG_CORESIGHT_TPIU=y
+CONFIG_CORESIGHT_FUNNEL=y
+CONFIG_CORESIGHT_REPLICATOR=y
+CONFIG_CORESIGHT_DBGUI=y
+CONFIG_CORESIGHT_STM=y
+CONFIG_CORESIGHT_HWEVENT=y
+CONFIG_CORESIGHT_ETM=y
+CONFIG_CORESIGHT_REMOTE_ETM=y
+CONFIG_CORESIGHT_QPDI=y
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+CONFIG_SUPPORT_RTL_SDIO3=y
diff --git a/arch/arm/configs/mdm9607_defconfig b/arch/arm/configs/mdm9607_defconfig
index 1e33537..2cbd806 100644
--- a/arch/arm/configs/mdm9607_defconfig
+++ b/arch/arm/configs/mdm9607_defconfig
@@ -1,21 +1,23 @@
+CONFIG_LOCALVERSION_AUTO=n
CONFIG_EARLY_IOREMAP=y
CONFIG_SYSVIPC=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
-CONFIG_CGROUPS=y
-CONFIG_CGROUP_DEBUG=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_SCHED=y
+#CONFIG_CGROUPS=y
+#CONFIG_CGROUP_DEBUG=y
+#CONFIG_CGROUP_FREEZER=y
+#CONFIG_CGROUP_CPUACCT=y
+#CONFIG_RESOURCE_COUNTERS=y
+#CONFIG_CGROUP_SCHED=y
# CONFIG_FAIR_GROUP_SCHED is not set
-CONFIG_RT_GROUP_SCHED=y
+#CONFIG_RT_GROUP_SCHED=y
CONFIG_NAMESPACES=y
# CONFIG_UTS_NS is not set
# CONFIG_IPC_NS is not set
# CONFIG_PID_NS is not set
+CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_RD_BZIP2=y
CONFIG_RD_LZMA=y
@@ -43,6 +45,7 @@ CONFIG_NEON=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_PM_AUTOSLEEP=y
CONFIG_PM_RUNTIME=y
+CONFIG_PM_WAKELOCKS=y
CONFIG_NET=y
CONFIG_DISABLE_NET_SKB_FRAG_CACHE=y
CONFIG_PACKET=y
@@ -61,7 +64,6 @@ CONFIG_IPV6_MROUTE=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
CONFIG_IPV6_PIMSM_V2=y
CONFIG_NETFILTER=y
-CONFIG_NETFILTER_DEBUG=y
CONFIG_BRIDGE_NETFILTER=y
CONFIG_NF_CONNTRACK=y
CONFIG_NF_CONNTRACK_EVENTS=y
@@ -69,16 +71,17 @@ CONFIG_NF_CONNTRACK_TIMEOUT=y
CONFIG_NF_CONNTRACK_TIMESTAMP=y
CONFIG_NF_CT_PROTO_UDPLITE=y
CONFIG_NF_CONNTRACK_AMANDA=y
-CONFIG_NF_CONNTRACK_FTP=y
-CONFIG_NF_CONNTRACK_H323=y
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
CONFIG_NF_CONNTRACK_IRC=y
CONFIG_NF_CONNTRACK_NETBIOS_NS=y
CONFIG_NF_CONNTRACK_SNMP=y
-CONFIG_NF_CONNTRACK_PPTP=y
-CONFIG_NF_CONNTRACK_SIP=y
-CONFIG_NF_CONNTRACK_TFTP=y
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_CT_NETLINK=y
CONFIG_NF_CT_NETLINK_TIMEOUT=y
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
CONFIG_NETFILTER_XT_TARGET_LOG=y
CONFIG_NETFILTER_XT_TARGET_MARK=y
CONFIG_NETFILTER_XT_TARGET_NFLOG=y
@@ -86,6 +89,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
CONFIG_NETFILTER_XT_TARGET_NOTRACK=y
CONFIG_NETFILTER_XT_TARGET_TPROXY=y
CONFIG_NETFILTER_XT_TARGET_TRACE=y
+CONFIG_NETFILTER_XT_TARGET_TRIGGER=y
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
@@ -147,12 +151,11 @@ CONFIG_NET_SCHED=y
CONFIG_NET_SCH_PRIO=y
CONFIG_RMNET_DATA=y
CONFIG_RMNET_DATA_FC=y
-CONFIG_RMNET_DATA_DEBUG_PKT=y
-CONFIG_BT=y
-CONFIG_BT_HCIUART=y
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_IBS=y
-CONFIG_MSM_BT_POWER=y
+#CONFIG_BT=y
+#CONFIG_BT_HCIUART=y
+#CONFIG_BT_HCIUART_H4=y
+#CONFIG_BT_HCIUART_IBS=y
+#CONFIG_MSM_BT_POWER=y
CONFIG_CFG80211=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_INTERNAL_REGDB=y
@@ -161,7 +164,7 @@ CONFIG_RFKILL=y
CONFIG_IPC_ROUTER=y
CONFIG_IPC_ROUTER_SECURITY=y
CONFIG_DMA_CMA=y
-CONFIG_CMA_SIZE_MBYTES=4
+CONFIG_CMA_SIZE_MBYTES=8
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_BLOCK=y
@@ -169,13 +172,13 @@ CONFIG_MTD_MSM_QPIC_NAND=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_SCH=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI=n
+CONFIG_BLK_DEV_SD=n
+CONFIG_CHR_DEV_SG=n
+CONFIG_CHR_DEV_SCH=n
+CONFIG_SCSI_CONSTANTS=n
+CONFIG_SCSI_LOGGING=n
+CONFIG_SCSI_SCAN_ASYNC=n
CONFIG_NETDEVICES=y
# CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_CIRRUS is not set
@@ -183,8 +186,8 @@ CONFIG_NETDEVICES=y
# CONFIG_NET_VENDOR_INTEL is not set
CONFIG_KS8851=y
# CONFIG_NET_VENDOR_MICROCHIP is not set
-CONFIG_ECM_IPA=y
-CONFIG_RNDIS_IPA=y
+CONFIG_ECM_IPA=n
+CONFIG_RNDIS_IPA=n
CONFIG_MSM_RMNET_BAM=y
# CONFIG_NET_VENDOR_NATSEMI is not set
CONFIG_QCOM_EMAC=m
@@ -199,7 +202,9 @@ CONFIG_CNSS_SDIO=y
CONFIG_CLD_HL_SDIO_CORE=y
# CONFIG_INPUT_MOUSEDEV is not set
CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_OF=y
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=y
@@ -208,7 +213,6 @@ CONFIG_SERIO_LIBPS2=y
# CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_MSM_HS=y
CONFIG_SERIAL_MSM_HSL=y
-CONFIG_SERIAL_MSM_HSL_CONSOLE=y
CONFIG_SERIAL_MSM_SMD=y
CONFIG_DIAG_CHAR=y
CONFIG_HW_RANDOM=y
@@ -224,8 +228,10 @@ CONFIG_DEBUG_GPIO=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_QPNP_PIN=y
CONFIG_POWER_SUPPLY=y
-CONFIG_SMB1351_USB_CHARGER=y
-CONFIG_SMB358_CHARGER=y
+CONFIG_SMB1351_USB_CHARGER=n
+CONFIG_SMB358_CHARGER=n
+CONFIG_MP2617_CHARGER=n
+CONFIG_BQ25601_CHARGER=y
CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_MSM=y
CONFIG_MSM_DLOAD_MODE=y
@@ -234,37 +240,37 @@ CONFIG_THERMAL=y
CONFIG_THERMAL_TSENS8974=y
CONFIG_THERMAL_MONITOR=y
CONFIG_THERMAL_QPNP_ADC_TM=y
-CONFIG_WCD9306_CODEC=y
-CONFIG_WCD9330_CODEC=y
+#CONFIG_WCD9306_CODEC=y
+#CONFIG_WCD9330_CODEC=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_STUB=y
CONFIG_REGULATOR_MEM_ACC=y
CONFIG_REGULATOR_SPM=y
CONFIG_REGULATOR_CPR=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SOC=y
-CONFIG_SND_SOC_MDM9607=y
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MSM=y
-CONFIG_USB_EHCI_MSM_HSIC=y
-CONFIG_USB_ACM=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_STORAGE_DEBUG=y
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_ONETOUCH=y
-CONFIG_USB_STORAGE_KARMA=y
-CONFIG_USB_STORAGE_CYPRESS_ATACB=y
+CONFIG_SOUND=n
+CONFIG_SND=n
+CONFIG_SND_SOC=n
+#CONFIG_SND_SOC_MDM9607=y
+CONFIG_USB=n
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=n
+CONFIG_USB_XHCI_HCD=n
+CONFIG_USB_EHCI_HCD=n
+CONFIG_USB_EHCI_MSM=n
+CONFIG_USB_EHCI_MSM_HSIC=n
+CONFIG_USB_ACM=n
+CONFIG_USB_STORAGE=n
+CONFIG_USB_STORAGE_DEBUG=n
+CONFIG_USB_STORAGE_DATAFAB=n
+CONFIG_USB_STORAGE_FREECOM=n
+CONFIG_USB_STORAGE_ISD200=n
+CONFIG_USB_STORAGE_USBAT=n
+CONFIG_USB_STORAGE_SDDR09=n
+CONFIG_USB_STORAGE_SDDR55=n
+CONFIG_USB_STORAGE_JUMPSHOT=n
+CONFIG_USB_STORAGE_ALAUDA=n
+CONFIG_USB_STORAGE_ONETOUCH=n
+CONFIG_USB_STORAGE_KARMA=n
+CONFIG_USB_STORAGE_CYPRESS_ATACB=n
CONFIG_USB_EHSET_TEST_FIXTURE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DEBUG_FILES=y
@@ -274,7 +280,6 @@ CONFIG_USB_CI13XXX_MSM=y
CONFIG_USB_CI13XXX_MSM_HSIC=y
CONFIG_USB_G_ANDROID=y
CONFIG_MMC=y
-CONFIG_MMC_PERF_PROFILING=y
CONFIG_MMC_CLKGATE=y
CONFIG_MMC_PARANOID_SD_INIT=y
CONFIG_MMC_BLOCK_MINORS=32
@@ -299,16 +304,15 @@ CONFIG_QPNP_REVID=y
CONFIG_SPS=y
CONFIG_USB_BAM=y
CONFIG_SPS_SUPPORT_NDP_BAM=y
-CONFIG_IPA=y
-CONFIG_IPA3=y
-CONFIG_GSI=y
+CONFIG_IPA=n
+CONFIG_IPA3=n
+CONFIG_GSI=n
CONFIG_MSM_SPMI=y
CONFIG_MSM_SPMI_PMIC_ARB=y
CONFIG_MSM_QPNP_INT=y
-CONFIG_MSM_ADSP_LOADER=y
+#CONFIG_MSM_ADSP_LOADER=y
CONFIG_MSM_MEMORY_DUMP_V2=y
CONFIG_MSM_BOOT_STATS=y
-CONFIG_MSM_COMMON_LOG=y
CONFIG_MSM_WATCHDOG_V2=y
CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG=y
CONFIG_MSM_RPM_LOG=y
@@ -332,20 +336,20 @@ CONFIG_MSM_PIL_MSS_QDSP6V5=y
CONFIG_TRACER_PKT=y
CONFIG_MSM_BAM_DMUX=y
CONFIG_REMOTE_SPINLOCK_MSM=y
-CONFIG_CORESIGHT=y
-CONFIG_CORESIGHT_EVENT=y
-CONFIG_CORESIGHT_FUSE=y
-CONFIG_CORESIGHT_CTI=y
-CONFIG_CORESIGHT_TMC=y
-CONFIG_CORESIGHT_TPIU=y
-CONFIG_CORESIGHT_FUNNEL=y
-CONFIG_CORESIGHT_REPLICATOR=y
-CONFIG_CORESIGHT_DBGUI=y
-CONFIG_CORESIGHT_STM=y
-CONFIG_CORESIGHT_HWEVENT=y
-CONFIG_CORESIGHT_ETM=y
-CONFIG_CORESIGHT_REMOTE_ETM=y
-CONFIG_CORESIGHT_QPDI=y
+# CONFIG_CORESIGHT=y is not set
+# CONFIG_CORESIGHT_EVENT=y is not set
+# CONFIG_CORESIGHT_FUSE=y is not set
+# CONFIG_CORESIGHT_CTI=y is not set
+# CONFIG_CORESIGHT_TMC=y is not set
+# CONFIG_CORESIGHT_TPIU=y is not set
+# CONFIG_CORESIGHT_FUNNEL=y is not set
+# CONFIG_CORESIGHT_REPLICATOR=y is not set
+# CONFIG_CORESIGHT_DBGUI=y is not set
+# CONFIG_CORESIGHT_STM=y is not set
+# CONFIG_CORESIGHT_HWEVENT=y is not set
+# CONFIG_CORESIGHT_ETM=y is not set
+# CONFIG_CORESIGHT_REMOTE_ETM=y is not set
+# CONFIG_CORESIGHT_QPDI=y is not set
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
CONFIG_UBIFS_FS=y
@@ -354,27 +358,52 @@ CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ASCII=y
CONFIG_NLS_ISO8859_1=y
CONFIG_PRINTK_TIME=y
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DEBUG_INFO=y
CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_PAGEALLOC=y
-CONFIG_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
-CONFIG_DEBUG_STACK_USAGE=y
-CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_PANIC_TIMEOUT=5
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_ATOMIC_SLEEP=y
-CONFIG_DEBUG_LIST=y
-CONFIG_FAULT_INJECTION=y
-CONFIG_FAIL_PAGE_ALLOC=y
-CONFIG_FAULT_INJECTION_DEBUG_FS=y
-CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
-CONFIG_MSM_RTB=y
+# CONFIG_SCHEDSTATS=y is not set
+# CONFIG_TIMER_STATS=y is not set
+#CONFIG_FAULT_INJECTION=y
+#CONFIG_FAIL_PAGE_ALLOC=y
CONFIG_IPC_LOGGING=y
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_DEBUG_USER=y
CONFIG_QMI_ENCDEC=y
+CONFIG_ANDROID_LOGGER=y
+CONFIG_FUSE_FS=y
+#[liaoxingwei] about oled driver
+CONFIG_FB=y
+CONFIG_OLED=y
+CONFIG_OLED_S90319_PT=y
+#[ligai add] for alg
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=m
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_PPPOL2TP=m
+CONFIG_NAT_SIP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_PANIC_ON_RECURSIVE_FAULT=y
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_WATCHDOG_NOWAYOUT=n
+CONFIG_SOFT_WATCHDOG=y
+CONFIG_SUPPORT_RTL_SDIO3=y
+#[wuchao add] modify pkt_threshold for rtl wifi
+CONFIG_TP_FEATURE_RTL8192ES=y
+#[zhangguosong add start]
+CONFIG_NET_SCH_HTB=y
+CONFIG_NET_SCH_SFQ=y
+CONFIG_NET_SCH_FIFO=y
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_FW=y
+CONFIG_NET_CLS_U32=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_MIRRED=y
+CONFIG_BRIDGE_EBT_MARK=y
+CONFIG_BRIDGE_EBT_VLAN=y
+CONFIG_BRIDGE_EBT_FTOS=y
+CONFIG_BRIDGE_EBT_MARK_T=y
+CONFIG_IFB=y
+#[zhangguosong add end]
Reference in New Issue View Git Blame Copy Permalink