ARM: dts: msm: move audio devicetree node out of kernel

Move audio devicetree node out of kernel.

Change-Id: Ib73b302c12de25bab2c170d09a8553c218baa441
This commit is contained in:
Meng Wang
2021-02-05 12:22:26 +08:00
parent 083c42b765
commit 2b01ffb252
10 changed files with 7 additions and 6064 deletions

View File

@@ -1,202 +0,0 @@
Qualcomm Technologies, Inc. LPI GPIO controller driver
This DT bindings describes the GPIO controller driver
being added for supporting LPI (Low Power Island) TLMM
from QTI chipsets.
Following properties are for LPI GPIO controller device main node.
- compatible:
Usage: required
Value type: <string>
Definition: must be "qcom,lpi-pinctrl"
- reg:
Usage: required
Value type: <prop-encoded-array>
Definition: Register base of the GPIO controller and length.
- qcom,num-gpios:
Usage: required
Value type: <u32>
Definition: Number of GPIOs supported by the controller.
- qcom,lpi-offset-tbl
Usage: required
Value type: <u32-array>
Definition: Offset table of GPIOs supported by the controller.
- gpio-controller:
Usage: required
Value type: <none>
Definition: Used to mark the device node as a GPIO controller.
- #gpio-cells:
Usage: required
Value type: <u32>
Definition: Must be 2;
The first cell will be used to define gpio number and the
second denotes the flags for this gpio.
- #qcom,slew-reg:
Usage: optional
Value type: <prop-encoded-array>
Definition: Register base of the slew register and length.
- #qcom,lpi-slew-offset-tbl:
Usage: optional
Value type: <u32-array>
Definition: Offset table that points to each pin's shift value
position in bits in the slew register base for slew
settings.
- #qcom,lpi-slew-base-tbl:
Usage: optional
Value type: <u32-array>
Definition: Table points to physical address for corresponding
slew registers.
Please refer to ../gpio/gpio.txt for general description of GPIO bindings.
Please refer to pinctrl-bindings.txt in this directory for details of the
common pinctrl bindings used by client devices, including the meaning of the
phrase "pin configuration node".
The pin configuration nodes act as a container for an arbitrary number of
subnodes. Each of these subnodes represents some desired configuration for a
pin or a list of pins. This configuration can include the
mux function to select on those pin(s), and various pin configuration
parameters, as listed below.
SUBNODES:
The name of each subnode is not important; all subnodes should be enumerated
and processed purely based on their content.
Each subnode only affects those parameters that are explicitly listed. In
other words, a subnode that lists a mux function but no pin configuration
parameters implies no information about any pin configuration parameters.
Similarly, a pin subnode that describes a pullup parameter implies no
information about e.g. the mux function.
The following generic properties as defined in pinctrl-bindings.txt are valid
to specify in a pin configuration subnode:
- pins:
Usage: required
Value type: <string-array>
Definition: List of gpio pins affected by the properties specified in
this subnode. Valid pins are: gpio0-gpio31 for LPI.
- function:
Usage: required
Value type: <string>
Definition: Specify the alternative function to be configured for the
specified pins. Valid values are:
"gpio",
"func1",
"func2",
"func3",
"func4",
"func5"
- bias-disable:
Usage: optional
Value type: <none>
Definition: The specified pins should be configured as no pull.
- bias-pull-down:
Usage: optional
Value type: <none>
Definition: The specified pins should be configured as pull down.
- bias-bus-hold:
Usage: optional
Value type: <none>
Definition: The specified pins should be configured as bus-keeper mode.
- bias-pull-up:
Usage: optional
Value type: <empty>
Definition: The specified pins should be configured as pull up.
- input-enable:
Usage: optional
Value type: <none>
Definition: The specified pins are put in input mode.
- output-high:
Usage: optional
Value type: <none>
Definition: The specified pins are configured in output mode, driven
high.
- output-low:
Usage: optional
Value type: <none>
Definition: The specified pins are configured in output mode, driven
low.
- qcom,drive-strength:
Usage: optional
Value type: <u32>
Definition: Selects the drive strength for the specified pins.
- slew-rate:
Usage: optional
Value type: <u32>
Definition: Selects the slew rate for the specified pins.
Example:
lpi_tlmm: lpi_pinctrl@152c000 {
compatible = "qcom,lpi-pinctrl";
qcom,num-gpios = <32>;
reg = <0x152c000 0>;
qcom,slew-reg = <0x355a000 0x0>;
gpio-controller;
#gpio-cells = <2>;
qcom,lpi-offset-tbl = <0x00000010>, <0x00000020>,
<0x00000030>, <0x00000040>,
<0x00000050>, <0x00000060>,
<0x00000070>, <0x00000080>,
<0x00000090>, <0x00000100>,
<0x00000110>, <0x00000120>,
<0x00000130>, <0x00000140>,
<0x00000150>, <0x00000160>,
<0x00000170>, <0x00000180>,
<0x00000190>, <0x00000200>,
<0x00000210>;
qcom,lpi-slew-offset-tbl = <0x00000000>, <0x00000002>,
<0x00000004>, <0x00000008>,
<0x0000000A>, <0x0000000C>,
<0x00000000>, <0x00000000>,
<0x00000000>, <0x00000000>,
<0x00000010>, <0x00000012>,
<0x00000000>, <0x00000000>;
hph_comp_active: hph_comp_active {
mux {
pins = "gpio22";
function = "func1";
};
config {
pins = "gpio22";
output-high;
qcom,drive-strength = <8>;
};
};
hph_comp_sleep: hph_comp_sleep {
mux {
pins = "gpio22";
function = "func1";
};
config {
pins = "gpio22";
qcom,drive-strength = <2>;
slew-rate = <1>;
};
};
};

File diff suppressed because it is too large Load Diff

View File

