[PATCH 00/11] Even more msm bindings fixes
This series contains couple more random dt schema warning fixes, centered around linux-msm.
All of the patches (except) the last two are pretty much independent. Patch 1 is not only a bindings fix, but also a functional one.
Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org --- Konrad Dybcio (11): arm64: dts: qcom: sc7180: Fix DSI0_PHY reg-names arm64: dts: qcom: msm8939: Drop "qcom,idle-state-spc" compatible arm64: dts: qcom: msm8939: Add missing 'cache-unified' to L2 arm64: dts: qcom: apq8039-t2: Drop inexistent property dt-bindings: sound: Convert pm8916-wcd-analog-codec to YAML dt-bindings: mfd: qcom,spmi-pmic: Reference pm8916 wcd analog codec schema dt-bindings: iommu: qcom_iommu: Allow 'tbu' clock dt-bindings: usb: ci-hdrc-usb2: Fix handling pinctrl properties dt-bindings: arm: msm: kpss-acc: Make the optional reg truly optional dt-bindings: usb: dwc3: Allow just 1 interrupt for MSM8996 arm64: dts: qcom: msm8996: Add missing interrupt to the USB2 controller
.../devicetree/bindings/arm/msm/qcom,kpss-acc.yaml | 1 + .../devicetree/bindings/iommu/qcom,iommu.yaml | 4 + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 2 +- .../bindings/sound/qcom,msm8916-wcd-analog.txt | 101 ------------- .../sound/qcom,pm8916-wcd-analog-codec.yaml | 160 +++++++++++++++++++++ .../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 27 +--- .../devicetree/bindings/usb/qcom,dwc3.yaml | 2 +- arch/arm64/boot/dts/qcom/apq8039-t2.dts | 1 - arch/arm64/boot/dts/qcom/msm8939.dtsi | 4 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 3 + arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 +- 11 files changed, 182 insertions(+), 127 deletions(-) --- base-commit: 3eedd211ad93c322fb360b83a3d76a2c6cd622dc change-id: 20230627-topic-more_bindings-325a6f4b93a7
Best regards,
Commit 2b616f86d51b ("arm64: dts: qcom: sc7180: rename labels for DSI nodes") broke reg-names, possibly with search-and-replace. Fix it.
Fixes: 2b616f86d51b ("arm64: dts: qcom: sc7180: rename labels for DSI nodes") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org --- arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 34eff97f8630..b9640574e73b 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -3120,8 +3120,8 @@ mdss_dsi0_phy: phy@ae94400 { reg = <0 0x0ae94400 0 0x200>, <0 0x0ae94600 0 0x280>, <0 0x0ae94a00 0 0x1e0>; - reg-names = "dsi0_phy", - "dsi0_phy_lane", + reg-names = "dsi_phy", + "dsi_phy_lane", "dsi_pll";
#clock-cells = <1>;
Hi,
On Tue, Jun 27, 2023 at 9:24 AM Konrad Dybcio konrad.dybcio@linaro.org wrote:
Commit 2b616f86d51b ("arm64: dts: qcom: sc7180: rename labels for DSI nodes") broke reg-names, possibly with search-and-replace. Fix it.
Fixes: 2b616f86d51b ("arm64: dts: qcom: sc7180: rename labels for DSI nodes") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org
arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 34eff97f8630..b9640574e73b 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -3120,8 +3120,8 @@ mdss_dsi0_phy: phy@ae94400 { reg = <0 0x0ae94400 0 0x200>, <0 0x0ae94600 0 0x280>, <0 0x0ae94a00 0 0x1e0>;
reg-names = "dsi0_phy","dsi0_phy_lane",
reg-names = "dsi_phy","dsi_phy_lane",
I noticed that this patch got applied [1], but I think it got put into a branch targeting 6.6 instead of 6.5. Specifically I see it in "arm64-for-6.6" but not "arm64-fixes-for-6.5". Any chance it could be landed in a "Fixes" tree and get sent out sooner rather than later? v6.5 will be pretty broken without it and it would be nice to see it in Linus's tree sooner rather than later.
[1] https://lore.kernel.org/r/168896565982.1376307.13166434967387866925.b4-ty@ke...
Thanks!
-Doug
As of today, the only cool and legal way to get ARM64 SMP going is via PSCI (or spin tables). Sadly, not all chip and device vendors were considerate of this in the early days of arm64. Qualcomm, for example reused their tried-and-true spin-up method from MSM8974 and their Krait/ arm32 Cortex designs.
MSM8916 supports SMP with its arm32 dt overlay, as probably could 8939. But the arm64 DT should not define non-PSCI SMP or CPUidle stuff.
Drop the qcom,idle-state-spc compatible (associated with Qualcomm-specific CPUIdle) to make the dt checker happy:
apq8039-t2.dtb: idle-states: cpu-sleep-0:compatible: ['qcom,idle-state-spc', 'arm,idle-state'] is too long
Fixes: 61550c6c156c ("arm64: dts: qcom: Add msm8939 SoC") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org --- arch/arm64/boot/dts/qcom/msm8939.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi index 05d8abbbc840..38fc22e66bda 100644 --- a/arch/arm64/boot/dts/qcom/msm8939.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi @@ -155,7 +155,7 @@ CPU7: cpu@3 {
idle-states { CPU_SLEEP_0: cpu-sleep-0 { - compatible ="qcom,idle-state-spc", "arm,idle-state"; + compatible = "arm,idle-state"; entry-latency-us = <130>; exit-latency-us = <150>; min-residency-us = <2000>;
On 6/27/23 9:24 AM, Konrad Dybcio wrote:
As of today, the only cool and legal way to get ARM64 SMP going is via PSCI (or spin tables). Sadly, not all chip and device vendors were considerate of this in the early days of arm64. Qualcomm, for example reused their tried-and-true spin-up method from MSM8974 and their Krait/ arm32 Cortex designs.
MSM8916 supports SMP with its arm32 dt overlay, as probably could 8939. But the arm64 DT should not define non-PSCI SMP or CPUidle stuff.
Drop the qcom,idle-state-spc compatible (associated with Qualcomm-specific CPUIdle) to make the dt checker happy:
apq8039-t2.dtb: idle-states: cpu-sleep-0:compatible: ['qcom,idle-state-spc', 'arm,idle-state'] is too long
Fixes: 61550c6c156c ("arm64: dts: qcom: Add msm8939 SoC") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org
Reviewed-by: Benjamin Li benl@squareup.com
Add the missing property to fix the dt checker warning:
qcom/apq8039-t2.dtb: l2-cache: 'cache-unified' is a required property
Fixes: 61550c6c156c ("arm64: dts: qcom: Add msm8939 SoC") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org --- arch/arm64/boot/dts/qcom/msm8939.dtsi | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi index 38fc22e66bda..664ae303afae 100644 --- a/arch/arm64/boot/dts/qcom/msm8939.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi @@ -55,6 +55,7 @@ CPU0: cpu@100 { L2_1: l2-cache { compatible = "cache"; cache-level = <2>; + cache-unified; }; };
@@ -111,6 +112,7 @@ CPU4: cpu@0 { L2_0: l2-cache { compatible = "cache"; cache-level = <2>; + cache-unified; }; };
On 27/06/2023 17:24, Konrad Dybcio wrote:
Add the missing property to fix the dt checker warning:
qcom/apq8039-t2.dtb: l2-cache: 'cache-unified' is a required property
Fixes: 61550c6c156c ("arm64: dts: qcom: Add msm8939 SoC") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org
Reviewed-by: Bryan O'Donoghue bryan.odonoghue@linaro.org
On 27/06/2023 18:24, Konrad Dybcio wrote:
Add the missing property to fix the dt checker warning:
qcom/apq8039-t2.dtb: l2-cache: 'cache-unified' is a required property
Fixes: 61550c6c156c ("arm64: dts: qcom: Add msm8939 SoC") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org
arch/arm64/boot/dts/qcom/msm8939.dtsi | 2 ++
Reviewed-by: Krzysztof Kozlowski krzysztof.kozlowski@linaro.org
Best regards, Krzysztof
'pin-switch-delay-us' is not used anywhere in the mainline kernel. Drop it.
Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org --- arch/arm64/boot/dts/qcom/apq8039-t2.dts | 1 - 1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts index 43686bbd87f4..027d1da7e81d 100644 --- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts +++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts @@ -374,7 +374,6 @@ &usb { pinctrl-0 = <&pinctrl_otg_default>; pinctrl-1 = <&pinctrl_otg_host>; pinctrl-2 = <&pinctrl_otg_device>; - pin-switch-delay-us = <100000>; usb-role-switch; status = "okay";
On 27/06/2023 17:24, Konrad Dybcio wrote:
'pin-switch-delay-us' is not used anywhere in the mainline kernel. Drop it.
Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org
Reviewed-by: Bryan O'Donoghue bryan.odonoghue@linaro.org
Convert the PM8916 analog WCD codec bindings to YAML.
Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org --- .../bindings/sound/qcom,msm8916-wcd-analog.txt | 101 ------------- .../sound/qcom,pm8916-wcd-analog-codec.yaml | 160 +++++++++++++++++++++ 2 files changed, 160 insertions(+), 101 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt b/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt deleted file mode 100644 index e7d17dda55db..000000000000 --- a/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt +++ /dev/null @@ -1,101 +0,0 @@ -msm8916 analog audio CODEC - -Bindings for codec Analog IP which is integrated in pmic pm8916, - -## Bindings for codec core on pmic: - -Required properties - - compatible = "qcom,pm8916-wcd-analog-codec"; - - reg: represents the slave base address provided to the peripheral. - - interrupts: List of interrupts in given SPMI peripheral. - - interrupt-names: Names specified to above list of interrupts in same - order. List of supported interrupt names are: - "cdc_spk_cnp_int" - Speaker click and pop interrupt. - "cdc_spk_clip_int" - Speaker clip interrupt. - "cdc_spk_ocp_int" - Speaker over current protect interrupt. - "mbhc_ins_rem_det1" - jack insert removal detect interrupt 1. - "mbhc_but_rel_det" - button release interrupt. - "mbhc_but_press_det" - button press event - "mbhc_ins_rem_det" - jack insert removal detect interrupt. - "mbhc_switch_int" - multi button headset interrupt. - "cdc_ear_ocp_int" - Earphone over current protect interrupt. - "cdc_hphr_ocp_int" - Headphone R over current protect interrupt. - "cdc_hphl_ocp_det" - Headphone L over current protect interrupt. - "cdc_ear_cnp_int" - earphone cnp interrupt. - "cdc_hphr_cnp_int" - hphr click and pop interrupt. - "cdc_hphl_cnp_int" - hphl click and pop interrupt. - - - clocks: Handle to mclk. - - clock-names: should be "mclk" - - vdd-cdc-io-supply: phandle to VDD_CDC_IO regulator DT node. - - vdd-cdc-tx-rx-cx-supply: phandle to VDD_CDC_TX/RX/CX regulator DT node. - - vdd-micbias-supply: phandle of VDD_MICBIAS supply's regulator DT node. - -Optional Properties: - - qcom,mbhc-vthreshold-low: Array of 5 threshold voltages in mV for 5 buttons - detection on headset when the mbhc is powered up - by internal current source, this is a low power. - - qcom,mbhc-vthreshold-high: Array of 5 thresold voltages in mV for 5 buttons - detection on headset when mbhc is powered up - from micbias. -- qcom,micbias-lvl: Voltage (mV) for Mic Bias -- qcom,hphl-jack-type-normally-open: boolean, present if hphl pin on jack is a - NO (Normally Open). If not specified, then - its assumed that hphl pin on jack is NC - (Normally Closed). -- qcom,gnd-jack-type-normally-open: boolean, present if gnd pin on jack is - NO (Normally Open). If not specified, then - its assumed that gnd pin on jack is NC - (Normally Closed). -- qcom,micbias1-ext-cap: boolean, present if micbias1 has external capacitor - connected. -- qcom,micbias2-ext-cap: boolean, present if micbias2 has external capacitor - connected. - -Example: - -spmi_bus { - ... - audio-codec@f000{ - compatible = "qcom,pm8916-wcd-analog-codec"; - reg = <0xf000 0x200>; - reg-names = "pmic-codec-core"; - clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>; - clock-names = "mclk"; - qcom,mbhc-vthreshold-low = <75 150 237 450 500>; - qcom,mbhc-vthreshold-high = <75 150 237 450 500>; - interrupt-parent = <&spmi_bus>; - interrupts = <0x1 0xf0 0x0 IRQ_TYPE_NONE>, - <0x1 0xf0 0x1 IRQ_TYPE_NONE>, - <0x1 0xf0 0x2 IRQ_TYPE_NONE>, - <0x1 0xf0 0x3 IRQ_TYPE_NONE>, - <0x1 0xf0 0x4 IRQ_TYPE_NONE>, - <0x1 0xf0 0x5 IRQ_TYPE_NONE>, - <0x1 0xf0 0x6 IRQ_TYPE_NONE>, - <0x1 0xf0 0x7 IRQ_TYPE_NONE>, - <0x1 0xf1 0x0 IRQ_TYPE_NONE>, - <0x1 0xf1 0x1 IRQ_TYPE_NONE>, - <0x1 0xf1 0x2 IRQ_TYPE_NONE>, - <0x1 0xf1 0x3 IRQ_TYPE_NONE>, - <0x1 0xf1 0x4 IRQ_TYPE_NONE>, - <0x1 0xf1 0x5 IRQ_TYPE_NONE>; - interrupt-names = "cdc_spk_cnp_int", - "cdc_spk_clip_int", - "cdc_spk_ocp_int", - "mbhc_ins_rem_det1", - "mbhc_but_rel_det", - "mbhc_but_press_det", - "mbhc_ins_rem_det", - "mbhc_switch_int", - "cdc_ear_ocp_int", - "cdc_hphr_ocp_int", - "cdc_hphl_ocp_det", - "cdc_ear_cnp_int", - "cdc_hphr_cnp_int", - "cdc_hphl_cnp_int"; - vdd-cdc-io-supply = <&pm8916_l5>; - vdd-cdc-tx-rx-cx-supply = <&pm8916_l5>; - vdd-micbias-supply = <&pm8916_l13>; - #sound-dai-cells = <1>; - }; -}; diff --git a/Documentation/devicetree/bindings/sound/qcom,pm8916-wcd-analog-codec.yaml b/Documentation/devicetree/bindings/sound/qcom,pm8916-wcd-analog-codec.yaml new file mode 100644 index 000000000000..c385028c4296 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/qcom,pm8916-wcd-analog-codec.yaml @@ -0,0 +1,160 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,pm8916-wcd-analog-codec.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm PM8916 WCD Analog Audio Codec + +maintainers: + - Konrad Dybcio konradybcio@kernel.org + +description: + The analog WCD audio codec found on Qualcomm PM8916 PMIC. + +properties: + compatible: + const: qcom,pm8916-wcd-analog-codec + + reg: + maxItems: 1 + + reg-names: + items: + - const: pmic-codec-core + + clocks: + maxItems: 1 + + clock-names: + items: + - const: mclk + + interrupts: + maxItems: 14 + + interrupt-names: + items: + - const: cdc_spk_cnp_int + - const: cdc_spk_clip_int + - const: cdc_spk_ocp_int + - const: mbhc_ins_rem_det1 + - const: mbhc_but_rel_det + - const: mbhc_but_press_det + - const: mbhc_ins_rem_det + - const: mbhc_switch_int + - const: cdc_ear_ocp_int + - const: cdc_hphr_ocp_int + - const: cdc_hphl_ocp_det + - const: cdc_ear_cnp_int + - const: cdc_hphr_cnp_int + - const: cdc_hphl_cnp_int + + vdd-cdc-io-supply: + description: 1.8V buck supply + + vdd-cdc-tx-rx-cx-supply: + description: 1.8V SIDO buck supply + + vdd-micbias-supply: + description: micbias supply + + qcom,mbhc-vthreshold-low: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + Array of 5 threshold voltages in mV for 5-button detection on + headset when MBHC is powered by an internal current source. + minItems: 5 + maxItems: 5 + + qcom,mbhc-vthreshold-high: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + Array of 5 threshold voltages in mV for 5-button detection on + headset when MBHC is powered from micbias. + minItems: 5 + maxItems: 5 + + qcom,micbias-lvl: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Voltage (mV) for Mic Bias + + qcom,hphl-jack-type-normally-open: + type: boolean + description: + True if the HPHL pin on the jack is NO (Normally Open), false if it's + NC (Normally Closed). + + qcom,gnd-jack-type-normally-open: + type: boolean + description: + True if the GND pin on the jack is NO (Normally Open), false if it's + NC (Normally Closed). + + qcom,micbias1-ext-cap: + type: boolean + description: + True if micbias1 has an external capacitor. + + qcom,micbias2-ext-cap: + type: boolean + description: + True if micbias2 has an external capacitor. + + "#sound-dai-cells": + const: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,gcc-msm8916.h> + #include <dt-bindings/interrupt-controller/irq.h> + + audio-codec@f000{ + compatible = "qcom,pm8916-wcd-analog-codec"; + reg = <0xf000 0x200>; + reg-names = "pmic-codec-core"; + clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>; + clock-names = "mclk"; + qcom,mbhc-vthreshold-low = <75 150 237 450 500>; + qcom,mbhc-vthreshold-high = <75 150 237 450 500>; + interrupt-parent = <&spmi_bus>; + interrupts = <0x1 0xf0 0x0 IRQ_TYPE_NONE>, + <0x1 0xf0 0x1 IRQ_TYPE_NONE>, + <0x1 0xf0 0x2 IRQ_TYPE_NONE>, + <0x1 0xf0 0x3 IRQ_TYPE_NONE>, + <0x1 0xf0 0x4 IRQ_TYPE_NONE>, + <0x1 0xf0 0x5 IRQ_TYPE_NONE>, + <0x1 0xf0 0x6 IRQ_TYPE_NONE>, + <0x1 0xf0 0x7 IRQ_TYPE_NONE>, + <0x1 0xf1 0x0 IRQ_TYPE_NONE>, + <0x1 0xf1 0x1 IRQ_TYPE_NONE>, + <0x1 0xf1 0x2 IRQ_TYPE_NONE>, + <0x1 0xf1 0x3 IRQ_TYPE_NONE>, + <0x1 0xf1 0x4 IRQ_TYPE_NONE>, + <0x1 0xf1 0x5 IRQ_TYPE_NONE>; + interrupt-names = "cdc_spk_cnp_int", + "cdc_spk_clip_int", + "cdc_spk_ocp_int", + "mbhc_ins_rem_det1", + "mbhc_but_rel_det", + "mbhc_but_press_det", + "mbhc_ins_rem_det", + "mbhc_switch_int", + "cdc_ear_ocp_int", + "cdc_hphr_ocp_int", + "cdc_hphl_ocp_det", + "cdc_ear_cnp_int", + "cdc_hphr_cnp_int", + "cdc_hphl_cnp_int"; + vdd-cdc-io-supply = <&pm8916_l5>; + vdd-cdc-tx-rx-cx-supply = <&pm8916_l5>; + vdd-micbias-supply = <&pm8916_l13>; + #sound-dai-cells = <1>; + };
On Tue, 27 Jun 2023 18:24:21 +0200, Konrad Dybcio wrote:
Convert the PM8916 analog WCD codec bindings to YAML.
Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org
.../bindings/sound/qcom,msm8916-wcd-analog.txt | 101 ------------- .../sound/qcom,pm8916-wcd-analog-codec.yaml | 160 +++++++++++++++++++++ 2 files changed, 160 insertions(+), 101 deletions(-)
Reviewed-by: Rob Herring robh@kernel.org
Now that it's been converted to YAML, reference the PM8916 wcd codec schema.
Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org --- Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml index f473b2d820bc..b5ec8cecab6a 100644 --- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml +++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml @@ -128,7 +128,7 @@ patternProperties:
"^audio-codec@[0-9a-f]+$": type: object - additionalProperties: true # FIXME qcom,pm8916-wcd-analog-codec binding not converted yet + $ref: /schemas/sound/qcom,pm8916-wcd-analog-codec.yaml#
"^charger@[0-9a-f]+$": type: object
On Tue, 27 Jun 2023 18:24:22 +0200, Konrad Dybcio wrote:
Now that it's been converted to YAML, reference the PM8916 wcd codec schema.
Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org
Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Rob Herring robh@kernel.org
On Tue, 27 Jun 2023, Konrad Dybcio wrote:
Now that it's been converted to YAML, reference the PM8916 wcd codec schema.
Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org
Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks
Some IOMMUs on some platforms (there doesn't seem to be a good denominator for this) require the presence of a third clock, specifically for accessing the IOMMU's Translation Buffer Unit (TBU). Allow it.
Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org --- Documentation/devicetree/bindings/iommu/qcom,iommu.yaml | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/iommu/qcom,iommu.yaml b/Documentation/devicetree/bindings/iommu/qcom,iommu.yaml index d9fabdf930d9..3b7acb459f8e 100644 --- a/Documentation/devicetree/bindings/iommu/qcom,iommu.yaml +++ b/Documentation/devicetree/bindings/iommu/qcom,iommu.yaml @@ -24,14 +24,18 @@ properties: - const: qcom,msm-iommu-v1
clocks: + minItems: 2 items: - description: Clock required for IOMMU register group access - description: Clock required for underlying bus access + - description: Clock required for Translation Buffer Unit access
clock-names: + minItems: 2 items: - const: iface - const: bus + - const: tbu
power-domains: maxItems: 1
On Tue, 27 Jun 2023 18:24:23 +0200, Konrad Dybcio wrote:
Some IOMMUs on some platforms (there doesn't seem to be a good denominator for this) require the presence of a third clock, specifically for accessing the IOMMU's Translation Buffer Unit (TBU). Allow it.
Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org
Documentation/devicetree/bindings/iommu/qcom,iommu.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Reviewed-by: Rob Herring robh@kernel.org
Untangle the bit messy oneOf trees and add the missing pinctrl-2 mention to handle the different pinctrl combinations.
Fixes: 4c8375d35f72 ("dt-bindings: usb: ci-hdrc-usb2: convert to DT schema format") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org --- .../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 27 ++++++---------------- 1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml index 782402800d4a..24431a7adf3e 100644 --- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml +++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml @@ -199,17 +199,6 @@ properties: In case of HSIC-mode, "idle" and "active" pin modes are mandatory. In this case, the "idle" state needs to pull down the data and strobe pin and the "active" state needs to pull up the strobe pin. - oneOf: - - items: - - const: idle - - const: active - - items: - - const: default - - enum: - - host - - device - - items: - - const: default
pinctrl-0: maxItems: 1 @@ -357,17 +346,15 @@ allOf: - const: active else: properties: + pinctrl-2: + maxItems: 1 + pinctrl-names: minItems: 1 - maxItems: 2 - oneOf: - - items: - - const: default - - enum: - - host - - device - - items: - - const: default + items: + - const: default + - const: host + - const: device - if: properties: compatible:
On Tue, Jun 27, 2023 at 06:24:24PM +0200, Konrad Dybcio wrote:
Untangle the bit messy oneOf trees and add the missing pinctrl-2 mention to handle the different pinctrl combinations.
Fixes: 4c8375d35f72 ("dt-bindings: usb: ci-hdrc-usb2: convert to DT schema format") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org
.../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 27 ++++++---------------- 1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml index 782402800d4a..24431a7adf3e 100644 --- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml +++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml @@ -199,17 +199,6 @@ properties: In case of HSIC-mode, "idle" and "active" pin modes are mandatory. In this case, the "idle" state needs to pull down the data and strobe pin and the "active" state needs to pull up the strobe pin.
- oneOf:
- items:- const: idle- const: active
These are no longer valid values? The description still mentions them.
- items:- const: default- enum:- host- device- items:- const: defaultpinctrl-0: maxItems: 1
@@ -357,17 +346,15 @@ allOf: - const: active else: properties:
pinctrl-2:
This should be implicitly allowed. Is it not?
I'm reallly at a loss as to what problem this patch solves.
maxItems: 1pinctrl-names: minItems: 1
maxItems: 2oneOf:- items:- const: default- enum:- host- device- items:- const: default
items:- const: default- const: host- const: device
- if: properties: compatible:
-- 2.41.0
On 29.06.2023 17:23, Rob Herring wrote:
On Tue, Jun 27, 2023 at 06:24:24PM +0200, Konrad Dybcio wrote:
Untangle the bit messy oneOf trees and add the missing pinctrl-2 mention to handle the different pinctrl combinations.
Fixes: 4c8375d35f72 ("dt-bindings: usb: ci-hdrc-usb2: convert to DT schema format") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org
.../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 27 ++++++---------------- 1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml index 782402800d4a..24431a7adf3e 100644 --- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml +++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml @@ -199,17 +199,6 @@ properties: In case of HSIC-mode, "idle" and "active" pin modes are mandatory. In this case, the "idle" state needs to pull down the data and strobe pin and the "active" state needs to pull up the strobe pin.
- oneOf:
- items:- const: idle- const: activeThese are no longer valid values? The description still mentions them.
I believe allOf: now covers them all?
- items:- const: default- enum:- host- device- items:- const: defaultpinctrl-0: maxItems: 1
@@ -357,17 +346,15 @@ allOf: - const: active else: properties:
pinctrl-2:This should be implicitly allowed. Is it not?
No, it errored out for me.
I'm reallly at a loss as to what problem this patch solves.
Specifying all 3 pin states is impossible with the current state of this binding, even though it's a supported configuration (check qcom/apq8039-t2.dtb). I should have been more clear in the commit message.
Konrad
maxItems: 1pinctrl-names: minItems: 1
maxItems: 2oneOf:- items:- const: default- enum:- host- device- items:- const: default
items:- const: default- const: host- const: device
- if: properties: compatible:
-- 2.41.0
The description of reg[1] says that register is optional. Adjust minItems to make it truly optional.
Fixes: 12f40018b6a9 ("dt-bindings: arm: msm: Convert kpss-acc driver Documentation to yaml") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org --- Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.yaml | 1 + 1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.yaml b/Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.yaml index 5e16121d9f0d..75b6287db2c9 100644 --- a/Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.yaml +++ b/Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.yaml @@ -22,6 +22,7 @@ properties: - qcom,kpss-acc-v2
reg: + minItems: 1 items: - description: Base address and size of the register region - description: Optional base address and size of the alias register region
On Tue, 27 Jun 2023 18:24:25 +0200, Konrad Dybcio wrote:
The description of reg[1] says that register is optional. Adjust minItems to make it truly optional.
Fixes: 12f40018b6a9 ("dt-bindings: arm: msm: Convert kpss-acc driver Documentation to yaml") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org
Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.yaml | 1 + 1 file changed, 1 insertion(+)
Acked-by: Rob Herring robh@kernel.org
On 27/06/2023 18:24, Konrad Dybcio wrote:
The description of reg[1] says that register is optional. Adjust minItems to make it truly optional.
Fixes: 12f40018b6a9 ("dt-bindings: arm: msm: Convert kpss-acc driver Documentation to yaml") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org
This patch does not make sense. It wasn't also tested. The code (minItems) is already there.
Best regards, Krzysztof
On 24/07/2023 11:05, Krzysztof Kozlowski wrote:
On 27/06/2023 18:24, Konrad Dybcio wrote:
The description of reg[1] says that register is optional. Adjust minItems to make it truly optional.
Fixes: 12f40018b6a9 ("dt-bindings: arm: msm: Convert kpss-acc driver Documentation to yaml") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org
This patch does not make sense. It wasn't also tested. The code (minItems) is already there.
What's more - there is no such commit as 12f40018b6a9!
Bjorn, You might find this useful (fake Fixes tag should be detected): https://github.com/krzk/tools/blob/master/linux/git-hooks-post-commit
Best regards, Krzysztof
MSM8996, similarly to SDM660 has two DWC3 controllers: one for SS and another one for HS operation. Allow just specifying the HS interrupt in the latter case.
Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org --- Documentation/devicetree/bindings/usb/qcom,dwc3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml b/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml index aca20aa8f504..beaeba47a150 100644 --- a/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +++ b/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml @@ -394,7 +394,6 @@ allOf: contains: enum: - qcom,msm8953-dwc3 - - qcom,msm8996-dwc3 - qcom,msm8998-dwc3 - qcom,sm6115-dwc3 then: @@ -411,6 +410,7 @@ allOf: compatible: contains: enum: + - qcom,msm8996-dwc3 - qcom,sdm660-dwc3 then: properties:
On Tue, 27 Jun 2023 18:24:26 +0200, Konrad Dybcio wrote:
MSM8996, similarly to SDM660 has two DWC3 controllers: one for SS and another one for HS operation. Allow just specifying the HS interrupt in the latter case.
Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org
Documentation/devicetree/bindings/usb/qcom,dwc3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Acked-by: Rob Herring robh@kernel.org
The interrupt line was previously not described. Take care of that.
Fixes: 1e39255ed29d ("arm64: dts: msm8996: Add device node for qcom,dwc3") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 85d9d12f0c2c..7771d2909120 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -3386,6 +3386,9 @@ usb2: usb@76f8800 { #size-cells = <1>; ranges;
+ interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "hs_phy_irq"; + clocks = <&gcc GCC_PERIPH_NOC_USB20_AHB_CLK>, <&gcc GCC_USB20_MASTER_CLK>, <&gcc GCC_USB20_MOCK_UTMI_CLK>,
On Tue, 27 Jun 2023 18:24:16 +0200, Konrad Dybcio wrote:
This series contains couple more random dt schema warning fixes, centered around linux-msm.
All of the patches (except) the last two are pretty much independent. Patch 1 is not only a bindings fix, but also a functional one.
[...]
Applied, thanks!
[01/11] arm64: dts: qcom: sc7180: Fix DSI0_PHY reg-names commit: afc19e3716c3bc32c31baac54e3a9057661979ad [02/11] arm64: dts: qcom: msm8939: Drop "qcom,idle-state-spc" compatible commit: 982f810fc196002808b6d4230ba8f431c993d264 [03/11] arm64: dts: qcom: msm8939: Add missing 'cache-unified' to L2 commit: 68a59251f1c590ad567ff7fd799f6634fbab6e16 [04/11] arm64: dts: qcom: apq8039-t2: Drop inexistent property commit: 9cc6dee9b3a8aea0af836d365793ffce47bc7a11 [11/11] arm64: dts: qcom: msm8996: Add missing interrupt to the USB2 controller commit: 36541089c4733355ed844c67eebd0c3936953454
Best regards,
On Tue, 27 Jun 2023 18:24:16 +0200, Konrad Dybcio wrote:
This series contains couple more random dt schema warning fixes, centered around linux-msm.
All of the patches (except) the last two are pretty much independent. Patch 1 is not only a bindings fix, but also a functional one.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[05/11] dt-bindings: sound: Convert pm8916-wcd-analog-codec to YAML commit: e125891c2ed6f6d3f59375caf04d76802c86efae
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
On Tue, 27 Jun 2023 18:24:16 +0200, Konrad Dybcio wrote:
This series contains couple more random dt schema warning fixes, centered around linux-msm.
All of the patches (except) the last two are pretty much independent. Patch 1 is not only a bindings fix, but also a functional one.
[...]
Applied, thanks!
[09/11] dt-bindings: arm: msm: kpss-acc: Make the optional reg truly optional commit: 981be238e1d28e156aa9da2a8722f86f02fd0453
Best regards,
participants (9)
-
Benjamin Li -
Bjorn Andersson -
Bryan O'Donoghue -
Doug Anderson -
Konrad Dybcio -
Krzysztof Kozlowski -
Lee Jones -
Mark Brown -
Rob Herring