diff options
| author | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:29:01 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:29:01 +0800 |
| commit | f4602255988c23ed729cb9e999c4caf2853142e6 (patch) | |
| tree | 18c65e98323127d5fad5e47cdffa305c1f83335f /arch/arm/boot/dts/imx6q.dtsi | |
| parent | 2cfd89e75ffe516e54c871eca15f55ee5a9520af (diff) | |
| parent | 01382574cc0f67e2c9652acacfb141df1eb29f4e (diff) | |
Merge branch 'topic/lt-3.2-imx6-audio' into lt-3.2-imx6
* topic/lt-3.2-imx6-audio: (28 commits)
make sgtl5000 work -- need to split to small patch
ENGR00154525 SDMA: SDMA not works when event number bigger than 32
arm/imx6q: add cko1 clock
arm/imx6q: add imx-sgtl5000 device from sabrelite board
fw/imx: add sdma-imx6q-to1.bin.ihex
dts/imx6q: add sdma script
ARM: imx6q-sabrelite: add audmux
ARM: mxc/audmux-v2: add dt support
dma/imx-sdma: let imx6q choose dma driver
dts/imx6q: add ssi
alsa/imx-ssi: rename fsl,ssi-asynchronous-mode to fsl,ssi-synchronous-mode
ASoC: imx-ssi: add device tree probe support
dts/imx6q-sabrelite: add sgtl5000 audio codec
regulator/fixed: set apply_uV 0
dts/imx6q-sabrelite: add 2P5V and 3P3V regulators
regulator: pass device_node to of_get_regulator_init_data()
regulator: If a single voltage is set with device tree then set apply_uV
regulator: Fix regulator_register() API signature in Documentation
regulator: fix label names used in device tree bindings
regulator: Avoid potential NULL dereference in reg_fixed_voltage_probe()
...
Diffstat (limited to 'arch/arm/boot/dts/imx6q.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6q.dtsi | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index 8ba41e06a4e..519f60072ea 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -185,18 +185,27 @@ }; ssi@02028000 { /* SSI1 */ + compatible = "fsl,imx6q-ssi", "fsl,imx1-ssi"; reg = <0x02028000 0x4000>; interrupts = <0 46 0x04>; + fsl,dma-events = <38 37>; + status = "disabled"; }; ssi@0202c000 { /* SSI2 */ + compatible = "fsl,imx6q-ssi", "fsl,imx1-ssi"; reg = <0x0202c000 0x4000>; interrupts = <0 47 0x04>; + fsl,dma-events = <42 41>; + status = "disabled"; }; ssi@02030000 { /* SSI3 */ + compatible = "fsl,imx6q-ssi", "fsl,imx1-ssi"; reg = <0x02030000 0x4000>; interrupts = <0 48 0x04>; + fsl,dma-events = <46 45>; + status = "disabled"; }; asrc@02034000 { @@ -422,6 +431,7 @@ compatible = "fsl,imx6q-sdma", "fsl,imx35-sdma"; reg = <0x020ec000 0x4000>; interrupts = <0 2 0x04>; + fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q-to1.bin"; }; }; @@ -550,7 +560,9 @@ }; audmux@021d8000 { + compatible = "fsl,audmux-v2"; reg = <0x021d8000 0x4000>; + status = "disabled"; }; mipi@021dc000 { /* MIPI-CSI */ |