@@ -1,741 +0,0 @@
Qualcomm Technologies, Inc. WCD audio CODEC
WSA macro in Bolero codec
Required properties:
- compatible = "qcom,wsa-macro";
- reg: Specifies the WSA macro base address for Bolero
soundwire core registers.
- clock-names : clock names defined for WSA macro
- clocks : clock handles defined for WSA macro
- qcom,default-clk-id: Default clk ID used for WSA macro
- qcom,wsa-swr-gpios: phandle for SWR data and clock GPIOs of WSA macro
- qcom,wsa-bcl-pmic-params: u8 array of PMIC ID, SID and PPID in same order
required to be configured to receive interrupts
in BCL block of WSA macro
WSA slave device as child of Bolero codec
Required properties:
- compatible = "qcom,wsa881x";
- reg: Specifies the WSA slave device base address.
- qcom,spkr-sd-n-gpio: speaker reset gpio
Optional properties:
- bolero-handle: phandle to bolero codec
Example:
&bolero {
wsa_macro: wsa-macro {
compatible = "qcom,wsa-macro";
reg = <0x0C2C0000 0x0>;
clock-names = "wsa_core_clk", "wsa_npl_clk";
clocks = <&clock_audio_wsa_1 0>,
<&clock_audio_wsa_2 0>;
qcom,wsa-swr-gpios = &wsa_swr_gpios;
qcom,wsa-bcl-pmic-params = /bits/ 8 <0x00 0x00 0x1E>;
qcom,default-clk-id = <TX_CORE_CLK>;
swr_0: wsa_swr_master {
compatible = "qcom,swr-mstr";
wsa881x_1: wsa881x@20170212 {
compatible = "qcom,wsa881x";
reg = <0x00 0x20170212>;
qcom,spkr-sd-n-gpio = <&tlmm 80 0>;
bolero-handle = <&bolero>;
};
};
};
};
VA macro in bolero codec
Required properties:
- compatible = "qcom,va-macro";
- reg: Specifies the VA macro base address for Bolero
soundwire core registers.
- clock-names : clock names defined for VA macro
- clocks : clock handles defined for VA macro
- qcom,default-clk-id: Default clk ID used for VA macro
- va-vdd-micb-supply phandle of mic bias supply's regulator device tree node
- qcom,va-vdd-micb-voltage mic bias supply's voltage level min and max in mV
- qcom,va-vdd-micb-current mic bias supply's max current in mA
- qcom,va-dmic-sample-rate Sample rate defined for DMIC connected to VA macro
Optional properties:
- qcom,va-clk-mux-select VA macro MCLK MUX selection
- qcom,va-island-mode-muxsel VA macro island mode MUX selection
This property is required if qcom,va-clk-mux-select is provided
- qcom,disable-afe-wakeup-event-listener : If enabled wakeup event listener
will not be called from VA macro.
Example:
&bolero {
va_macro: va-macro {
compatible = "qcom,va-macro";
reg = <0x0C490000 0x0>;
clock-names = "va_core_clk";
clocks = <&clock_audio_va 0>;
qcom,default-clk-id = <TX_CORE_CLK>;
va-vdd-micb-supply = <&S4A>;
qcom,va-vdd-micb-voltage = <1800000 1800000>;
qcom,va-vdd-micb-current = <11200>;
qcom,va-dmic-sample-rate = <4800000>;
qcom,va-clk-mux-select = <1>;
qcom,va-island-mode-muxsel = <0x033A0000>;
};
};
RX macro in bolero codec
Required properties:
- compatible = "qcom,rx-macro";
- reg: Specifies the Rx macro base address for Bolero
soundwire core registers.
- clock-names : clock names defined for RX macro
- clocks : clock handles defined for RX macro
- qcom,default-clk-id: Default clk ID used for RX macro
- qcom,rx-swr-gpios: phandle for SWR data and clock GPIOs of RX macro
- qcom,rx_mclk_mode_muxsel: register address for RX macro MCLK mode mux select
- qcom,rx-bcl-pmic-params: u8 array of PMIC ID, SID and PPID in same order
required to be configured to receive interrupts
in BCL block of WSA macro
Example:
&bolero {
rx_macro: rx-macro {
compatible = "qcom,rx-macro";
reg = <0x62EE0000 0x0>;
clock-names = "rx_core_clk", "rx_npl_clk";
clocks = <&clock_audio_rx_1 0>,
<&clock_audio_rx_2 0>;
qcom,rx-swr-gpios = <&rx_swr_gpios>;
qcom,rx_mclk_mode_muxsel = <0x62C25020>;
qcom,rx-bcl-pmic-params = /bits/ 8 <0x00 0x00 0x1E>;
qcom,default-clk-id = <TX_CORE_CLK>;
swr_1: rx_swr_master {
compatible = "qcom,swr-mstr";
wcd938x_rx_slave: wcd938x-rx-slave {
compatible = "qcom,wcd938x-slave";
};
};
};
};
TX macro in bolero codec
Required properties:
- compatible = "qcom,tx-macro";
- reg: Specifies the Tx macro base address for Bolero
soundwire core registers.
- clock-names : clock names defined for TX macro
- clocks : clock handles defined for TX macro
- qcom,tx-swr-gpios: phandle for SWR data and clock GPIOs of TX macro
- qcom,tx-dmic-sample-rate: Sample rate defined for DMICs connected to TX macro
Optional properties:
- compatible = "qcom,swr-mstr";
- Child of TX macro represent TX SWR master.
- qcom,swrm-hctl-reg: HW_CTL and CLK_ENABLE bits of SWR module.
Need Disable HW_CTL bit(to gate HW control)
for particular Soundwire master version as SW workaround.
Example:
&bolero {
tx_macro: tx-macro {
compatible = "qcom,tx-macro";
reg = <0x62EC0000 0x0>;
clock-names = "tx_core_clk", "tx_npl_clk";
clocks = <&clock_audio_tx_1 0>
<&clock_audio_tx_2 0>;
qcom,tx-swr-gpios = <&tx_swr_gpios>;
qcom,tx-dmic-sample-rate = <4800000>;
swr_2: tx_swr_master {
compatible = "qcom,swr-mstr";
qcom,swrm-hctl-reg = <0xa53a400>;
wcd938x_tx_slave: wcd938x-tx-slave {
compatible = "qcom,wcd938x-slave";
};
};
};
};
&bolero {
rx_macro: rx-macro {
compatible = "qcom,tx-macro";
reg = <0x62EC0000 0x0>;
clock-names = "rx_core_clk", "rx_npl_clk";
clocks = <&clock_audio_rx_1 0>
<&clock_audio_rx_2 0>;
qcom,rx-swr-gpios = <&rx_swr_gpios>;
swr_2: rx_swr_master {
compatible = "qcom,swr-mstr";
wcd937x_rx_slave: wcd937x-rx-slave {
compatible = "qcom,wcd937x-slave";
};
};
};
};
WSA macro in LPASS codec
Required properties:
- compatible = "qcom,lpass-cdc-wsa-macro";
- reg: Specifies the WSA macro base address for LPASS codec
soundwire core registers.
- clock-names : clock names defined for WSA macro
- clocks : clock handles defined for WSA macro
- qcom,default-clk-id: Default clk ID used for WSA macro
- qcom,wsa-swr-gpios: phandle for SWR data and clock GPIOs of WSA macro
- qcom,wsa-bcl-pmic-params: u8 array of PMIC ID, SID and PPID in same order
required to be configured to receive interrupts
in BCL block of WSA macro
WSA slave device as child of LPASS codec
Required properties:
- compatible = "qcom,wsa881x";
- reg: Specifies the WSA slave device base address.
- qcom,spkr-sd-n-gpio: speaker reset gpio
Optional properties:
- qcom,lpass-cdc-handle: phandle to LPASS codec
Example:
&lpass_cdc {
wsa_macro: wsa-macro {
compatible = "qcom,lpass-cdc-wsa-macro";
reg = <0x0C2C0000 0x0>;
clock-names = "wsa_core_clk", "wsa_npl_clk";
clocks = <&clock_audio_wsa_1 0>,
<&clock_audio_wsa_2 0>;
qcom,wsa-swr-gpios = &wsa_swr_gpios;
qcom,wsa-bcl-pmic-params = /bits/ 8 <0x00 0x00 0x1E>;
qcom,default-clk-id = <TX_CORE_CLK>;
swr_0: wsa_swr_master {
compatible = "qcom,swr-mstr";
wsa881x_1: wsa881x@20170212 {
compatible = "qcom,wsa881x";
reg = <0x00 0x20170212>;
qcom,spkr-sd-n-gpio = <&tlmm 80 0>;
qcom,lpass-cdc-handle = <&lpass_cdc>;
};
};
};
};
WSA2 macro in LPASS codec
Required properties:
- compatible = "qcom,lpass-cdc-wsa2-macro";
- reg: Specifies the WSA2 macro base address for LPASS codec
soundwire core registers.
- clock-names : clock names defined for WSA2 macro
- clocks : clock handles defined for WSA2 macro
- qcom,default-clk-id: Default clk ID used for WSA2 macro
- qcom,wsa-swr-gpios: phandle for SWR data and clock GPIOs of WSA2 macro
- qcom,wsa-bcl-pmic-params: u8 array of PMIC ID, SID and PPID in same order
required to be configured to receive interrupts
in BCL block of WSA2 macro
WSA2 slave device as child of LPASS codec
Required properties:
- compatible = "qcom,wsa881x";
- reg: Specifies the WSA2 slave device base address.
- qcom,spkr-sd-n-gpio: speaker reset gpio
Optional properties:
- qcom,lpass-cdc-handle: phandle to LPASS codec
Example:
&lpass_cdc {
wsa2_macro: wsa2-macro {
compatible = "qcom,lpass-cdc-wsa2-macro";
reg = <0x0C2C0000 0x0>;
qcom,wsa-swr-gpios = <&wsa2_swr_gpios>;
qcom,wsa-bcl-pmic-params = /bits/ 8 <0x00 0x03 0x48>;
qcom,default-clk-id = <TX_CORE_CLK>;
qcom,thermal-max-state = <11>;
swr_3: wsa_swr_master {
compatible = "qcom,swr-mstr";
wsa881x_1: wsa881x@20170212 {
compatible = "qcom,wsa881x";
reg = <0x00 0x20170212>;
qcom,spkr-sd-n-gpio = <&tlmm 80 0>;
qcom,lpass-cdc-handle = <&lpass_cdc>;
};
};
};
};
VA macro in LPASS codec
Required properties:
- compatible = "qcom,lpass-cdc-va-macro";
- reg: Specifies the VA macro base address for LPASS
soundwire core registers.
- clock-names : clock names defined for VA macro
- clocks : clock handles defined for VA macro
- qcom,default-clk-id: Default clk ID used for VA macro
- qcom,va-dmic-sample-rate Sample rate defined for DMIC connected to VA macro
- qcom,va-swr-gpios: phandle for SWR data and clock GPIOs of VA macro
Optional properties:
- compatible = "qcom,swr-mstr";
- Child of VA macro represent VA SWR master.
- qcom,va-clk-mux-select VA macro MCLK MUX selection
- qcom,va-island-mode-muxsel VA macro island mode MUX selection
This property is required if qcom,va-clk-mux-select is provided
Example:
&lpass_cdc {
va_macro: va-macro {
compatible = "qcom,lpass-cdc-va-macro";
reg = <0x0C490000 0x0>;
clock-names = "va_core_clk";
clocks = <&clock_audio_va 0>;
qcom,default-clk-id = <TX_CORE_CLK>;
va-vdd-micb-supply = <&S4A>;
qcom,va-vdd-micb-voltage = <1800000 1800000>;
qcom,va-vdd-micb-current = <11200>;
qcom,va-dmic-sample-rate = <4800000>;
qcom,va-clk-mux-select = <1>;
qcom,va-island-mode-muxsel = <0x033A0000>;
qcom,is-used-swr-gpio = <1>;
qcom,va-swr-gpios = <&va_swr_gpios>;
swr_2: tx_swr_master {
compatible = "qcom,swr-mstr";
wcd938x_tx_slave: wcd938x-tx-slave {
compatible = "qcom,wcd938x-slave";
};
};
};
};
RX macro in LPASS codec
Required properties:
- compatible = "qcom,lpass-cdc-rx-macro";
- reg: Specifies the Rx macro base address for LPASS
soundwire core registers.
- clock-names : clock names defined for RX macro
- clocks : clock handles defined for RX macro
- qcom,default-clk-id: Default clk ID used for RX macro
- qcom,rx-swr-gpios: phandle for SWR data and clock GPIOs of RX macro
- qcom,rx_mclk_mode_muxsel: register address for RX macro MCLK mode mux select
- qcom,rx-bcl-pmic-params: u8 array of PMIC ID, SID and PPID in same order
required to be configured to receive interrupts
in BCL block of WSA macro
Example:
&lpass_cdc {
rx_macro: rx-macro {
compatible = "qcom,lpass-cdc-rx-macro";
reg = <0x62EE0000 0x0>;
clock-names = "rx_core_clk", "rx_npl_clk";
clocks = <&clock_audio_rx_1 0>,
<&clock_audio_rx_2 0>;
qcom,rx-swr-gpios = <&rx_swr_gpios>;
qcom,rx_mclk_mode_muxsel = <0x62C25020>;
qcom,rx-bcl-pmic-params = /bits/ 8 <0x00 0x00 0x1E>;
qcom,default-clk-id = <TX_CORE_CLK>;
swr_1: rx_swr_master {
compatible = "qcom,swr-mstr";
wcd938x_rx_slave: wcd938x-rx-slave {
compatible = "qcom,wcd938x-slave";
};
};
};
};
TX macro in LPASS codec
Required properties:
- compatible = "qcom,lpass-cdc-tx-macro";
- reg: Specifies the Tx macro base address for LPASS
soundwire core registers.
- clock-names : clock names defined for TX macro
- clocks : clock handles defined for TX macro
- qcom,tx-dmic-sample-rate: Sample rate defined for DMICs connected to TX macro
Example:
&lpass_cdc {
tx_macro: tx-macro {
compatible = "qcom,lpass-cdc-tx-macro";
reg = <0x62EC0000 0x0>;
clock-names = "tx_core_clk", "tx_npl_clk";
clocks = <&clock_audio_tx_1 0>
<&clock_audio_tx_2 0>;
qcom,tx-dmic-sample-rate = <4800000>;
};
};
Tanggu Codec
Required properties:
- compatible: "qcom,wcd937x-codec";
- qcom,rx_swr_ch_map: mapping of swr rx slave port configuration to port_type and also
corresponding master port type it need to attach.
format: <port_id, slave_port_type, ch_mask, ch_rate, master_port_type>
same port_id configurations have to be grouped, and in ascending order.
- qcom,tx_swr_ch_map: mapping of swr tx slave port configuration to port_type and also
corresponding master port type it need to attach.
format: <port_id,slave_port_type, ch_mask, ch_rate, master_port_type>
same port_id configurations have to be grouped, and in ascending order.
- qcom,wcd-rst-gpio-node: Phandle reference to the DT node having codec reset gpio
configuration. If this property is not defined, it is
expected to atleast define "qcom,cdc-reset-gpio" property.
- qcom,rx-slave: phandle reference of Soundwire Rx slave device.
- qcom,tx-slave: phandle reference of Soundwire Tx slave device.
Optional properties:
- cdc-vdd-rxtx-supply: phandle of rxtx supply's regulator device tree node.
- qcom,cdc-vdd-rxtx-voltage: rxtx supply's voltage level min and max in mV.
- qcom,cdc-vdd-rxtx-current: rxtx supply's max current in mA.
- cdc-vddio-supply: phandle of io supply's regulator device tree node.
- qcom,cdc-vddio-voltage: io supply's voltage level min and max in mV.
- qcom,cdc-vddio-current: io supply's max current in mA.
- cdc-vdd-buck-supply: phandle of buck supply's regulator device tree node.
- qcom,cdc-vdd-buck-voltage: buck supply's voltage level min and max in mV.
- qcom,cdc-vdd-buck-current: buck supply's max current in mA.
- cdc-vdd-mic-bias-supply: phandle of mic bias supply's regulator device tree node.
- qcom,cdc-vdd-mic-bias-voltage: mic bias supply's voltage level min and max in mV.
- qcom,cdc-vdd-mic-bias-current: mic bias supply's max current in mA.
- qcom,cdc-static-supplies: List of supplies to be enabled prior to codec
hardware probe. Supplies in this list will be
stay enabled.
- qcom,cdc-on-demand-supplies: List of supplies which can be enabled
dynamically.
Supplies in this list are off by default.
Example:
wcd937x_codec: wcd937x-codec {
compatible = "qcom,wcd937x-codec";
qcom,rx_swr_ch_map = <0 HPH_L 0x1 0 HPH_L>,
<0 HPH_R 0x2 0 HPH_R>, <1 CLSH 0x3 0 CLSH>,
<2 COMP_L 0x1 0 COMP_L>, <2 COMP_R 0x2 0 COMP_R>,
<3 LO 0x1 0 LO>, <4 DSD_L 0x1 0 DSD_L>,
<4 DSD_R 0x2 0 DSD_R>;
qcom,tx_swr_ch_map = <0 ADC1 0x1 0 ADC1>,
<1 ADC2 0x1 0 ADC3>, <1 ADC3 0x2 0 ADC4>,
<2 DMIC0 0x1 0 DMIC0>, <2 DMIC1 0x2 0 DMIC1>,
<2 MBHC 0x4 0 DMIC2>, <3 DMIC2 0x1 0 DMIC4>,
<3 DMIC3 0x2 0 DMIC5>, <3 DMIC4 0x4 0 DMIC6>,
<3 DMIC5 0x8 0 DMIC7>;
qcom,wcd-rst-gpio-node = <&wcd937x_rst_gpio>;
qcom,rx-slave = <&wcd937x_rx_slave>;
qcom,tx-slave = <&wcd937x_tx_slave>;
cdc-vdd-buck-supply = <&S4A>;
qcom,cdc-vdd-buck-voltage = <1800000 1800000>;
qcom,cdc-vdd-buck-current = <650000>;
cdc-vdd-rxtx-supply = <&S4A>;
qcom,cdc-vdd-rxtx-voltage = <1800000 1800000>;
qcom,cdc-vdd-rxtx-current = <30000>;
cdc-vddio-supply = <&S4A>;
qcom,cdc-vddio-voltage = <1800000 1800000>;
qcom,cdc-vddio-current = <30000>;
cdc-vdd-mic-bias-supply = <&BOB>;
qcom,cdc-vdd-mic-bias-voltage = <3296000 3296000>;
qcom,cdc-vdd-mic-bias-current = <30000>;
qcom,cdc-static-supplies = "cdc-vdd-rxtx",
"cdc-vddio";
qcom,cdc-on-demand-supplies = "cdc-vdd-buck",
"cdc-vdd-mic-bias";
};
Traverso Codec
Required properties:
- compatible: "qcom,wcd938x-codec";
- qcom,rx_swr_ch_map: mapping of swr rx slave port configuration to port_type and also
corresponding master port type it need to attach.
format: <port_id, slave_port_type, ch_mask, ch_rate, master_port_type>
same port_id configurations have to be grouped, and in ascending order.
- qcom,tx_swr_ch_map: mapping of swr tx slave port configuration to port_type and also
corresponding master port type it need to attach.
format: <port_id,slave_port_type, ch_mask, ch_rate, master_port_type>
same port_id configurations have to be grouped, and in ascending order.
- qcom,wcd-rst-gpio-node: Phandle reference to the DT node having codec reset gpio
configuration. If this property is not defined, it is
expected to atleast define "qcom,cdc-reset-gpio" property.
- qcom,rx-slave: phandle reference of Soundwire Rx slave device.
- qcom,tx-slave: phandle reference of Soundwire Tx slave device.
Optional properties:
- cdc-vdd-rxtx-supply: phandle of rxtx supply's regulator device tree node.
- qcom,cdc-vdd-rxtx-voltage: rxtx supply's voltage level min and max in mV.
- qcom,cdc-vdd-rxtx-current: rxtx supply's max current in mA.
- cdc-vddio-supply: phandle of io supply's regulator device tree node.
- qcom,cdc-vddio-voltage: io supply's voltage level min and max in mV.
- qcom,cdc-vddio-current: io supply's max current in mA.
- cdc-vdd-buck-supply: phandle of buck supply's regulator device tree node.
- qcom,cdc-vdd-buck-voltage: buck supply's voltage level min and max in mV.
- qcom,cdc-vdd-buck-current: buck supply's max current in mA.
- cdc-vdd-mic-bias-supply: phandle of mic bias supply's regulator device tree node.
- qcom,cdc-vdd-mic-bias-voltage: mic bias supply's voltage level min and max in mV.
- qcom,cdc-vdd-mic-bias-current: mic bias supply's max current in mA.
- qcom,cdc-static-supplies: List of supplies to be enabled prior to codec
hardware probe. Supplies in this list will be
stay enabled.
- qcom,cdc-on-demand-supplies: List of supplies which can be enabled
dynamically.
Supplies in this list are off by default.
Example:
wcd938x_codec: wcd938x-codec {
compatible = "qcom,wcd938x-codec";
qcom,rx_swr_ch_map = <0 HPH_L 0x1 0 HPH_L>,
<0 HPH_R 0x2 0 HPH_R>, <1 CLSH 0x3 0 CLSH>,
<2 COMP_L 0x1 0 COMP_L>, <2 COMP_R 0x2 0 COMP_R>,
<3 LO 0x1 0 LO>, <4 DSD_L 0x1 0 DSD_L>,
<4 DSD_R 0x2 0 DSD_R>;
qcom,tx_swr_ch_map = <0 ADC1 0x1 0 ADC1>,
<1 ADC2 0x1 0 ADC3>, <1 ADC3 0x2 0 ADC4>,
<2 DMIC0 0x1 0 DMIC0>, <2 DMIC1 0x2 0 DMIC1>,
<2 MBHC 0x4 0 DMIC2>, <3 DMIC2 0x1 0 DMIC4>,
<3 DMIC3 0x2 0 DMIC5>, <3 DMIC4 0x4 0 DMIC6>,
<3 DMIC5 0x8 0 DMIC7>;
qcom,wcd-rst-gpio-node = <&wcd938x_rst_gpio>;
qcom,rx-slave = <&wcd938x_rx_slave>;
qcom,tx-slave = <&wcd938x_tx_slave>;
cdc-vdd-buck-supply = <&S4A>;
qcom,cdc-vdd-buck-voltage = <1800000 1800000>;
qcom,cdc-vdd-buck-current = <650000>;
cdc-vdd-rxtx-supply = <&S4A>;
qcom,cdc-vdd-rxtx-voltage = <1800000 1800000>;
qcom,cdc-vdd-rxtx-current = <30000>;
cdc-vddio-supply = <&S4A>;
qcom,cdc-vddio-voltage = <1800000 1800000>;
qcom,cdc-vddio-current = <30000>;
cdc-vdd-mic-bias-supply = <&BOB>;
qcom,cdc-vdd-mic-bias-voltage = <3296000 3296000>;
qcom,cdc-vdd-mic-bias-current = <30000>;
qcom,cdc-static-supplies = "cdc-vdd-rxtx",
"cdc-vddio";
qcom,cdc-on-demand-supplies = "cdc-vdd-buck",
"cdc-vdd-mic-bias";
};
Bolero Clock Resource Manager
Required Properties:
- compatible = "qcom,bolero-clk-rsc-mngr";
- qcom,fs-gen-sequence: Register sequence for fs clock generation
- clock-names : clock names defined for WSA macro
- clocks : clock handles defined for WSA macro
Optional Properties:
- qcom,rx_mclk_mode_muxsel: register address for RX macro MCLK mode mux select
- qcom,wsa_mclk_mode_muxsel: register address for WSA macro MCLK mux select
- qcom,va_mclk_mode_muxsel: register address for VA macro MCLK mode mux select
Example:
&bolero {
bolero-clock-rsc-manager {
compatible = "qcom,bolero-clk-rsc-mngr";
qcom,fs-gen-sequence = <0x3000 0x1>,
<0x3004 0x1>, <0x3080 0x2>;
qcom,rx_mclk_mode_muxsel = <0x033240D8>;
qcom,wsa_mclk_mode_muxsel = <0x033220D8>;
qcom,va_mclk_mode_muxsel = <0x033A0000>;
clock-names = "tx_core_clk", "tx_npl_clk", "rx_core_clk",
"rx_npl_clk", "wsa_core_clk", "wsa_npl_clk",
"va_core_clk", "va_npl_clk";
clocks = <&clock_audio_tx_1 0>, <&clock_audio_tx_2 0>,
<&clock_audio_rx_1 0>, <&clock_audio_rx_2 0>,
<&clock_audio_wsa_1 0>, <&clock_audio_wsa_2 0>,
<&clock_audio_va_1 0>, <&clock_audio_va_2 0>;
};
};
LPASS Digital Codec Clock Resource Manager
Required Properties:
- compatible = "qcom,lpass-cdc-clk-rsc-mngr";
- qcom,fs-gen-sequence: Register sequence for fs clock generation
- clock-names : clock names defined for WSA macro
- clocks : clock handles defined for WSA macro
Optional Properties:
- qcom,rx_mclk_mode_muxsel: register address for RX macro MCLK mode mux select
- qcom,wsa_mclk_mode_muxsel: register address for WSA macro MCLK mux select
- qcom,va_mclk_mode_muxsel: register address for VA macro MCLK mode mux select
Example:
&lpass_cdc {
lpass-cdc-clk-rsc-mngr {
compatible = "qcom,lpass-cdc-clk-rsc-mngr";
qcom,fs-gen-sequence = <0x3000 0x1>,
<0x3004 0x1>, <0x3080 0x2>;
qcom,rx_mclk_mode_muxsel = <0x033240D8>;
qcom,wsa_mclk_mode_muxsel = <0x033220D8>;
qcom,va_mclk_mode_muxsel = <0x033A0000>;
clock-names = "tx_core_clk", "tx_npl_clk", "rx_core_clk",
"rx_npl_clk", "wsa_core_clk", "wsa_npl_clk",
"va_core_clk", "va_npl_clk";
clocks = <&clock_audio_tx_1 0>, <&clock_audio_tx_2 0>,
<&clock_audio_rx_1 0>, <&clock_audio_rx_2 0>,
<&clock_audio_wsa_1 0>, <&clock_audio_wsa_2 0>,
<&clock_audio_va_1 0>, <&clock_audio_va_2 0>;
};
};
WSA Analog Codec
Required Properties:
- compatible = "qcom,wsa881x-i2c-codec";
- reg: Specifies the I2C chip address.
- clock-names : clock names defined for WSA master clock
- clocks : clock handles defined for WSA master clock
- qcom,wsa-analog-clk-gpio: Specificies WSA_MCLK GPIO handle
- qcom,wsa-analog-reset-gpio: Specifies WSA reset GPIO handle
Optional Properties:
- qcom,wsa-analog-vi-gpio: Specifies WSA VI sense GPIO handle
Example:
&qupv3_se1_i2c {
wsa881x_i2c_f: wsa881x-i2c-codec@f {
compatible = "qcom,wsa881x-i2c-codec";
reg = <0x0f>;
clock-names = "wsa_mclk";
clocks = <&wsa881x_analog_clk 0>;
qcom,wsa-analog-clk-gpio = <&wsa881x_analog_clk_gpio>;
qcom,wsa-analog-reset-gpio = <&wsa881x_analog_reset_gpio>;
};
wsa881x_i2c_45: wsa881x-i2c-codec@45 {
compatible = "qcom,wsa881x-i2c-codec";
reg = <0x045>;
};
};
WSA883x Soundwire slave device as child of Soundwire master in Bolero codec
Required properties:
- compatible = "qcom,wsa883x";
- reg: Specifies the WSA883x soundwire slave unique device address
- qcom,spkr-sd-n-gpio: speaker reset gpio
Optional properties:
- bolero-handle: phandle to bolero codec
- cdc-vdd-1p8-supply: phandle of VDD 1.8V supply's regulator device tree node.
- qcom,cdc-vdd-1p8-voltage: VDD 1.8V supply's voltage level min and max in mV.
- qcom,cdc-vdd-1p8-current: VDD 1.8V supply's max current in mA.
- qcom,cdc-static-supplies: List of supplies to be enabled prior to codec
hardware probe. Supplies in this list will be
stay enabled.
Example:
wsa883x_0221: wsa883x@02170221 {
compatible = "qcom,wsa883x";
reg = <0x02 0x02170221>;
qcom,spkr-sd-n-gpio = <&tlmm 80 0>;
bolero-handle = <&bolero>;
cdc-vdd-1p8-supply = <&S10B>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-static-supplies = "cdc-vdd-1p8";
};
WSA883x Soundwire peripheral device second instance as child of Soundwire manager
Required properties:
- compatible = "qcom,wsa883x_2";
- reg: Specifies the WSA883x soundwire slave unique device address
- qcom,spkr-sd-n-gpio: speaker reset gpio
Optional properties:
- qcom,lpass-cdc-handle: phandle to lpass codec
- cdc-vdd-1p8-supply: phandle of VDD 1.8V supply's regulator device tree node.
- qcom,cdc-vdd-1p8-voltage: VDD 1.8V supply's voltage level min and max in mV.
- qcom,cdc-vdd-1p8-current: VDD 1.8V supply's max current in mA.
- qcom,cdc-static-supplies: List of supplies to be enabled prior to codec
hardware probe. Supplies in this list will be
stay enabled.
Example:
wsa883x_0221: wsa883x@02170221 {
compatible = "qcom,wsa883x_2";
reg = <0x02 0x02170221>;
qcom,spkr-sd-n-gpio = <&tlmm 80 0>;
qcom,lpass-cdc-handle = <&lpass_cdc>;
cdc-vdd-1p8-supply = <&S10B>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-static-supplies = "cdc-vdd-1p8";
};
Haptics Soundwire slave device as child of Soundwire master in Bolero codec
Required properties:
- compatible: "qcom,swr-haptics", or "qcom,pm8350b-swr-haptics".
- reg: Specifies the haptics soundwire slave unique device address.
- swr-slave-supply: Specify the phandle of the regulator device to take
haptics soundwire slave out of reset.
- qcom,rx_swr_ch_map: Specify the mapping of soundwire rx slave port configuration.
format: <port_id, ch_mask, ch_rate, num_ch, port_type>.
Example:
swr_haptics: swr_haptics@f0170220 {
compatible = "qcom,pm8350b-swr-haptics";
reg = <0x01 0xf0170220>;
swr-slave-supply = <&hap_swr_slave_reg>;
qcom,rx_swr_ch_map = <0 0x1 0xF 0 PCM_OUT1>;
};
SWR MIC Soundwire slave device as child of Soundwire master in digital codec
Required properties:
- compatible = "qcom,swr-dmic";
- reg: Specifies the SWR MIC soundwire slave unique device address
- qcom,swr-dmic-prefix: Prefix to use for alsa widgets and routes
- qcom,codec-name: Name for the corresponding swr mic codec
- qcom,swr-dmic-supply: Mic bias widget name that turns on this device's power supply
- qcom,wcd-handle: pHandle to wcd node that can enable this device's supply
Example:
swr_dmic_01: dmic_swr@58350220 {
compatible = "qcom,swr-dmic";
reg = <0x08 0x58350220>;
qcom,swr-dmic-prefix = "SWR_MIC0";
qcom,codec-name = "swr-dmic-01";
qcom,swr-dmic-supply = "MIC BIAS1 Standalone";
qcom,wcd-handle = <&wcd938x_codec>;
};

