lkml.org 
[lkml]   [2022]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 2/3] arm64: dts: qcom: sm8450: add Soundwire and LPASS
    Date
    From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

    Add Soundwire controllers, Low Power Audio SubSystem (LPASS) devices and
    LPASS pin controller.

    Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Co-developed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
    Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

    ---

    Changes since v4:
    1. Re-order few properties between Soundwire nodes, to keep them ordered
    consistently.
    2. Drop unsupported qcom,port-offset.

    Changes since v3:
    1. Re-order reg and sound-dai-cells.

    Changes since v2:
    1. Use lower-case hex.

    Changes since v1:
    1. Whitespace cleanups.
    2. Correct include - do not use deprecated one.
    ---
    arch/arm64/boot/dts/qcom/sm8450.dtsi | 292 +++++++++++++++++++++++++++
    1 file changed, 292 insertions(+)

    diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
    index 7b63c56ff2f4..380405ec3452 100644
    --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
    +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
    @@ -15,6 +15,7 @@
    #include <dt-bindings/interconnect/qcom,sm8450.h>
    #include <dt-bindings/soc/qcom,gpr.h>
    #include <dt-bindings/soc/qcom,rpmh-rsc.h>
    +#include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
    #include <dt-bindings/thermal/thermal.h>

    / {
    @@ -2090,6 +2091,209 @@ compute-cb@3 {
    };
    };

    + wsa2macro: codec@31e0000 {
    + compatible = "qcom,sm8450-lpass-wsa-macro";
    + reg = <0 0x031e0000 0 0x1000>;
    + clocks = <&q6prmcc LPASS_CLK_ID_WSA_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&vamacro>;
    + clock-names = "mclk", "npl", "macro", "dcodec", "fsgen";
    + assigned-clocks = <&q6prmcc LPASS_CLK_ID_WSA_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>;
    + assigned-clock-rates = <19200000>, <19200000>;
    +
    + #clock-cells = <0>;
    + clock-output-names = "wsa2-mclk";
    + pinctrl-names = "default";
    + pinctrl-0 = <&wsa2_swr_active>;
    + #sound-dai-cells = <1>;
    + };
    +
    + /* WSA2 */
    + swr4: soundwire-controller@31f0000 {
    + compatible = "qcom,soundwire-v1.7.0";
    + reg = <0 0x031f0000 0 0x2000>;
    + interrupts = <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>;
    + clocks = <&wsa2macro>;
    + clock-names = "iface";
    +
    + qcom,din-ports = <2>;
    + qcom,dout-ports = <6>;
    +
    + qcom,ports-sinterval-low = /bits/ 8 <0x07 0x1f 0x3f 0x07 0x1f 0x3f 0x0f 0x0f>;
    + qcom,ports-offset1 = /bits/ 8 <0x01 0x02 0x0c 0x06 0x12 0x0d 0x07 0x0a>;
    + qcom,ports-offset2 = /bits/ 8 <0xff 0x00 0x1f 0xff 0x00 0x1f 0x00 0x00>;
    + qcom,ports-hstart = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff>;
    + qcom,ports-hstop = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff>;
    + qcom,ports-word-length = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff>;
    + qcom,ports-block-pack-mode = /bits/ 8 <0xff 0xff 0x01 0xff 0xff 0x01 0xff 0xff>;
    + qcom,ports-block-group-count = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff>;
    + qcom,ports-lane-control = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff>;
    +
    + #address-cells = <2>;
    + #size-cells = <0>;
    + #sound-dai-cells = <1>;
    + };
    +
    + rxmacro: codec@3200000 {
    + compatible = "qcom,sm8450-lpass-rx-macro";
    + reg = <0 0x3200000 0 0x1000>;
    + clocks = <&q6prmcc LPASS_CLK_ID_RX_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&vamacro>;
    + clock-names = "mclk", "npl", "macro", "dcodec", "fsgen";
    +
    + assigned-clocks = <&q6prmcc LPASS_CLK_ID_RX_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>;
    + assigned-clock-rates = <19200000>, <19200000>;
    +
    + #clock-cells = <0>;
    + clock-output-names = "mclk";
    + pinctrl-names = "default";
    + pinctrl-0 = <&rx_swr_active>;
    + #sound-dai-cells = <1>;
    + };
    +
    + swr1: soundwire-controller@3210000 {
    + compatible = "qcom,soundwire-v1.7.0";
    + reg = <0 0x3210000 0 0x2000>;
    + interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
    + clocks = <&rxmacro>;
    + clock-names = "iface";
    + label = "RX";
    + qcom,din-ports = <0>;
    + qcom,dout-ports = <5>;
    +
    + qcom,ports-sinterval-low = /bits/ 8 <0x03 0x1f 0x1f 0x07 0x00>;
    + qcom,ports-offset1 = /bits/ 8 <0x00 0x00 0x0b 0x01 0x00>;
    + qcom,ports-offset2 = /bits/ 8 <0x00 0x00 0x0b 0x00 0x00>;
    + qcom,ports-hstart = /bits/ 8 <0xff 0x03 0xff 0xff 0xff>;
    + qcom,ports-hstop = /bits/ 8 <0xff 0x06 0xff 0xff 0xff>;
    + qcom,ports-word-length = /bits/ 8 <0x01 0x07 0x04 0xff 0xff>;
    + qcom,ports-block-pack-mode = /bits/ 8 <0xff 0x00 0x01 0xff 0xff>;
    + qcom,ports-block-group-count = /bits/ 8 <0xff 0xff 0xff 0xff 0x00>;
    + qcom,ports-lane-control = /bits/ 8 <0x01 0x00 0x00 0x00 0x00>;
    +
    + #address-cells = <2>;
    + #size-cells = <0>;
    + #sound-dai-cells = <1>;
    + };
    +
    + txmacro: codec@3220000 {
    + compatible = "qcom,sm8450-lpass-tx-macro";
    + reg = <0 0x3220000 0 0x1000>;
    + clocks = <&q6prmcc LPASS_CLK_ID_RX_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&vamacro>;
    + clock-names = "mclk", "npl", "macro", "dcodec", "fsgen";
    + assigned-clocks = <&q6prmcc LPASS_CLK_ID_RX_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>;
    + assigned-clock-rates = <19200000>, <19200000>;
    +
    + #clock-cells = <0>;
    + clock-output-names = "mclk";
    + pinctrl-names = "default";
    + pinctrl-0 = <&tx_swr_active>;
    + #sound-dai-cells = <1>;
    + };
    +
    + wsamacro: codec@3240000 {
    + compatible = "qcom,sm8450-lpass-wsa-macro";
    + reg = <0 0x03240000 0 0x1000>;
    + clocks = <&q6prmcc LPASS_CLK_ID_WSA_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&vamacro>;
    + clock-names = "mclk", "npl", "macro", "dcodec", "fsgen";
    +
    + assigned-clocks = <&q6prmcc LPASS_CLK_ID_WSA_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>;
    + assigned-clock-rates = <19200000>, <19200000>;
    +
    + #clock-cells = <0>;
    + clock-output-names = "mclk";
    + pinctrl-names = "default";
    + pinctrl-0 = <&wsa_swr_active>;
    + #sound-dai-cells = <1>;
    + };
    +
    + /* WSA */
    + swr0: soundwire-controller@3250000 {
    + compatible = "qcom,soundwire-v1.7.0";
    + reg = <0 0x03250000 0 0x2000>;
    + interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
    + clocks = <&wsamacro>;
    + clock-names = "iface";
    +
    + qcom,din-ports = <2>;
    + qcom,dout-ports = <6>;
    +
    + qcom,ports-sinterval-low = /bits/ 8 <0x07 0x1f 0x3f 0x07 0x1f 0x3f 0x0f 0x0f>;
    + qcom,ports-offset1 = /bits/ 8 <0x01 0x02 0x0c 0x06 0x12 0x0d 0x07 0x0a>;
    + qcom,ports-offset2 = /bits/ 8 <0xff 0x00 0x1f 0xff 0x00 0x1f 0x00 0x00>;
    + qcom,ports-hstart = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff>;
    + qcom,ports-hstop = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff>;
    + qcom,ports-word-length = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff>;
    + qcom,ports-block-pack-mode = /bits/ 8 <0xff 0xff 0x01 0xff 0xff 0x01 0xff 0xff>;
    + qcom,ports-block-group-count = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff>;
    + qcom,ports-lane-control = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff>;
    +
    + #address-cells = <2>;
    + #size-cells = <0>;
    + #sound-dai-cells = <1>;
    + };
    +
    + swr2: soundwire-controller@33b0000 {
    + compatible = "qcom,soundwire-v1.7.0";
    + reg = <0 0x33b0000 0 0x2000>;
    + interrupts-extended = <&intc GIC_SPI 496 IRQ_TYPE_LEVEL_HIGH>,
    + <&intc GIC_SPI 520 IRQ_TYPE_LEVEL_HIGH>;
    + interrupt-names = "core", "wake";
    +
    + clocks = <&vamacro>;
    + clock-names = "iface";
    + label = "TX";
    +
    + qcom,din-ports = <4>;
    + qcom,dout-ports = <0>;
    + qcom,ports-sinterval-low = /bits/ 8 <0x01 0x01 0x03 0x03>;
    + qcom,ports-offset1 = /bits/ 8 <0x00 0x00 0x01 0x01>;
    + qcom,ports-offset2 = /bits/ 8 <0x00 0x00 0x00 0x00>;
    + qcom,ports-hstart = /bits/ 8 <0xff 0xff 0xff 0xff>;
    + qcom,ports-hstop = /bits/ 8 <0xff 0xff 0xff 0xff>;
    + qcom,ports-word-length = /bits/ 8 <0xff 0xff 0xff 0xff>;
    + qcom,ports-block-pack-mode = /bits/ 8 <0xff 0xff 0xff 0xff>;
    + qcom,ports-block-group-count = /bits/ 8 <0xff 0xff 0xff 0xff>;
    + qcom,ports-lane-control = /bits/ 8 <0x01 0x02 0x00 0x00>;
    +
    + #address-cells = <2>;
    + #size-cells = <0>;
    + #sound-dai-cells = <1>;
    + };
    +
    + vamacro: codec@33f0000 {
    + compatible = "qcom,sm8450-lpass-va-macro";
    + reg = <0 0x033f0000 0 0x1000>;
    + clocks = <&q6prmcc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>;
    + clock-names = "mclk", "macro", "dcodec", "npl";
    + assigned-clocks = <&q6prmcc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>;
    + assigned-clock-rates = <19200000>;
    +
    + #clock-cells = <0>;
    + clock-output-names = "fsgen";
    + #sound-dai-cells = <1>;
    + };
    +
    remoteproc_adsp: remoteproc@30000000 {
    compatible = "qcom,sm8450-adsp-pas";
    reg = <0 0x30000000 0 0x100>;
    @@ -3023,6 +3227,91 @@ qup_uart20_default: qup-uart20-default-state {

    };

    + lpass_tlmm: pinctrl@3440000{
    + compatible = "qcom,sm8450-lpass-lpi-pinctrl";
    + reg = <0 0x3440000 0x0 0x20000>,
    + <0 0x34d0000 0x0 0x10000>;
    + gpio-controller;
    + #gpio-cells = <2>;
    + gpio-ranges = <&lpass_tlmm 0 0 23>;
    +
    + clocks = <&q6prmcc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
    + <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>;
    + clock-names = "core", "audio";
    +
    + wsa_swr_active: wsa-swr-active-state {
    + clk-pins {
    + pins = "gpio10";
    + function = "wsa_swr_clk";
    + drive-strength = <2>;
    + slew-rate = <1>;
    + bias-disable;
    + };
    +
    + data-pins {
    + pins = "gpio11";
    + function = "wsa_swr_data";
    + drive-strength = <2>;
    + slew-rate = <1>;
    + bias-bus-hold;
    + };
    + };
    +
    + tx_swr_active: tx-swr-active-state {
    + clk-pins {
    + pins = "gpio0";
    + function = "swr_tx_clk";
    + drive-strength = <2>;
    + slew-rate = <1>;
    + bias-disable;
    + };
    +
    + data-pins {
    + pins = "gpio1", "gpio2", "gpio14";
    + function = "swr_tx_data";
    + drive-strength = <2>;
    + slew-rate = <1>;
    + bias-bus-hold;
    + };
    + };
    +
    + rx_swr_active: rx-swr-active-state {
    + clk-pins {
    + pins = "gpio3";
    + function = "swr_rx_clk";
    + drive-strength = <2>;
    + slew-rate = <1>;
    + bias-disable;
    + };
    +
    + data-pins {
    + pins = "gpio4", "gpio5";
    + function = "swr_rx_data";
    + drive-strength = <2>;
    + slew-rate = <1>;
    + bias-bus-hold;
    + };
    + };
    +
    + wsa2_swr_active: wsa2-swr-active-state {
    + clk-pins {
    + pins = "gpio15";
    + function = "wsa2_swr_clk";
    + drive-strength = <2>;
    + slew-rate = <1>;
    + bias-disable;
    + };
    +
    + data-pins {
    + pins = "gpio16";
    + function = "wsa2_swr_data";
    + drive-strength = <2>;
    + slew-rate = <1>;
    + bias-bus-hold;
    + };
    + };
    + };
    +
    apps_smmu: iommu@15000000 {
    compatible = "qcom,sm8450-smmu-500", "arm,mmu-500";
    reg = <0 0x15000000 0 0x100000>;
    @@ -3501,6 +3790,9 @@ lpass_ag_noc: interconnect@3c40000 {
    };
    };

    + sound: sound {
    + };
    +
    thermal-zones {
    aoss0-thermal {
    polling-delay-passive = <0>;
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-11-28 14:11    [W:3.768 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site