2023-05-07 17:56:21

by Krzysztof Kozlowski

[permalink] [raw]
Subject: [PATCH 1/3] arm64: dts: qcom: msm8916: correct LPASS CPU clocks order

Re-order the clocks for LPASS CPU node to match the bindings (Linux
driver takes by name):

msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:1: 'mi2s-bit-clk0' was expected
msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:2: 'mi2s-bit-clk1' was expected
msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:3: 'mi2s-bit-clk2' was expected
msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:4: 'mi2s-bit-clk3' was expected
msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:5: 'pcnoc-mport-clk' was expected
msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:6: 'pcnoc-sway-clk' was expected

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/qcom/msm8916.dtsi | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index bf88c10ff55b..e7ae81296b20 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1520,20 +1520,20 @@ lpass: audio-controller@7708000 {
* Primary/Secondary MI2S both use the PRI_I2S_CLK.
*/
clocks = <&gcc GCC_ULTAUDIO_AHBFABRIC_IXFABRIC_CLK>,
- <&gcc GCC_ULTAUDIO_PCNOC_MPORT_CLK>,
- <&gcc GCC_ULTAUDIO_PCNOC_SWAY_CLK>,
<&gcc GCC_ULTAUDIO_LPAIF_PRI_I2S_CLK>,
<&gcc GCC_ULTAUDIO_LPAIF_PRI_I2S_CLK>,
<&gcc GCC_ULTAUDIO_LPAIF_SEC_I2S_CLK>,
- <&gcc GCC_ULTAUDIO_LPAIF_AUX_I2S_CLK>;
+ <&gcc GCC_ULTAUDIO_LPAIF_AUX_I2S_CLK>,
+ <&gcc GCC_ULTAUDIO_PCNOC_MPORT_CLK>,
+ <&gcc GCC_ULTAUDIO_PCNOC_SWAY_CLK>;

clock-names = "ahbix-clk",
- "pcnoc-mport-clk",
- "pcnoc-sway-clk",
"mi2s-bit-clk0",
"mi2s-bit-clk1",
"mi2s-bit-clk2",
- "mi2s-bit-clk3";
+ "mi2s-bit-clk3",
+ "pcnoc-mport-clk",
+ "pcnoc-sway-clk";
#sound-dai-cells = <1>;

interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>;
--
2.34.1


2023-05-07 17:56:54

by Krzysztof Kozlowski

[permalink] [raw]
Subject: [PATCH 3/3] arm64: dts: qcom: apq8096: fix fixed regulator name property

Correct the typo in 'regulator-name' property.

apq8096-ifc6640.dtb: v1p05-regulator: 'regulator-name' is a required property
apq8096-ifc6640.dtb: v1p05-regulator: Unevaluated properties are not allowed ('reglator-name' was unexpected)

Fixes: 6cbdec2d3ca6 ("arm64: dts: qcom: msm8996: Introduce IFC6640")
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
index 71e0a500599c..ed2e2f6c6775 100644
--- a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
@@ -26,7 +26,7 @@ chosen {

v1p05: v1p05-regulator {
compatible = "regulator-fixed";
- reglator-name = "v1p05";
+ regulator-name = "v1p05";
regulator-always-on;
regulator-boot-on;

@@ -38,7 +38,7 @@ v1p05: v1p05-regulator {

v12_poe: v12-poe-regulator {
compatible = "regulator-fixed";
- reglator-name = "v12_poe";
+ regulator-name = "v12_poe";
regulator-always-on;
regulator-boot-on;

--
2.34.1

2023-05-07 18:12:21

by Krzysztof Kozlowski

[permalink] [raw]
Subject: [PATCH 2/3] arm64: dts: qcom: msm8996: correct MMCC clocks order

Re-order the clocks for MMCC clock controller node to match the bindings (Linux
driver takes by name):

msm8996-mtp.dtb: clock-controller@8c0000: clock-names:1: 'gpll0' was expected
msm8996-mtp.dtb: clock-controller@8c0000: clock-names:2: 'gcc_mmss_noc_cfg_ahb_clk' was expected

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index fe9e1cb12a73..718007cfb10e 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -939,16 +939,16 @@ mmcc: clock-controller@8c0000 {
#power-domain-cells = <1>;
reg = <0x008c0000 0x40000>;
clocks = <&xo_board>,
- <&gcc GCC_MMSS_NOC_CFG_AHB_CLK>,
<&gcc GPLL0>,
+ <&gcc GCC_MMSS_NOC_CFG_AHB_CLK>,
<&dsi0_phy 1>,
<&dsi0_phy 0>,
<&dsi1_phy 1>,
<&dsi1_phy 0>,
<&hdmi_phy>;
clock-names = "xo",
- "gcc_mmss_noc_cfg_ahb_clk",
"gpll0",
+ "gcc_mmss_noc_cfg_ahb_clk",
"dsi0pll",
"dsi0pllbyte",
"dsi1pll",
--
2.34.1

2023-05-08 08:02:24

by Konrad Dybcio

[permalink] [raw]
Subject: Re: [PATCH 1/3] arm64: dts: qcom: msm8916: correct LPASS CPU clocks order



On 7.05.2023 19:45, Krzysztof Kozlowski wrote:
> Re-order the clocks for LPASS CPU node to match the bindings (Linux
> driver takes by name):
>
> msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:1: 'mi2s-bit-clk0' was expected
> msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:2: 'mi2s-bit-clk1' was expected
> msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:3: 'mi2s-bit-clk2' was expected
> msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:4: 'mi2s-bit-clk3' was expected
> msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:5: 'pcnoc-mport-clk' was expected
> msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:6: 'pcnoc-sway-clk' was expected
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>

Konrad
> arch/arm64/boot/dts/qcom/msm8916.dtsi | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
> index bf88c10ff55b..e7ae81296b20 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
> @@ -1520,20 +1520,20 @@ lpass: audio-controller@7708000 {
> * Primary/Secondary MI2S both use the PRI_I2S_CLK.
> */
> clocks = <&gcc GCC_ULTAUDIO_AHBFABRIC_IXFABRIC_CLK>,
> - <&gcc GCC_ULTAUDIO_PCNOC_MPORT_CLK>,
> - <&gcc GCC_ULTAUDIO_PCNOC_SWAY_CLK>,
> <&gcc GCC_ULTAUDIO_LPAIF_PRI_I2S_CLK>,
> <&gcc GCC_ULTAUDIO_LPAIF_PRI_I2S_CLK>,
> <&gcc GCC_ULTAUDIO_LPAIF_SEC_I2S_CLK>,
> - <&gcc GCC_ULTAUDIO_LPAIF_AUX_I2S_CLK>;
> + <&gcc GCC_ULTAUDIO_LPAIF_AUX_I2S_CLK>,
> + <&gcc GCC_ULTAUDIO_PCNOC_MPORT_CLK>,
> + <&gcc GCC_ULTAUDIO_PCNOC_SWAY_CLK>;
>
> clock-names = "ahbix-clk",
> - "pcnoc-mport-clk",
> - "pcnoc-sway-clk",
> "mi2s-bit-clk0",
> "mi2s-bit-clk1",
> "mi2s-bit-clk2",
> - "mi2s-bit-clk3";
> + "mi2s-bit-clk3",
> + "pcnoc-mport-clk",
> + "pcnoc-sway-clk";
> #sound-dai-cells = <1>;
>
> interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>;

2023-05-08 08:23:33

by Konrad Dybcio

[permalink] [raw]
Subject: Re: [PATCH 3/3] arm64: dts: qcom: apq8096: fix fixed regulator name property



On 7.05.2023 19:45, Krzysztof Kozlowski wrote:
> Correct the typo in 'regulator-name' property.
>
> apq8096-ifc6640.dtb: v1p05-regulator: 'regulator-name' is a required property
> apq8096-ifc6640.dtb: v1p05-regulator: Unevaluated properties are not allowed ('reglator-name' was unexpected)
dt-schema is a blessing

>
> Fixes: 6cbdec2d3ca6 ("arm64: dts: qcom: msm8996: Introduce IFC6640")
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>

Konrad
> arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
> index 71e0a500599c..ed2e2f6c6775 100644
> --- a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
> +++ b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
> @@ -26,7 +26,7 @@ chosen {
>
> v1p05: v1p05-regulator {
> compatible = "regulator-fixed";
> - reglator-name = "v1p05";
> + regulator-name = "v1p05";
> regulator-always-on;
> regulator-boot-on;
>
> @@ -38,7 +38,7 @@ v1p05: v1p05-regulator {
>
> v12_poe: v12-poe-regulator {
> compatible = "regulator-fixed";
> - reglator-name = "v12_poe";
> + regulator-name = "v12_poe";
> regulator-always-on;
> regulator-boot-on;
>

2023-05-08 08:25:28

by Konrad Dybcio

[permalink] [raw]
Subject: Re: [PATCH 2/3] arm64: dts: qcom: msm8996: correct MMCC clocks order



On 7.05.2023 19:45, Krzysztof Kozlowski wrote:
> Re-order the clocks for MMCC clock controller node to match the bindings (Linux
> driver takes by name):
>
> msm8996-mtp.dtb: clock-controller@8c0000: clock-names:1: 'gpll0' was expected
> msm8996-mtp.dtb: clock-controller@8c0000: clock-names:2: 'gcc_mmss_noc_cfg_ahb_clk' was expected
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>

Konrad
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index fe9e1cb12a73..718007cfb10e 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -939,16 +939,16 @@ mmcc: clock-controller@8c0000 {
> #power-domain-cells = <1>;
> reg = <0x008c0000 0x40000>;
> clocks = <&xo_board>,
> - <&gcc GCC_MMSS_NOC_CFG_AHB_CLK>,
> <&gcc GPLL0>,
> + <&gcc GCC_MMSS_NOC_CFG_AHB_CLK>,
> <&dsi0_phy 1>,
> <&dsi0_phy 0>,
> <&dsi1_phy 1>,
> <&dsi1_phy 0>,
> <&hdmi_phy>;
> clock-names = "xo",
> - "gcc_mmss_noc_cfg_ahb_clk",
> "gpll0",
> + "gcc_mmss_noc_cfg_ahb_clk",
> "dsi0pll",
> "dsi0pllbyte",
> "dsi1pll",

2023-05-27 01:11:00

by Bjorn Andersson

[permalink] [raw]
Subject: Re: (subset) [PATCH 1/3] arm64: dts: qcom: msm8916: correct LPASS CPU clocks order

On Sun, 7 May 2023 19:45:14 +0200, Krzysztof Kozlowski wrote:
> Re-order the clocks for LPASS CPU node to match the bindings (Linux
> driver takes by name):
>
> msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:1: 'mi2s-bit-clk0' was expected
> msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:2: 'mi2s-bit-clk1' was expected
> msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:3: 'mi2s-bit-clk2' was expected
> msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:4: 'mi2s-bit-clk3' was expected
> msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:5: 'pcnoc-mport-clk' was expected
> msm8916-asus-z00l.dtb: audio-controller@7708000: clock-names:6: 'pcnoc-sway-clk' was expected
>
> [...]

Applied, thanks!

[1/3] arm64: dts: qcom: msm8916: correct LPASS CPU clocks order
commit: 9903258a937b47b78d18c7cb8e342ccbb671d8c2
[2/3] arm64: dts: qcom: msm8996: correct MMCC clocks order
commit: 3e8188b4b6c76bfa5c5389384bea2719a1271327
[3/3] arm64: dts: qcom: apq8096: fix fixed regulator name property
commit: c77612a07d18d4425fd8ddd532a8a9b8e1970c53

Best regards,
--
Bjorn Andersson <[email protected]>