View File

@@ -1,129 +0,0 @@
#include <dt-bindings/clock/qcom,audio-ext-clk.h>
#include "msm-audio-lpass.dtsi"
&soc {
spf_core_platform: spf_core_platform {
compatible = "qcom,spf-core-platform";
};
};
&spf_core_platform {
msm_audio_ion: qcom,msm-audio-ion {
compatible = "qcom,msm-audio-ion";
qcom,smmu-version = <2>;
qcom,smmu-enabled;
iommus = <&apps_smmu 0x1801 0x0>;
qcom,iommu-dma-addr-pool = <0x10000000 0x10000000>;
qcom,smmu-sid-mask = /bits/ 64 <0xf>;
dma-coherent;
};
msm_audio_ion_cma: qcom,msm-audio-ion-cma {
compatible = "qcom,msm-audio-ion-cma";
};
lpass_core_hw_vote: vote_lpass_core_hw {
compatible = "qcom,audio-ref-clk";
qcom,codec-ext-clk-src = <AUDIO_LPASS_CORE_HW_VOTE>;
#clock-cells = <1>;
};
lpass_audio_hw_vote: vote_lpass_audio_hw {
compatible = "qcom,audio-ref-clk";
qcom,codec-ext-clk-src = <AUDIO_LPASS_AUDIO_HW_VOTE>;
#clock-cells = <1>;
};
lpi_tlmm: lpi_pinctrl@3440000 {
compatible = "qcom,lpi-pinctrl";
reg = <0x3440000 0x0>;
qcom,slew-reg = <0x34da000 0x0>;
qcom,gpios-count = <23>;
gpio-controller;
#gpio-cells = <2>;
qcom,lpi-offset-tbl = <0x00000000>, <0x00001000>,
<0x00002000>, <0x00003000>,
<0x00004000>, <0x00005000>,
<0x00006000>, <0x00007000>,
<0x00008000>, <0x00009000>,
<0x0000A000>, <0x0000B000>,
<0x0000C000>, <0x0000D000>,
<0x0000E000>, <0x0000F000>,
<0x00010000>, <0x00011000>,
<0x00012000>, <0x00013000>,
<0x00014000>, <0x00015000>,
<0x00016000>;
qcom,lpi-slew-offset-tbl = <0x00000000>, <0x00000002>,
<0x00000004>, <0x00000008>,
<0x0000000A>, <0x0000000C>,
<0x00000000>, <0x00000000>,
<0x00000000>, <0x00000000>,
<0x00000010>, <0x00000012>,
<0x00000000>, <0x00000000>,
<0x00000006>, <0x00000014>,
<0x00000016>, <0x00000000>,
<0x00000000>, <0x00000000>,
<0x00000000>, <0x00000000>,
<0x00000000>;
clock-names = "lpass_core_hw_vote";
clocks = <&lpass_core_hw_vote 0>;
};
lpass_cdc: lpass-cdc {
compatible = "qcom,lpass-cdc";
clock-names = "lpass_core_hw_vote",
"lpass_audio_hw_vote";
clocks = <&lpass_core_hw_vote 0>,
<&lpass_audio_hw_vote 0>;
lpass-cdc-clk-rsc-mngr {
compatible = "qcom,lpass-cdc-clk-rsc-mngr";
};
va_macro: va-macro@33F0000 {
swr2: va_swr_master {
};
};
tx_macro: tx-macro@3220000 {
};
rx_macro: rx-macro@3200000 {
swr1: rx_swr_master {
};
};
wsa_macro: wsa-macro@3240000 {
swr0: wsa_swr_master {
};
};
wsa2_macro: wsa2-macro@31E0000 {
swr3: wsa2_swr_master {
};
};
};
waipio_snd: sound {
compatible = "qcom,waipio-asoc-snd";
qcom,mi2s-audio-intf = <1>;
qcom,auxpcm-audio-intf = <1>;
qcom,wcn-bt = <0>;
qcom,ext-disp-audio-rx = <0>;
qcom,afe-rxtx-lb = <0>;
clock-names = "lpass_audio_hw_vote";
clocks = <&lpass_audio_hw_vote 0>;
fsa4480-i2c-handle = <&fsa4480>;
};
};
&qupv3_se5_i2c {
status = "disabled";
fsa4480: fsa4480@42 {
compatible = "qcom,fsa4480-i2c";
reg = <0x42>;
};
};

