diff options
| author | Shengjiu Wang <shengjiu.wang@freescale.com> | 2016-10-14 13:12:11 +0800 |
|---|---|---|
| committer | Robby Cai <robby.cai@nxp.com> | 2016-11-16 15:47:25 +0800 |
| commit | eca52c31e6857dac7c4b78dadd6f8c26deb64837 (patch) | |
| tree | c07d2be70b54e310e1715d17233810dbe42d8cc7 /arch/arm/boot/dts/imx6sll.dtsi | |
| parent | 0e60c97caf0a8a7bbaf35ec927acb1b63ecf64d1 (diff) | |
MLK-13343-2: ARM: dts: imx6sll: enable audio functions
enabled the wm8962 and spdif out.
There is pin conflict between spdif and usdhc2. So add
dedicate spdif dts.
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
(cherry picked from commit 0b125f94a8c77284f11bce3147fb6f18bf47cd16)
Diffstat (limited to 'arch/arm/boot/dts/imx6sll.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6sll.dtsi | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi index d378e7f15801..ddef9bedced8 100644 --- a/arch/arm/boot/dts/imx6sll.dtsi +++ b/arch/arm/boot/dts/imx6sll.dtsi @@ -276,7 +276,7 @@ }; ssi1: ssi@02028000 { - compatible = "fsl,imx6sll-ssi", "fsl-imx51-ssi"; + compatible = "fsl,imx6sll-ssi", "fsl,imx51-ssi"; reg = <0x02028000 0x4000>; interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; dmas = <&sdma 37 22 0>, <&sdma 38 22 0>; @@ -600,13 +600,12 @@ compatible = "fsl,imx6sll-sdma", "fsl,imx35-sdma"; reg = <0x020ec000 0x4000>; interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clks IMX6SLL_CLK_DUMMY>, - <&clks IMX6SLL_CLK_DUMMY>; + clocks = <&clks IMX6SLL_CLK_SDMA>, + <&clks IMX6SLL_CLK_SDMA>; clock-names = "ipg", "ahb"; #dma-cells = <3>; iram = <&ocram>; - fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q-bin"; - status = "disabled"; + fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q.bin"; }; pxp: pxp@020f0000 { |