lkml.org 
[lkml]   [2022]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 63/68] ARM: dts: imx7: Use audio_mclk_post_div instead audio_mclk_root_clk
    Date
    From: Abel Vesa <abel.vesa@nxp.com>

    commit 4cb7df64c732b2b9918424095c11660c2a8c4a33 upstream.

    The audio_mclk_root_clk was added as a gate with the CCGR121 (0x4790),
    but according to the reference manual, there is no such gate. Moreover,
    the consumer driver of the mentioned clock might gate it and leave
    the ECSPI2 (the true owner of that gate) hanging. So lets use the
    audio_mclk_post_div, which is the parent.

    Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
    Signed-off-by: Shawn Guo <shawnguo@kernel.org>
    [ps: backport to 5.4]
    Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/arm/boot/dts/imx7-colibri.dtsi | 4 ++--
    arch/arm/boot/dts/imx7-mba7.dtsi | 2 +-
    arch/arm/boot/dts/imx7d-nitrogen7.dts | 2 +-
    arch/arm/boot/dts/imx7d-pico-hobbit.dts | 4 ++--
    arch/arm/boot/dts/imx7d-pico-pi.dts | 4 ++--
    arch/arm/boot/dts/imx7d-sdb.dts | 2 +-
    arch/arm/boot/dts/imx7s-warp.dts | 4 ++--
    7 files changed, 11 insertions(+), 11 deletions(-)

    --- a/arch/arm/boot/dts/imx7-colibri.dtsi
    +++ b/arch/arm/boot/dts/imx7-colibri.dtsi
    @@ -77,7 +77,7 @@

    dailink_master: simple-audio-card,codec {
    sound-dai = <&codec>;
    - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
    + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
    };
    };
    };
    @@ -152,7 +152,7 @@
    compatible = "fsl,sgtl5000";
    #sound-dai-cells = <0>;
    reg = <0x0a>;
    - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
    + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
    pinctrl-names = "default";
    pinctrl-0 = <&pinctrl_sai1_mclk>;
    VDDA-supply = <&reg_module_3v3_avdd>;
    --- a/arch/arm/boot/dts/imx7-mba7.dtsi
    +++ b/arch/arm/boot/dts/imx7-mba7.dtsi
    @@ -250,7 +250,7 @@
    tlv320aic32x4: audio-codec@18 {
    compatible = "ti,tlv320aic32x4";
    reg = <0x18>;
    - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
    + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
    clock-names = "mclk";
    ldoin-supply = <&reg_audio_3v3>;
    iov-supply = <&reg_audio_3v3>;
    --- a/arch/arm/boot/dts/imx7d-nitrogen7.dts
    +++ b/arch/arm/boot/dts/imx7d-nitrogen7.dts
    @@ -284,7 +284,7 @@
    codec: wm8960@1a {
    compatible = "wlf,wm8960";
    reg = <0x1a>;
    - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
    + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
    clock-names = "mclk";
    wlf,shared-lrclk;
    };
    --- a/arch/arm/boot/dts/imx7d-pico-hobbit.dts
    +++ b/arch/arm/boot/dts/imx7d-pico-hobbit.dts
    @@ -31,7 +31,7 @@

    dailink_master: simple-audio-card,codec {
    sound-dai = <&sgtl5000>;
    - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
    + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
    };
    };
    };
    @@ -41,7 +41,7 @@
    #sound-dai-cells = <0>;
    reg = <0x0a>;
    compatible = "fsl,sgtl5000";
    - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
    + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
    VDDA-supply = <&reg_2p5v>;
    VDDIO-supply = <&reg_vref_1v8>;
    };
    --- a/arch/arm/boot/dts/imx7d-pico-pi.dts
    +++ b/arch/arm/boot/dts/imx7d-pico-pi.dts
    @@ -31,7 +31,7 @@

    dailink_master: simple-audio-card,codec {
    sound-dai = <&sgtl5000>;
    - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
    + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
    };
    };
    };
    @@ -41,7 +41,7 @@
    #sound-dai-cells = <0>;
    reg = <0x0a>;
    compatible = "fsl,sgtl5000";
    - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
    + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
    VDDA-supply = <&reg_2p5v>;
    VDDIO-supply = <&reg_vref_1v8>;
    };
    --- a/arch/arm/boot/dts/imx7d-sdb.dts
    +++ b/arch/arm/boot/dts/imx7d-sdb.dts
    @@ -356,7 +356,7 @@
    codec: wm8960@1a {
    compatible = "wlf,wm8960";
    reg = <0x1a>;
    - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
    + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
    clock-names = "mclk";
    wlf,shared-lrclk;
    };
    --- a/arch/arm/boot/dts/imx7s-warp.dts
    +++ b/arch/arm/boot/dts/imx7s-warp.dts
    @@ -75,7 +75,7 @@

    dailink_master: simple-audio-card,codec {
    sound-dai = <&codec>;
    - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
    + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
    };
    };
    };
    @@ -232,7 +232,7 @@
    #sound-dai-cells = <0>;
    reg = <0x0a>;
    compatible = "fsl,sgtl5000";
    - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
    + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
    pinctrl-names = "default";
    pinctrl-0 = <&pinctrl_sai1_mclk>;
    VDDA-supply = <&vgen4_reg>;

    \
     
     \ /
      Last update: 2022-05-23 19:24    [W:4.815 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site