View File

@@ -3,7 +3,6 @@
#include "waipio-pmic-overlay.dtsi"
#include "waipio-thermal-overlay.dtsi"
#include "waipio-audio-overlay.dtsi"
&ufsphy_mem {
compatible = "qcom,ufs-phy-qmp-v4-lahaina";
@@ -94,118 +93,6 @@
status = "ok";
};
&lpass_cdc {
qcom,num-macros = <4>;
};
&wsa2_macro {
status = "disabled";
};
&swr_dmic_01 {
status = "disabled";
};
&swr_dmic_02 {
status = "disabled";
};
&swr_dmic_03 {
status = "disabled";
};
&swr_dmic_04 {
status = "disabled";
};
&cdc_tert_mi2s_gpios {
status = "ok";
};
&waipio_snd {
qcom,model = "waipio-cdp-snd-card";
qcom,audio-routing =
"AMIC1", "Analog Mic1",
"AMIC1", "MIC BIAS1",
"AMIC2", "Analog Mic2",
"AMIC2", "MIC BIAS2",
"AMIC3", "Analog Mic3",
"AMIC3", "MIC BIAS3",
"AMIC4", "Analog Mic4",
"AMIC4", "MIC BIAS3",
"AMIC5", "Analog Mic5",
"AMIC5", "MIC BIAS4",
"VA AMIC1", "Analog Mic1",
"VA AMIC1", "VA MIC BIAS1",
"VA AMIC2", "Analog Mic2",
"VA AMIC2", "VA MIC BIAS2",
"VA AMIC3", "Analog Mic3",
"VA AMIC3", "VA MIC BIAS3",
"VA AMIC4", "Analog Mic4",
"VA AMIC4", "VA MIC BIAS3",
"VA AMIC5", "Analog Mic5",
"VA AMIC5", "VA MIC BIAS4",
"TX DMIC0", "Digital Mic0",
"Digital Mic0", "MIC BIAS3",
"TX DMIC1", "Digital Mic1",
"Digital Mic1", "MIC BIAS3",
"TX DMIC2", "Digital Mic2",
"Digital Mic2", "MIC BIAS1",
"TX DMIC3", "Digital Mic3",
"Digital Mic3", "MIC BIAS1",
"TX DMIC4", "Digital Mic4",
"Digital Mic4", "MIC BIAS4",
"TX DMIC5", "Digital Mic5",
"Digital Mic5", "MIC BIAS4",
"TX DMIC6", "Digital Mic6",
"Digital Mic6", "MIC BIAS3",
"TX DMIC7", "Digital Mic7",
"Digital Mic7", "MIC BIAS3",
"IN1_HPHL", "HPHL_OUT",
"IN2_HPHR", "HPHR_OUT",
"IN3_AUX", "AUX_OUT",
"HAP_IN", "PCM_OUT",
"WSA SRC0_INP", "SRC0",
"WSA_TX DEC0_INP", "TX DEC0 MUX",
"WSA_TX DEC1_INP", "TX DEC1 MUX",
"RX_TX DEC0_INP", "TX DEC0 MUX",
"RX_TX DEC1_INP", "TX DEC1 MUX",
"RX_TX DEC2_INP", "TX DEC2 MUX",
"RX_TX DEC3_INP", "TX DEC3 MUX",
"SpkrLeft IN", "WSA_SPK1 OUT",
"SpkrRight IN", "WSA_SPK2 OUT",
"TX SWR_INPUT", "WCD_TX_OUTPUT",
"VA SWR_INPUT", "VA_SWR_CLK",
"VA SWR_INPUT", "WCD_TX_OUTPUT",
"VA_AIF1 CAP", "VA_SWR_CLK",
"VA_AIF2 CAP", "VA_SWR_CLK",
"VA_AIF3 CAP", "VA_SWR_CLK",
"VA DMIC0", "Digital Mic0",
"VA DMIC1", "Digital Mic1",
"VA DMIC2", "Digital Mic2",
"VA DMIC3", "Digital Mic3",
"Digital Mic0", "VA MIC BIAS3",
"Digital Mic1", "VA MIC BIAS3",
"Digital Mic2", "VA MIC BIAS1",
"Digital Mic3", "VA MIC BIAS1",
"Digital Mic4", "VA MIC BIAS4",
"Digital Mic5", "VA MIC BIAS4",
"Digital Mic6", "VA MIC BIAS3",
"Digital Mic7", "VA MIC BIAS3";
qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;
qcom,cdc-dmic23-gpios = <&cdc_dmic23_gpios>;
qcom,cdc-dmic45-gpios = <&cdc_dmic45_gpios>;
qcom,cdc-dmic67-gpios = <&cdc_dmic67_gpios>;
asoc-codec = <&stub_codec>, <&lpass_cdc>,
<&wcd938x_codec>, <&swr_haptics>,
<&wsa883x_0221>, <&wsa883x_0222>;
asoc-codec-names = "msm-stub-codec.1", "lpass-cdc",
"wcd938x_codec", "swr-haptics",
"wsa-codec1", "wsa-codec2";
qcom,wsa-max-devs = <2>;
qcom,tert-mi2s-gpios = <&cdc_tert_mi2s_gpios>;
};
&qupv3_se9_i2c {
status = "ok";
qcom,clk-freq-out = <1000000>;

File diff suppressed because it is too large Load Diff

View File

@@ -3,7 +3,6 @@
#include "waipio-pmic-overlay.dtsi"
#include "waipio-thermal-overlay.dtsi"
#include "waipio-audio-overlay.dtsi"
&ufsphy_mem {
compatible = "qcom,ufs-phy-qmp-v4-lahaina";
@@ -71,14 +70,6 @@
};
};
&cdc_tert_mi2s_gpios {
status = "ok";
};
&waipio_snd {
qcom,tert-mi2s-gpios = <&cdc_tert_mi2s_gpios>;
};
&pm8350b_haptics {
status = "ok";
};

