redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

MLK-20524 ARM64: dts: imx8qm-mek: enable sai0 in domu car 

Android auto use sai0 for bluetooth phone audio output,
so enable sai0 for android auto.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit cadfe60f5cd87f80de1a30624861296a21f581fb)
pull/10/head
Peng Fan 2018-12-06 10:04:51 +08:00
parent 3612d5be22
commit b87a171d5c
4 changed files with 76 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-dom0.dts
View File

@ -146,6 +146,10 @@
/* usbotg3 */
SC_R_USB_2
SC_R_USB_2_PHY
/* SAI0 */
SC_R_DMA_2_CH12
SC_R_DMA_2_CH13
SC_R_SAI_0
/* ESAI0 */
SC_R_DMA_2_CH6
SC_R_DMA_2_CH7
@ -212,6 +216,12 @@
SC_P_MIPI_CSI0_GPIO0_00
SC_P_MIPI_CSI0_GPIO0_01
/* SAI0 */
SC_P_SPI0_CS1
SC_P_SPI2_CS1
SC_P_SAI1_RXFS
SC_P_SAI1_RXC
/* ESAI0 */
SC_P_ESAI0_FSR
SC_P_ESAI0_FST
@ -412,13 +422,19 @@
<SC_R_DMA_2_CH4>,
<SC_R_DMA_2_CH5>,
<SC_R_DMA_2_CH6>,
<SC_R_DMA_2_CH7>;
<SC_R_DMA_2_CH7>,
<SC_R_DMA_2_CH12>,
<SC_R_DMA_2_CH13>;
};
&edma21 {
xen,passthrough;
};
&edma24 {
xen,passthrough;
};
/*
* SMMU, for simplity, we put all all the resources needs to programmed
* for VPU under vpu_decoder node, then in cfg file only add vpu_decoder
@ -823,6 +839,14 @@
xen,passthrough;
};
&sai0 {
xen,passthrough;
};
&aud_sai_0_lpcg {
xen,passthrough;
};
&esai0 {
xen,passthrough;
};

30
arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu-car.dts
View File

@ -40,21 +40,49 @@
bt-power-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
status ="okay";
};
sound-xtor {
compatible = "fsl,imx-audio-xtor";
model = "xtor-audio";
cpu-dai = <&sai0>;
status = "okay";
};
};
&iomuxc {
imx8qm-mek {
pinctrl_mipi_csi0_en_rst: mipi_csi0_en_rst {
fsl,pins = <
SC_P_MIPI_CSI0_GPIO0_00_LSIO_GPIO1_IO27 0x00000021
SC_P_MIPI_CSI0_GPIO0_01_LSIO_GPIO1_IO28 0x00000021
>;
};
pinctrl_sai0: sai0grp {
fsl,pins = <
SC_P_SPI0_CS1_AUD_SAI0_TXC 0x0600004c
SC_P_SPI2_CS1_AUD_SAI0_TXFS 0x0600004c
SC_P_SAI1_RXFS_AUD_SAI0_RXD 0x0600004c
SC_P_SAI1_RXC_AUD_SAI0_TXD 0x0600006c
>;
};
};
};
/delete-node/ &i2c1_lvds1;
/delete-node/ &i2c0_mipi_csi0;
&sai0 {
assigned-clocks = <&clk IMX8QM_AUD_PLL0_DIV>,
<&clk IMX8QM_AUD_ACM_AUD_PLL_CLK0_DIV>,
<&clk IMX8QM_AUD_ACM_AUD_REC_CLK0_DIV>,
<&clk IMX8QM_AUD_SAI_0_MCLK>;
assigned-clock-rates = <786432000>, <49152000>, <12288000>, <49152000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sai0>;
status = "okay";
};
&can_rpmsg {
#address-cells = <2>;
#size-cells = <2>;

19
arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu.dts
View File

@ -394,6 +394,21 @@
status = "okay";
};
edma24: dma-controller@0x592c0000 {
compatible = "fsl,imx8qm-adma";
reg = <0x0 0x592c0000 0x0 0x10000>, /* sai0 rx */
<0x0 0x592d0000 0x0 0x10000>; /* sai0 tx */
#dma-cells = <3>;
shared-interrupt;
dma-channels = <2>;
interrupts = <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>, /* sai0 */
<GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "edma2-chan12-rx", "edma2-chan13-tx"; /* sai0 */
fsl,sc_rsrc_id = <SC_R_DMA_2_CH12>,
<SC_R_DMA_2_CH13>;
status = "okay";
};
sound-cs42888 {
compatible = "fsl,imx8qm-sabreauto-cs42888",
"fsl,imx-audio-cs42888";
@ -790,7 +805,9 @@
/delete-node/ &spdif0;
/delete-node/ &spdif1;
/delete-node/ &sai1;
/delete-node/ &sai0;
&sai0 {
dmas = <&edma24 12 0 1>, <&edma24 13 0 0>;
};
/delete-node/ &sai2;
/delete-node/ &sai3;
/delete-node/ &sai_hdmi_rx;

4
arch/arm64/boot/dts/freescale/fsl-imx8qm-xen.dtsi
View File

@ -381,6 +381,10 @@
aud_ocram_lpcg: aud_ocram_lpcg {
reg = <0x0 0x59590000 0x0 0x1000>;
};
aud_sai_0_lpcg: aud_sai_0_lpcg {
reg = <0x0 0x59440000 0x0 0x1000>;
};
};
/delete-node/ &edma0;