diff options
author | Shengjiu Wang <shengjiu.wang@nxp.com> | 2017-12-04 10:20:34 +0800 |
---|---|---|
committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:29:37 +0800 |
commit | 75700863d53e98bb913a3fb7c18ad3adfb1ddf78 (patch) | |
tree | 032e029bba8e8c741a20bde0af18cb4d8ae1ea85 /arch/arm | |
parent | 73a7411379f4dac82787673a4167dcd9d4287d43 (diff) |
MLK-15985-3: ARM: dts: imx6sx: set frequency for S20_3LE format
Select a proper frequency for S20_3LE/S24_LE/S16_LE. and disable
the SSI2 when mqs enabled, for mqs only support 24.576MHz mclk.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb-mqs.dts | 9 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb.dtsi | 7 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6sx-sdb-mqs.dts b/arch/arm/boot/dts/imx6sx-sdb-mqs.dts index e5ff9fb99013..bf388accfe7d 100644 --- a/arch/arm/boot/dts/imx6sx-sdb-mqs.dts +++ b/arch/arm/boot/dts/imx6sx-sdb-mqs.dts @@ -11,6 +11,11 @@ #include "imx6sx-sdb.dts" / { + + sound { + status = "disabled"; + }; + sound-mqs { compatible = "fsl,imx6sx-sdb-mqs", "fsl,imx-audio-mqs"; @@ -39,6 +44,10 @@ status = "okay"; }; +&ssi2 { + status = "disabled"; +}; + &sdma { gpr = <&gpr>; /* SDMA event remap for SAI1 */ diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi index f0e8255cac4c..156c413ff544 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dtsi +++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi @@ -626,6 +626,13 @@ }; &ssi2 { + assigned-clocks = <&clks IMX6SX_CLK_PLL4>, + <&clks IMX6SX_PLL4_BYPASS>, + <&clks IMX6SX_CLK_SSI2_SEL>; + assigned-clock-parents = <&clks IMX6SX_CLK_OSC>, + <&clks IMX6SX_CLK_PLL4>, + <&clks IMX6SX_CLK_PLL4_AUDIO_DIV>; + assigned-clock-rates = <737280000>, <0>, <0>; status = "okay"; }; |