diff options
| author | Tom Rini | 2024-05-20 09:54:58 -0600 |
|---|---|---|
| committer | Tom Rini | 2024-05-20 09:55:18 -0600 |
| commit | 85854bc3324edd0c81047780ee60033d056fd490 (patch) | |
| tree | 63f280b485f19f65f2a871d502a7db7238176b57 /dts/upstream/src/arm64/qcom/msm8996.dtsi | |
| parent | 4820864a67b8483e18213d1bc57e12740256717c (diff) | |
| parent | 6bb92fcf7d2fea2314d616e5e2391a8bf2b0fdfa (diff) | |
Subtree merge tag 'v6.9-dts' of devicetree-rebasing repo [1] into dts/upstream
[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/
Tested-by: Heiko Stuebner <heiko@sntech.de> # rk3588-rock5b, rk3588-jaguar,
# rk3588-tiger (pending patch)
Diffstat (limited to 'dts/upstream/src/arm64/qcom/msm8996.dtsi')
| -rw-r--r-- | dts/upstream/src/arm64/qcom/msm8996.dtsi | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/dts/upstream/src/arm64/qcom/msm8996.dtsi b/dts/upstream/src/arm64/qcom/msm8996.dtsi index ee6f87c828a..1601e46549e 100644 --- a/dts/upstream/src/arm64/qcom/msm8996.dtsi +++ b/dts/upstream/src/arm64/qcom/msm8996.dtsi @@ -756,12 +756,12 @@ #address-cells = <1>; #size-cells = <1>; - qusb2p_hstx_trim: hstx_trim@24e { + qusb2p_hstx_trim: hstx-trim@24e { reg = <0x24e 0x2>; bits = <5 4>; }; - qusb2s_hstx_trim: hstx_trim@24f { + qusb2s_hstx_trim: hstx-trim@24f { reg = <0x24f 0x1>; bits = <1 4>; }; @@ -2077,7 +2077,7 @@ <0 0>, <0 0>, <150000000 300000000>, - <0 0>, + <75000000 150000000>, <0 0>, <0 0>, <0 0>, @@ -2096,8 +2096,8 @@ compatible = "qcom,msm8996-qmp-ufs-phy"; reg = <0x00627000 0x1000>; - clocks = <&gcc GCC_UFS_CLKREF_CLK>; - clock-names = "ref"; + clocks = <&rpmcc RPM_SMD_LN_BB_CLK>, <&gcc GCC_UFS_CLKREF_CLK>; + clock-names = "ref", "qref"; resets = <&ufshc 0>; reset-names = "ufsphy"; @@ -3381,8 +3381,12 @@ #size-cells = <1>; ranges; - interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "hs_phy_irq"; + interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "pwr_event", + "qusb2_phy", + "hs_phy_irq"; clocks = <&gcc GCC_PERIPH_NOC_USB20_AHB_CLK>, <&gcc GCC_USB20_MASTER_CLK>, |