lkml.org 
[lkml]   [2023]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 1/8] arm64: dts: qcom: sc7280: Extract audio nodes from common idp dtsi file
    Date
    Split common idp dtsi file into audio specific dtsi and common
    idp dtsi file.

    It is required to isolate idp and crd-rev3 platform device tree nodes
    and convert crd-rev3 platform device tree nodes into audioreach specific
    device tree nodes.

    Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
    Tested-by: Mohammad Rafi Shaik <quic_mohs@quicinc.com>
    ---
    arch/arm64/boot/dts/qcom/sc7280-audio-idp.dtsi | 135 +++++++++++++++++++++++++
    arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts | 1 +
    arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 126 -----------------------
    3 files changed, 136 insertions(+), 126 deletions(-)
    create mode 100644 arch/arm64/boot/dts/qcom/sc7280-audio-idp.dtsi

    diff --git a/arch/arm64/boot/dts/qcom/sc7280-audio-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-audio-idp.dtsi
    new file mode 100644
    index 0000000..d1aea28
    --- /dev/null
    +++ b/arch/arm64/boot/dts/qcom/sc7280-audio-idp.dtsi
    @@ -0,0 +1,135 @@
    +// SPDX-License-Identifier: BSD-3-Clause
    +/*
    + * sc7280 Audio IDP board device tree source (common between SKU1 and SKU2)
    + *
    + * Copyright (c) 2022, The Linux Foundation. All rights reserved.
    + */
    +
    +/{
    + /* BOARD-SPECIFIC TOP LEVEL NODES */
    + sound: sound {
    + compatible = "google,sc7280-herobrine";
    + model = "sc7280-wcd938x-max98360a-1mic";
    +
    + audio-routing =
    + "IN1_HPHL", "HPHL_OUT",
    + "IN2_HPHR", "HPHR_OUT",
    + "AMIC1", "MIC BIAS1",
    + "AMIC2", "MIC BIAS2",
    + "VA DMIC0", "MIC BIAS3",
    + "VA DMIC1", "MIC BIAS3",
    + "VA DMIC2", "MIC BIAS1",
    + "VA DMIC3", "MIC BIAS1",
    + "TX SWR_ADC0", "ADC1_OUTPUT",
    + "TX SWR_ADC1", "ADC2_OUTPUT",
    + "TX SWR_ADC2", "ADC3_OUTPUT",
    + "TX SWR_DMIC0", "DMIC1_OUTPUT",
    + "TX SWR_DMIC1", "DMIC2_OUTPUT",
    + "TX SWR_DMIC2", "DMIC3_OUTPUT",
    + "TX SWR_DMIC3", "DMIC4_OUTPUT",
    + "TX SWR_DMIC4", "DMIC5_OUTPUT",
    + "TX SWR_DMIC5", "DMIC6_OUTPUT",
    + "TX SWR_DMIC6", "DMIC7_OUTPUT",
    + "TX SWR_DMIC7", "DMIC8_OUTPUT";
    +
    + qcom,msm-mbhc-hphl-swh = <1>;
    + qcom,msm-mbhc-gnd-swh = <1>;
    +
    + #address-cells = <1>;
    + #size-cells = <0>;
    + #sound-dai-cells = <0>;
    +
    + dai-link@0 {
    + link-name = "MAX98360A";
    + reg = <0>;
    +
    + cpu {
    + sound-dai = <&lpass_cpu MI2S_SECONDARY>;
    + };
    +
    + codec {
    + sound-dai = <&max98360a>;
    + };
    + };
    +
    + dai-link@1 {
    + link-name = "DisplayPort";
    + reg = <1>;
    +
    + cpu {
    + sound-dai = <&lpass_cpu LPASS_DP_RX>;
    + };
    +
    + codec {
    + sound-dai = <&mdss_dp>;
    + };
    + };
    +
    + dai-link@2 {
    + link-name = "WCD9385 Playback";
    + reg = <2>;
    +
    + cpu {
    + sound-dai = <&lpass_cpu LPASS_CDC_DMA_RX0>;
    + };
    +
    + codec {
    + sound-dai = <&wcd9385 0>, <&swr0 0>, <&lpass_rx_macro 0>;
    + };
    + };
    +
    + dai-link@3 {
    + link-name = "WCD9385 Capture";
    + reg = <3>;
    +
    + cpu {
    + sound-dai = <&lpass_cpu LPASS_CDC_DMA_TX3>;
    + };
    +
    + codec {
    + sound-dai = <&wcd9385 1>, <&swr1 0>, <&lpass_tx_macro 0>;
    + };
    + };
    +
    + dai-link@4 {
    + link-name = "DMIC";
    + reg = <4>;
    +
    + cpu {
    + sound-dai = <&lpass_cpu LPASS_CDC_DMA_VA_TX0>;
    + };
    +
    + codec {
    + sound-dai = <&lpass_va_macro 0>;
    + };
    + };
    + };
    +};
    +
    +&lpass_cpu {
    + status = "okay";
    +
    + pinctrl-names = "default";
    + pinctrl-0 = <&mi2s1_data0>, <&mi2s1_sclk>, <&mi2s1_ws>;
    +
    + dai-link@1 {
    + reg = <MI2S_SECONDARY>;
    + qcom,playback-sd-lines = <0>;
    + };
    +
    + dai-link@5 {
    + reg = <LPASS_DP_RX>;
    + };
    +
    + dai-link@6 {
    + reg = <LPASS_CDC_DMA_RX0>;
    + };
    +
    + dai-link@19 {
    + reg = <LPASS_CDC_DMA_TX3>;
    + };
    +
    + dai-link@25 {
    + reg = <LPASS_CDC_DMA_VA_TX0>;
    + };
    +};
    diff --git a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts
    index 1185141..b024626 100644
    --- a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts
    +++ b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts
    @@ -8,6 +8,7 @@
    /dts-v1/;

    #include "sc7280-idp.dtsi"
    +#include "sc7280-audio-idp.dtsi"
    #include "sc7280-idp-ec-h1.dtsi"

    / {
    diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
    index f7efb99..edec3ee 100644
    --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
    +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
    @@ -86,104 +86,6 @@
    pinctrl-names = "default";
    pinctrl-0 = <&nvme_pwren>;
    };
    -
    - sound: sound {
    - compatible = "google,sc7280-herobrine";
    - model = "sc7280-wcd938x-max98360a-1mic";
    -
    - audio-routing =
    - "IN1_HPHL", "HPHL_OUT",
    - "IN2_HPHR", "HPHR_OUT",
    - "AMIC1", "MIC BIAS1",
    - "AMIC2", "MIC BIAS2",
    - "VA DMIC0", "MIC BIAS3",
    - "VA DMIC1", "MIC BIAS3",
    - "VA DMIC2", "MIC BIAS1",
    - "VA DMIC3", "MIC BIAS1",
    - "TX SWR_ADC0", "ADC1_OUTPUT",
    - "TX SWR_ADC1", "ADC2_OUTPUT",
    - "TX SWR_ADC2", "ADC3_OUTPUT",
    - "TX SWR_DMIC0", "DMIC1_OUTPUT",
    - "TX SWR_DMIC1", "DMIC2_OUTPUT",
    - "TX SWR_DMIC2", "DMIC3_OUTPUT",
    - "TX SWR_DMIC3", "DMIC4_OUTPUT",
    - "TX SWR_DMIC4", "DMIC5_OUTPUT",
    - "TX SWR_DMIC5", "DMIC6_OUTPUT",
    - "TX SWR_DMIC6", "DMIC7_OUTPUT",
    - "TX SWR_DMIC7", "DMIC8_OUTPUT";
    -
    - qcom,msm-mbhc-hphl-swh = <1>;
    - qcom,msm-mbhc-gnd-swh = <1>;
    -
    - #address-cells = <1>;
    - #size-cells = <0>;
    - #sound-dai-cells = <0>;
    -
    - dai-link@0 {
    - link-name = "MAX98360A";
    - reg = <0>;
    -
    - cpu {
    - sound-dai = <&lpass_cpu MI2S_SECONDARY>;
    - };
    -
    - codec {
    - sound-dai = <&max98360a>;
    - };
    - };
    -
    - dai-link@1 {
    - link-name = "DisplayPort";
    - reg = <1>;
    -
    - cpu {
    - sound-dai = <&lpass_cpu LPASS_DP_RX>;
    - };
    -
    - codec {
    - sound-dai = <&mdss_dp>;
    - };
    - };
    -
    - dai-link@2 {
    - link-name = "WCD9385 Playback";
    - reg = <2>;
    -
    - cpu {
    - sound-dai = <&lpass_cpu LPASS_CDC_DMA_RX0>;
    - };
    -
    - codec {
    - sound-dai = <&wcd9385 0>, <&swr0 0>, <&lpass_rx_macro 0>;
    - };
    - };
    -
    - dai-link@3 {
    - link-name = "WCD9385 Capture";
    - reg = <3>;
    -
    - cpu {
    - sound-dai = <&lpass_cpu LPASS_CDC_DMA_TX3>;
    - };
    -
    - codec {
    - sound-dai = <&wcd9385 1>, <&swr1 0>, <&lpass_tx_macro 0>;
    - };
    - };
    -
    - dai-link@4 {
    - link-name = "DMIC";
    - reg = <4>;
    -
    - cpu {
    - sound-dai = <&lpass_cpu LPASS_CDC_DMA_VA_TX0>;
    - };
    -
    - codec {
    - sound-dai = <&lpass_va_macro 0>;
    - };
    - };
    - };
    };

    &apps_rsc {
    @@ -381,34 +283,6 @@
    modem-init;
    };

    -&lpass_cpu {
    - status = "okay";
    -
    - pinctrl-names = "default";
    - pinctrl-0 = <&mi2s1_data0>, <&mi2s1_sclk>, <&mi2s1_ws>;
    -
    - dai-link@1 {
    - reg = <MI2S_SECONDARY>;
    - qcom,playback-sd-lines = <0>;
    - };
    -
    - dai-link@5 {
    - reg = <LPASS_DP_RX>;
    - };
    -
    - dai-link@6 {
    - reg = <LPASS_CDC_DMA_RX0>;
    - };
    -
    - dai-link@19 {
    - reg = <LPASS_CDC_DMA_TX3>;
    - };
    -
    - dai-link@25 {
    - reg = <LPASS_CDC_DMA_VA_TX0>;
    - };
    -};
    -
    &lpass_rx_macro {
    status = "okay";
    };
    --
    2.7.4
    \
     
     \ /
      Last update: 2023-03-26 23:28    [W:2.408 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site