diff options
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-wsa881x.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt.dtsi | 34 |
3 files changed, 24 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi index 0f8b0908816b..794f9cc8cc84 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi @@ -117,7 +117,7 @@ }; }; -&slim_msm { +&slim_aud { msm_dai_slim { compatible = "qcom,msm-dai-slim"; elemental-addr = [ff ff ff fe 17 02]; diff --git a/arch/arm/boot/dts/qcom/msmcobalt-wsa881x.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-wsa881x.dtsi index 6417564b8533..5a4395a3e54d 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-wsa881x.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-wsa881x.dtsi @@ -10,7 +10,7 @@ * GNU General Public License for more details. */ -&slim_msm { +&slim_aud { tasha_codec { swr_master { compatible = "qcom,swr-wcd"; diff --git a/arch/arm/boot/dts/qcom/msmcobalt.dtsi b/arch/arm/boot/dts/qcom/msmcobalt.dtsi index 213f1beec384..30762f8bf854 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt.dtsi @@ -386,6 +386,28 @@ clock-names = "core", "iface"; }; + slim_aud: slim@171c0000 { + cell-index = <1>; + compatible = "qcom,slim-ngd"; + reg = <0x171c0000 0x2C000>, + <0x17184000 0x32000>; + reg-names = "slimbus_physical", "slimbus_bam_physical"; + interrupts = <0 163 0>, <0 164 0>; + interrupt-names = "slimbus_irq", "slimbus_bam_irq"; + qcom,ea-pc = <0x210>; + }; + + slim_qca: slim@17240000 { + status = "disabled"; + cell-index = <3>; + compatible = "qcom,slim-ngd"; + reg = <0x17240000 0x2C000>, + <0x17204000 0x26000>; + reg-names = "slimbus_physical", "slimbus_bam_physical"; + interrupts = <0 291 0>, <0 292 0>; + interrupt-names = "slimbus_irq", "slimbus_bam_irq"; + }; + timer@17920000 { #address-cells = <1>; #size-cells = <1>; @@ -1607,18 +1629,6 @@ qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_1_out 0 0>; }; - slim_msm: slim@91c0000 { - cell-index = <1>; - compatible = "qcom,slim-ngd"; - reg = <0x91c0000 0x2C000>, - <0x9184000 0x32000>; - reg-names = "slimbus_physical", "slimbus_bam_physical"; - interrupts = <0 163 0>, <0 164 0>; - interrupt-names = "slimbus_irq", "slimbus_bam_irq"; - qcom,apps-ch-pipes = <0x600000>; - qcom,ea-pc = <0x160>; - }; - tsens0: tsens@10aa000 { compatible = "qcom,msmcobalt-tsens"; reg = <0x10aa000 0x2000>, |