diff options
| author | Shengjiu Wang <shengjiu.wang@nxp.com> | 2019-10-16 16:19:07 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-11-25 16:08:36 +0800 |
| commit | 4acf3940c9dea18635939283dec428f2fea88626 (patch) | |
| tree | f95cbb340282d4d1ee528ad9e0c238cfaeb725e5 | |
| parent | 55508ab47866dd97cd01579fea715eeefade72ff (diff) | |
ARM64: imx8mm-evk: Move assign clocks of audio PLLs to correct place
Put assigned clocks of audio PLLs in imx8mm-evk.dts, which conflict
with the assigned clocks in imx8mm.
Fixes: 77b5daa55e63 ("ARM64: dts: imx8mm: Enable AK4497/AK4458/AK5558/SPDIF/MICFIL")
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
| -rwxr-xr-x | arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 5 | ||||
| -rwxr-xr-x | arch/arm64/boot/dts/freescale/imx8mm.dtsi | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8mm-evk.dts b/arch/arm64/boot/dts/freescale/imx8mm-evk.dts index ce147b007aa6..0dd0afcbbfdb 100755 --- a/arch/arm64/boot/dts/freescale/imx8mm-evk.dts +++ b/arch/arm64/boot/dts/freescale/imx8mm-evk.dts @@ -150,11 +150,6 @@ cpu-supply = <&buck2_reg>; }; -&clk { - assigned-clocks = <&clk IMX8MM_AUDIO_PLL1>, <&clk IMX8MM_AUDIO_PLL2>; - assigned-clock-rates = <393216000>, <361267200>; -}; - &csi1_bridge { fsl,mipi-mode; status = "okay"; diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi index 4db92096cc84..bc8ccdfd7106 100755 --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi @@ -708,14 +708,18 @@ <&clk IMX8MM_CLK_AUDIO_AHB>, <&clk IMX8MM_CLK_IPG_AUDIO_ROOT>, <&clk IMX8MM_SYS_PLL3>, - <&clk IMX8MM_VIDEO_PLL1>; + <&clk IMX8MM_VIDEO_PLL1>, + <&clk IMX8MM_AUDIO_PLL1>, + <&clk IMX8MM_AUDIO_PLL2>; assigned-clock-parents = <&clk IMX8MM_SYS_PLL3_OUT>, <&clk IMX8MM_SYS_PLL1_800M>; assigned-clock-rates = <0>, <400000000>, <400000000>, <750000000>, - <594000000>; + <594000000>, + <393216000>, + <361267200>; }; src: reset-controller@30390000 { |