diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-13 09:04:58 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-13 09:04:58 +0000 |
| commit | 5994a1394a55c3419e4ba03db7a69c1bc2640871 (patch) | |
| tree | a7554d48c92f791ecb9f7893768ab65ef9f0207b | |
| parent | 798708e75f17c6b87b04478c7594bffbee5626f7 (diff) | |
| parent | f0293ca3d5547cd4bf539c7800845139fa67fa79 (diff) | |
| download | devicetree-android-msm-p11-5.15-tm-wear-kr3-dr-p11-d1.tar.gz | |
Snap for 11568587 from f0293ca3d5547cd4bf539c7800845139fa67fa79 to android13-msm-pixelwatch-5.15-p11-releaseandroid-wear-13.0.0_r0.16android-msm-p11-5.15-tm-wear-kr3-dr-p11-d1
Change-Id: I73b1670cb1ae3932757b334a61613876675b0774
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>
| -rwxr-xr-x | bindings/clock/xlnx,versal-clk.yaml | 2 | ||||
| -rwxr-xr-x | qcom/msm-arm-smmu-monaco.dtsi | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bindings/clock/xlnx,versal-clk.yaml b/bindings/clock/xlnx,versal-clk.yaml index 229af98b..7cd88bc3 100755 --- a/bindings/clock/xlnx,versal-clk.yaml +++ b/bindings/clock/xlnx,versal-clk.yaml @@ -16,8 +16,6 @@ description: | reads required input clock frequencies from the devicetree and acts as clock provider for all clock consumers of PS clocks. -select: false - properties: compatible: const: xlnx,versal-clk diff --git a/qcom/msm-arm-smmu-monaco.dtsi b/qcom/msm-arm-smmu-monaco.dtsi index ff853465..829a3cbc 100755 --- a/qcom/msm-arm-smmu-monaco.dtsi +++ b/qcom/msm-arm-smmu-monaco.dtsi @@ -18,10 +18,12 @@ vdd-supply = <&gpu_cx_gdsc>; clocks = <&gcc GCC_GPU_MEMNOC_GFX_CLK>, <&gcc GCC_GPU_SNOC_DVM_GFX_CLK>, - <&gpucc GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK>; + <&gpucc GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK>, + <&rpmcc RPM_SMD_XO_CLK_SRC>; clock-names = "gcc_gpu_memnoc_gfx", "gcc_gpu_snoc_dvm_gfx", - "gpu_cc_hlos1_vote_gpu_smmu_clk"; + "gpu_cc_hlos1_vote_gpu_smmu_clk", + "xo"; #size-cells = <1>; #address-cells = <1>; ranges; |