View File

@@ -3,7 +3,6 @@
#include "waipio-pmic-overlay.dtsi"
#include "waipio-thermal-overlay.dtsi"
#include "waipio-audio-overlay.dtsi"
&ufsphy_mem {
compatible = "qcom,ufs-phy-qmp-v4-lahaina";
@@ -168,79 +167,6 @@
};
};
&tx_swr_clk_active {
config {
drive-strength = <2>;
};
};
&tx_swr_data0_active {
config {
drive-strength = <2>;
};
};
&tx_swr_data1_active {
config {
drive-strength = <2>;
};
};
&tx_swr_data2_active {
config {
drive-strength = <2>;
};
};
&waipio_snd {
qcom,model = "waipio-qrd-snd-card";
qcom,audio-routing =
"AMIC1", "Analog Mic1",
"AMIC1", "MIC BIAS1",
"AMIC2", "Analog Mic2",
"AMIC2", "MIC BIAS2",
"AMIC3", "Analog Mic3",
"AMIC3", "MIC BIAS3",
"AMIC4", "Analog Mic4",
"AMIC4", "MIC BIAS3",
"AMIC5", "Analog Mic5",
"AMIC5", "MIC BIAS4",
"VA AMIC1", "Analog Mic1",
"VA AMIC1", "VA MIC BIAS1",
"VA AMIC2", "Analog Mic2",
"VA AMIC2", "VA MIC BIAS2",
"VA AMIC3", "Analog Mic3",
"VA AMIC3", "VA MIC BIAS3",
"VA AMIC4", "Analog Mic4",
"VA AMIC4", "VA MIC BIAS3",
"VA AMIC5", "Analog Mic5",
"VA AMIC5", "VA MIC BIAS4",
"IN1_HPHL", "HPHL_OUT",
"IN2_HPHR", "HPHR_OUT",
"IN3_AUX", "AUX_OUT",
"HAP_IN", "PCM_OUT",
"WSA SRC0_INP", "SRC0",
"WSA_TX DEC0_INP", "TX DEC0 MUX",
"WSA_TX DEC1_INP", "TX DEC1 MUX",
"RX_TX DEC0_INP", "TX DEC0 MUX",
"RX_TX DEC1_INP", "TX DEC1 MUX",
"RX_TX DEC2_INP", "TX DEC2 MUX",
"RX_TX DEC3_INP", "TX DEC3 MUX",
"SpkrLeft IN", "WSA_SPK1 OUT",
"SpkrRight IN", "WSA_SPK2 OUT",
"TX SWR_INPUT", "WCD_TX_OUTPUT",
"VA SWR_INPUT", "VA_SWR_CLK",
"VA SWR_INPUT", "WCD_TX_OUTPUT",
"VA_AIF1 CAP", "VA_SWR_CLK",
"VA_AIF2 CAP", "VA_SWR_CLK",
"VA_AIF3 CAP", "VA_SWR_CLK";
qcom,msm-mbhc-usbc-audio-supported = <1>;
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};
&qupv3_se4_spi {
status = "ok";
qcom,spi-touch-active = "focaltech,fts_ts";

View File

@@ -126,12 +126,6 @@
status = "disabled";
};
&waipio_snd {
compatible = "qcom,waipio-asoc-snd-stub";
asoc-codec = <&stub_codec>;
asoc-codec-names = "msm-stub-codec.1";
};
&tsens0 {
status = "disabled";
};

