aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/qcom/mdm9607.dtsi117
-rw-r--r--arch/arm/boot/dts/qcom/mdm9640-pinctrl.dtsi23
-rw-r--r--arch/arm/boot/dts/qcom/mdm9640.dtsi27
-rw-r--r--arch/arm/boot/dts/qcom/msm-pmi8950.dtsi2
-rw-r--r--arch/arm/boot/dts/qcom/msm-pmi8994.dtsi2
-rw-r--r--arch/arm/configs/mdm9607-perf_defconfig1
-rw-r--r--arch/arm/configs/mdm9607_defconfig1
-rw-r--r--arch/arm/configs/mdm9640-perf_defconfig7
-rw-r--r--arch/arm/configs/mdm9640_defconfig7
9 files changed, 159 insertions, 28 deletions
diff --git a/arch/arm/boot/dts/qcom/mdm9607.dtsi b/arch/arm/boot/dts/qcom/mdm9607.dtsi
index 1588dcb74a83..1dfd1464f731 100644
--- a/arch/arm/boot/dts/qcom/mdm9607.dtsi
+++ b/arch/arm/boot/dts/qcom/mdm9607.dtsi
@@ -385,7 +385,7 @@
dma-names = "tx", "rx";
status = "disabled";
- wcd9xxx_codec@0d{
+ wcd9xxx_tomtom_codec@0d{
compatible = "qcom,wcd9xxx-i2c";
reg = <0x0d>;
@@ -448,6 +448,61 @@
qcom,cdc-variant = "WCD9330";
};
+ wcd9xxx_tapan_codec@0d{
+ compatible = "qcom,wcd9xxx-i2c";
+ reg = <0x0d>;
+
+ status = "disabled";
+ qcom,cdc-reset-gpio = <&tlmm_pinmux 26 0>;
+ pinctrl-names = "default", "idle";
+ pinctrl-0 = <&codec_reset_active>;
+ pinctrl-1 = <&codec_reset_sleep>;
+
+ qcom,cdc-micbias1-ext-cap;
+
+ interrupt-parent = <&wcd9xxx_intc>;
+ interrupts = <0 1 2 3 4 5 6>, <7 8 9 10 11 12 13>,
+ <14 15 16 17 18 19 20>,
+ <21 22 23 24 25 26 27 28>;
+ cdc-vdd-buck-supply = <&mdm9607_s4>;
+ qcom,cdc-vdd-buck-voltage = <1950000 1950000>;
+ qcom,cdc-vdd-buck-current = <25000>;
+
+ cdc-vdd-tx-h-supply = <&mdm9607_l11>;
+ qcom,cdc-vdd-tx-h-voltage = <1800000 1800000>;
+ qcom,cdc-vdd-tx-h-current = <25000>;
+
+ cdc-vdd-rx-h-supply = <&mdm9607_l11>;
+ qcom,cdc-vdd-rx-h-voltage = <1800000 1800000>;
+ qcom,cdc-vdd-rx-h-current = <25000>;
+
+ cdc-vddpx-1-supply = <&mdm9607_l11>;
+ qcom,cdc-vddpx-1-voltage = <1800000 1800000>;
+ qcom,cdc-vddpx-1-current = <10000>;
+
+ cdc-vdd-cx-supply = <&mdm9607_l9>;
+ qcom,cdc-vdd-cx-voltage = <1225000 1225000>;
+ qcom,cdc-vdd-cx-current = <10000>;
+
+ qcom,cdc-static-supplies = "cdc-vdd-buck",
+ "cdc-vdd-tx-h",
+ "cdc-vdd-rx-h",
+ "cdc-vddpx-1",
+ "cdc-vdd-cx";
+
+ qcom,cdc-micbias-ldoh-v = <0x3>;
+ qcom,cdc-micbias-cfilt1-mv = <1800>;
+ qcom,cdc-micbias-cfilt2-mv = <2700>;
+ qcom,cdc-micbias-cfilt3-mv = <1800>;
+ qcom,cdc-micbias1-cfilt-sel = <0x0>;
+ qcom,cdc-micbias2-cfilt-sel = <0x1>;
+ qcom,cdc-micbias3-cfilt-sel = <0x2>;
+ qcom,cdc-micbias4-cfilt-sel = <0x2>;
+ qcom,cdc-mclk-clk-rate = <12288000>;
+ qcom,cdc-dmic-sample-rate = <4800000>;
+ qcom,cdc-variant = "WCD9306";
+ };
+
wcd9xxx_codec@77{
compatible = "qcom,wcd9xxx-i2c";
reg = <0x77>;
@@ -773,7 +828,7 @@
interrupt-names = "cdc-int";
};
- sound {
+ sound-9330 {
compatible = "qcom,mdm9607-audio-tomtom";
qcom,model = "mdm9607-tomtom-i2s-snd-card";
@@ -795,7 +850,63 @@
"DMIC3", "MIC BIAS3 External",
"MIC BIAS3 External", "Digital Mic3";
- qcom,tomtom-mclk-clk-freq = <12288000>;
+ qcom,codec-mclk-clk-freq = <12288000>;
+ qcom,mi2s-interface-mode = "pri_mi2s_master", "sec_mi2s_master";
+ qcom,auxpcm-interface-mode = "pri_pcm_master", "sec_pcm_master";
+ asoc-platform = <&pcm0>, <&pcm1>, <&voip>, <&voice>,
+ <&loopback>, <&hostless>, <&afe>, <&routing>,
+ <&pcm_dtmf>, <&host_pcm>;
+ asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",
+ "msm-voip-dsp", "msm-pcm-voice",
+ "msm-pcm-loopback", "msm-pcm-hostless",
+ "msm-pcm-afe", "msm-pcm-routing",
+ "msm-pcm-dtmf", "msm-voice-host-pcm";
+ asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>,
+ <&mi2s_prim>, <&mi2s_sec>, <&dtmf_tx>,
+ <&rx_capture_tx>, <&rx_playback_rx>,
+ <&tx_capture_tx>, <&tx_playback_rx>,
+ <&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
+ <&afe_proxy_tx>, <&incall_record_rx>,
+ <&incall_record_tx>, <&incall_music_rx>;
+ asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",
+ "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
+ "msm-dai-stub-dev.4", "msm-dai-stub-dev.5",
+ "msm-dai-stub-dev.6", "msm-dai-stub-dev.7",
+ "msm-dai-stub-dev.8", "msm-dai-q6-dev.224",
+ "msm-dai-q6-dev.225", "msm-dai-q6-dev.241",
+ "msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",
+ "msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773";
+ asoc-codec = <&stub_codec>;
+ asoc-codec-names = "msm-stub-codec.1";
+ };
+
+ sound-9306 {
+ compatible = "qcom,mdm9607-audio-tapan";
+ qcom,model = "mdm9607-tapan-i2s-snd-card";
+ status = "disabled";
+
+ qcom,audio-routing =
+ "RX_BIAS", "MCLK",
+ "LDO_H", "MCLK",
+ "SPK_OUT", "MCLK",
+ "AMIC1", "MIC BIAS1 External",
+ "MIC BIAS1 External", "Handset Mic",
+ "AMIC2", "MIC BIAS2 External",
+ "MIC BIAS2 External", "Headset Mic",
+ "AMIC4", "MIC BIAS2 External",
+ "MIC BIAS2 External", "ANCRight Headset Mic",
+ "AMIC5", "MIC BIAS2 External",
+ "MIC BIAS2 External", "ANCLeft Headset Mic",
+ "DMIC1", "MIC BIAS1 External",
+ "MIC BIAS1 External", "Digital Mic1",
+ "DMIC2", "MIC BIAS1 External",
+ "MIC BIAS1 External", "Digital Mic2",
+ "DMIC3", "MIC BIAS3 External",
+ "MIC BIAS3 External", "Digital Mic3",
+ "DMIC4", "MIC BIAS3 External",
+ "MIC BIAS3 External", "Digital Mic4";
+
+ qcom,codec-mclk-clk-freq = <12288000>;
qcom,mi2s-interface-mode = "pri_mi2s_master", "sec_mi2s_master";
qcom,auxpcm-interface-mode = "pri_pcm_master", "sec_pcm_master";
asoc-platform = <&pcm0>, <&pcm1>, <&voip>, <&voice>,
diff --git a/arch/arm/boot/dts/qcom/mdm9640-pinctrl.dtsi b/arch/arm/boot/dts/qcom/mdm9640-pinctrl.dtsi
index ef2e30698b25..d65fb8d51f2c 100644
--- a/arch/arm/boot/dts/qcom/mdm9640-pinctrl.dtsi
+++ b/arch/arm/boot/dts/qcom/mdm9640-pinctrl.dtsi
@@ -1368,17 +1368,20 @@
};
/* cnss_pmux */
- cnss_pmux:cnss_pmux {
- mux {
- pins = "gpio95";
- function = "gpio";
- };
+ cnss_pmux {
+ cnss_default: default {
+ mux {
+ pins = "gpio95";
+ function = "gpio";
+ };
- config {
- pins = "gpio95";
- function = "gpio";
- drive-strength = <10>;
- bias-disable;
+ config {
+ pins = "gpio95";
+ function = "gpio";
+ drive-strength = <16>;
+ output-high;
+ bias-pull-up;
+ };
};
};
};
diff --git a/arch/arm/boot/dts/qcom/mdm9640.dtsi b/arch/arm/boot/dts/qcom/mdm9640.dtsi
index 31628a81bf85..fb4e90996b4a 100644
--- a/arch/arm/boot/dts/qcom/mdm9640.dtsi
+++ b/arch/arm/boot/dts/qcom/mdm9640.dtsi
@@ -848,6 +848,28 @@
};
};
+ qcom,cnss {
+ compatible = "qcom,cnss";
+ wlan-en-gpio = <&tlmm_pinmux 95 0>;
+ vdd-wlan-supply = <&wlan_vreg>;
+ vdd-wlan-io-supply = <&pmd9635_l6>;
+ vdd-wlan-sp2t-supply = <&pmd9635_l12>;
+ qcom,notify-modem-status;
+ pinctrl-names = "default";
+ pinctrl-0 = <&cnss_default>;
+ qcom,wlan-rc-num = <0>;
+ qcom,wlan-ramdump-dynamic = <0x200000>;
+
+ qcom,msm-bus,name = "msm-cnss";
+ qcom,msm-bus,num-cases = <4>;
+ qcom,msm-bus,num-paths = <1>;
+ qcom,msm-bus,vectors-KBps =
+ <45 512 0 0>, /* No vote */
+ <45 512 42252 655360>, /* Upto 200 Mbps */
+ <45 512 98572 655360>, /* Upto 400 Mbps */
+ <45 512 211212 1146880>; /* Upto 800 Mbps */
+ };
+
qcom,msm-thermal {
compatible = "qcom,msm-thermal";
qcom,sensor-id = <0>;
@@ -1530,9 +1552,10 @@
<&clock_gcc clk_gcc_mss_cfg_ahb_clk>,
<&clock_gcc clk_gcc_mss_q6_bimc_axi_clk>,
<&clock_gcc clk_gcc_boot_rom_ahb_clk>,
- <&clock_gcc clk_gpll0_out_msscc>;
+ <&clock_gcc clk_gpll0_out_msscc>,
+ <&clock_gcc clk_qpic_clk>;
clock-names = "xo", "iface_clk", "bus_clk", "mem_clk",
- "gpll0_mss_clk";
+ "gpll0_mss_clk", "qpic";
qcom,proxy-clock-names = "xo";
qcom,active-clock-names = "iface_clk", "bus_clk", "mem_clk",
"gpll0_mss_clk";
diff --git a/arch/arm/boot/dts/qcom/msm-pmi8950.dtsi b/arch/arm/boot/dts/qcom/msm-pmi8950.dtsi
index b58bb840e745..2aea4f435981 100644
--- a/arch/arm/boot/dts/qcom/msm-pmi8950.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-pmi8950.dtsi
@@ -496,7 +496,7 @@
qcom,qpnp-lab-ps-enable;
qcom,qpnp-lab-nfet-size = <100>;
qcom,qpnp-lab-pfet-size = <100>;
- qcom,qpnp-lab-max-precharge-time = <300>;
+ qcom,qpnp-lab-max-precharge-time = <500>;
};
};
diff --git a/arch/arm/boot/dts/qcom/msm-pmi8994.dtsi b/arch/arm/boot/dts/qcom/msm-pmi8994.dtsi
index 8df09ef82c9d..4c9d98029f7a 100644
--- a/arch/arm/boot/dts/qcom/msm-pmi8994.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-pmi8994.dtsi
@@ -514,7 +514,7 @@
qcom,qpnp-lab-ps-enable;
qcom,qpnp-lab-nfet-size = <100>;
qcom,qpnp-lab-pfet-size = <100>;
- qcom,qpnp-lab-max-precharge-time = <300>;
+ qcom,qpnp-lab-max-precharge-time = <500>;
};
};
diff --git a/arch/arm/configs/mdm9607-perf_defconfig b/arch/arm/configs/mdm9607-perf_defconfig
index e133197ce878..d0d611647f74 100644
--- a/arch/arm/configs/mdm9607-perf_defconfig
+++ b/arch/arm/configs/mdm9607-perf_defconfig
@@ -234,6 +234,7 @@ 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_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_STUB=y
diff --git a/arch/arm/configs/mdm9607_defconfig b/arch/arm/configs/mdm9607_defconfig
index bbb26edf7f18..507fc67d15b1 100644
--- a/arch/arm/configs/mdm9607_defconfig
+++ b/arch/arm/configs/mdm9607_defconfig
@@ -236,6 +236,7 @@ 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_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_STUB=y
diff --git a/arch/arm/configs/mdm9640-perf_defconfig b/arch/arm/configs/mdm9640-perf_defconfig
index fddd48e028ea..db946fd95cf1 100644
--- a/arch/arm/configs/mdm9640-perf_defconfig
+++ b/arch/arm/configs/mdm9640-perf_defconfig
@@ -31,7 +31,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_ARCH_MSM=y
CONFIG_ARCH_MDM9640=y
-CONFIG_ARCH_MDMCALIFORNIUM=y
CONFIG_PCI_MSM=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
@@ -209,8 +208,8 @@ CONFIG_USBNET_IPA_BRIDGE=y
CONFIG_WCNSS_MEM_PRE_ALLOC=y
CONFIG_CNSS_CRYPTO=y
CONFIG_CNSS=y
-CONFIG_CLD_HL_SDIO_CORE=y
CONFIG_CLD_LL_CORE=y
+CONFIG_BUS_AUTO_SUSPEND=y
# CONFIG_INPUT_MOUSEDEV is not set
CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_KEYBOARD is not set
@@ -234,7 +233,7 @@ CONFIG_SOUNDWIRE=y
CONFIG_SPI=y
CONFIG_SPI_QUP=y
CONFIG_SPI_SPIDEV=m
-CONFIG_PINCTRL_MDMCALIFORNIUM=y
+CONFIG_PINCTRL_MDM9640=y
CONFIG_DEBUG_GPIO=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_QPNP_PIN=y
@@ -257,7 +256,6 @@ CONFIG_REGULATOR_CPR=y
CONFIG_SOUND=y
CONFIG_SND=y
CONFIG_SND_SOC=y
-CONFIG_SND_SOC_MDMCALIFORNIUM=y
CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_XHCI_HCD=y
@@ -324,7 +322,6 @@ CONFIG_RMNET_IPA3=y
CONFIG_MSM_SPMI=y
CONFIG_MSM_SPMI_PMIC_ARB=y
CONFIG_MSM_QPNP_INT=y
-CONFIG_MSM_ADSP_LOADER=y
CONFIG_MSM_MEMORY_DUMP_V2=y
CONFIG_MSM_BOOT_STATS=y
CONFIG_MSM_COMMON_LOG=y
diff --git a/arch/arm/configs/mdm9640_defconfig b/arch/arm/configs/mdm9640_defconfig
index 1c4e44fdf5d6..fdc65d653f03 100644
--- a/arch/arm/configs/mdm9640_defconfig
+++ b/arch/arm/configs/mdm9640_defconfig
@@ -30,7 +30,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_ARCH_MSM=y
CONFIG_ARCH_MDM9640=y
-CONFIG_ARCH_MDMCALIFORNIUM=y
CONFIG_PCI_MSM=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
@@ -208,8 +207,8 @@ CONFIG_USBNET_IPA_BRIDGE=y
CONFIG_WCNSS_MEM_PRE_ALLOC=y
CONFIG_CNSS_CRYPTO=y
CONFIG_CNSS=y
-CONFIG_CLD_HL_SDIO_CORE=y
CONFIG_CLD_LL_CORE=y
+CONFIG_BUS_AUTO_SUSPEND=y
# CONFIG_INPUT_MOUSEDEV is not set
CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_KEYBOARD is not set
@@ -236,9 +235,7 @@ CONFIG_SPI_QUP=y
CONFIG_SPI_SPIDEV=m
CONFIG_PPS=y
CONFIG_PPS_CLIENT_GPIO=y
-CONFIG_PINCTRL_MDM9607=y
CONFIG_PINCTRL_MDM9640=y
-CONFIG_PINCTRL_MDMCALIFORNIUM=y
CONFIG_DEBUG_GPIO=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_QPNP_PIN=y
@@ -267,7 +264,6 @@ CONFIG_FB_MSM_QPIC_PANEL_DETECT=y
CONFIG_SOUND=y
CONFIG_SND=y
CONFIG_SND_SOC=y
-CONFIG_SND_SOC_MDMCALIFORNIUM=y
CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_XHCI_HCD=y
@@ -339,7 +335,6 @@ CONFIG_RMNET_IPA3=y
CONFIG_MSM_SPMI=y
CONFIG_MSM_SPMI_PMIC_ARB=y
CONFIG_MSM_QPNP_INT=y
-CONFIG_MSM_ADSP_LOADER=y
CONFIG_MSM_MEMORY_DUMP_V2=y
CONFIG_MSM_BOOT_STATS=y
CONFIG_MSM_COMMON_LOG=y
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 23:18:06 +0000