diff options
| author | Bjorn Andersson <andersson@kernel.org> | 2023-03-29 01:32:04 +0300 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2023-03-29 01:32:04 +0300 |
| commit | 1554413537fdbc6fcb284f5419203d4945a4781d (patch) | |
| tree | 9ccdc8c01ba2390717e8b5b2154cf54a3c0711e1 /arch/arm64/boot/dts/qcom/sm8450.dtsi | |
| parent | 0514b376da09f9e4a6a4581112bcac063ee3ad9b (diff) | |
| parent | 1dc40551f206d20b7e46ea7dd538dcdd928451c6 (diff) | |
| download | linux-1554413537fdbc6fcb284f5419203d4945a4781d.tar.xz | |
Merge branch 'arm64-fixes-for-6.3' into arm64-for-6.4
Merge the arm64-fixes-for-6.3 branch to avoid merge conflicts with
changes for v6.4.
Diffstat (limited to 'arch/arm64/boot/dts/qcom/sm8450.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sm8450.dtsi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi index 08381fd3729d..31877f18dce2 100644 --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi @@ -2128,8 +2128,8 @@ <&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_WSA_CORE_TX_2X_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; + assigned-clocks = <&q6prmcc LPASS_CLK_ID_WSA2_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6prmcc LPASS_CLK_ID_WSA2_CORE_TX_2X_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; assigned-clock-rates = <19200000>, <19200000>; #clock-cells = <0>; @@ -4082,6 +4082,7 @@ power-domains = <&gcc UFS_PHY_GDSC>; iommus = <&apps_smmu 0xe0 0x0>; + dma-coherent; interconnects = <&aggre1_noc MASTER_UFS_MEM 0 &mc_virt SLAVE_EBI1 0>, <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_UFS_MEM_CFG 0>; |