View File

@@ -1,4 +1,3 @@
#include <dt-bindings/sound/qcom,gpr.h>
#include <dt-bindings/clock/qcom,aop-qmp.h>
#include <dt-bindings/clock/qcom,camcc-waipio.h>
#include <dt-bindings/clock/qcom,dispcc-waipio.h>
@@ -43,15 +42,11 @@
mboxes = <&qmp_aop 0>;
};
aliases {
aliases: aliases {
serial0 = &qupv3_se7_2uart;
hsuart0 = &qupv3_se20_4uart;
sdhc2 = &sdhc_2;
ufshc1 = &ufshc_mem; /* Embedded UFS Slot */
swr0 = &swr0;
swr1 = &swr1;
swr2 = &swr2;
swr3 = &swr3;
pci-domain0 = &pcie0; /* PCIe0 domain */
pci-domain1 = &pcie1; /* PCIe1 domain */
};
@@ -957,7 +952,7 @@
qcom,smem-states = <&adsp_smp2p_out 0>;
qcom,smem-state-names = "stop";
glink-edge {
glink_edge: glink-edge {
qcom,remote-pid = <2>;
transport = "smem";
mboxes = <&ipcc_mproc IPCC_CLIENT_LPASS
@@ -978,29 +973,6 @@
0x4400 2>;
};
audio_gpr: qcom,gpr {
compatible = "qcom,gpr";
qcom,glink-channels = "adsp_apps";
qcom,intents = <0x200 20>;
reg = <GPR_DOMAIN_ADSP>;
spf_core {
compatible = "qcom,spf_core";
reg = <GPR_SVC_ADSP_CORE>;
};
audio-pkt {
compatible = "qcom,audio-pkt";
qcom,audiopkt-ch-name = "apr_audio_svc";
reg = <GPR_SVC_MAX>;
};
audio_prm: q6prm {
compatible = "qcom,audio_prm";
reg = <GPR_SVC_ASM>;
};
};
qcom,msm_fastrpc_rpmsg {
compatible = "qcom,msm-fastrpc-rpmsg";
qcom,glink-channels = "fastrpcglink-apps-dsp";
@@ -3501,7 +3473,6 @@
#include "waipio-dma-heaps.dtsi"
#include "waipio-debug.dtsi"
#include "waipio-eva.dtsi"
#include "waipio-audio.dtsi"
#include "waipio-pcie.dtsi"
#include "msm-rdbg.dtsi"
#include "waipio-gpu.dtsi"
@@ -3533,13 +3504,6 @@
status = "ok";
};
&adsp_loader {
status = "ok";
compatible = "qcom,adsp-loader";
qcom,rproc-handle = <&adsp_pas>;
qcom,adsp-state = <0>;
};
&qupv3_se20_4uart {
status = "ok";
};
@@ -3556,4 +3520,9 @@
vio-supply = <&S10B>;
rtc6226,vio-supply-voltage = <1800000 1800000 >;
};
fsa4480: fsa4480@42 {
compatible = "qcom,fsa4480-i2c";
reg = <0x42>;
};
};