diff options
| author | Ian Campbell <ijc@hellion.org.uk> | 2023-10-22 12:11:21 -1000 |
|---|---|---|
| committer | Ian Campbell <ijc@hellion.org.uk> | 2023-10-23 07:57:33 +0100 |
| commit | b46ce00069a040be5ed3737995fd008356622b7f (patch) | |
| tree | 72eda63a409b45a9e32584428a4bc3ecd04a04f2 | |
| parent | 7a67f9df12b668b1adc4c44e8f9bb6c419f55fca (diff) | |
| parent | 135303a28f2850084b60545701390083876dbd71 (diff) | |
Merge tag 'v6.6-rc7-dts-raw'
Linux 6.6-rc7
| -rw-r--r-- | Bindings/mmc/sdhci-msm.yaml | 2 | ||||
| -rw-r--r-- | Bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml | 2 | ||||
| -rw-r--r-- | Bindings/sound/cirrus,cs42l43.yaml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Bindings/mmc/sdhci-msm.yaml b/Bindings/mmc/sdhci-msm.yaml index 80141eb7fc..10f34aa8ba 100644 --- a/Bindings/mmc/sdhci-msm.yaml +++ b/Bindings/mmc/sdhci-msm.yaml @@ -69,7 +69,7 @@ properties: maxItems: 4 clocks: - minItems: 3 + minItems: 2 items: - description: Main peripheral bus clock, PCLK/HCLK - AHB Bus clock - description: SDC MMC clock, MCLK diff --git a/Bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml b/Bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml index 5073007267..634cec5d57 100644 --- a/Bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml +++ b/Bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml @@ -70,7 +70,7 @@ examples: phy@84000 { compatible = "qcom,ipq6018-qmp-pcie-phy"; - reg = <0x0 0x00084000 0x0 0x1000>; + reg = <0x00084000 0x1000>; clocks = <&gcc GCC_PCIE0_AUX_CLK>, <&gcc GCC_PCIE0_AHB_CLK>, diff --git a/Bindings/sound/cirrus,cs42l43.yaml b/Bindings/sound/cirrus,cs42l43.yaml index 7a6de938b1..4118aa54bb 100644 --- a/Bindings/sound/cirrus,cs42l43.yaml +++ b/Bindings/sound/cirrus,cs42l43.yaml @@ -82,7 +82,7 @@ properties: description: Current at which the headset micbias sense clamp will engage, 0 to disable. - enum: [ 0, 14, 23, 41, 50, 60, 68, 86, 95 ] + enum: [ 0, 14, 24, 43, 52, 61, 71, 90, 99 ] default: 0 cirrus,bias-ramp-ms: |