diff options
| author | Andy Duan <fugang.duan@nxp.com> | 2016-10-31 17:18:06 +0800 |
|---|---|---|
| committer | Robby Cai <robby.cai@nxp.com> | 2016-11-16 15:55:50 +0800 |
| commit | 230a6caa3b080d444f51e43cac908ed0c58368bd (patch) | |
| tree | cec68f179b2a21d2c8bffa2b968321be78568db7 /arch/arm/boot/dts/imx6sll.dtsi | |
| parent | 321ca96f6f83f3df31974968d0ae65f1ab34d5b8 (diff) | |
MLK-13413 ARM: imx6sll-evk: add Murata Type ZP (BCM4339) module support
Add Murata Type ZP (BCM4339) module support on i.MX6SLL platforms:
- i.MX6SLL EVK (SD3 slot + BT connector) + Murata adapter V2.0
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
(cherry picked from commit b1a04e6ed6345e854a6692740fe447186b99f27c)
Diffstat (limited to 'arch/arm/boot/dts/imx6sll.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6sll.dtsi | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi index 45e38b02e02c..74353727b7b6 100644 --- a/arch/arm/boot/dts/imx6sll.dtsi +++ b/arch/arm/boot/dts/imx6sll.dtsi @@ -28,9 +28,9 @@ mmc2 = &usdhc3; serial0 = &uart1; serial1 = &uart2; - serial3 = &uart3; - serial4 = &uart4; - serial5 = &uart5; + serial2 = &uart3; + serial3 = &uart4; + serial4 = &uart5; spi0 = &ecspi1; spi1 = &ecspi2; spi3 = &ecspi3; @@ -263,7 +263,7 @@ }; uart4: serial@02018000 { - compatible = "fsl,imx6sll-uart", "fsl-imx21-uart"; + compatible = "fsl,imx6sll-uart", "fsl,imx6q-uart", "fsl-imx21-uart"; reg = <0x02018000 0x4000>; interrupts =<GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; dmas = <&sdma 31 4 0>, <&sdma 32 4 0>; @@ -287,7 +287,7 @@ }; uart2: serial@02024000 { - compatible = "fsl,imx6sll-uart", "fsl,imx21-uart"; + compatible = "fsl,imx6sll-uart", "fsl,imx6q-uart", "fsl-imx21-uart"; reg = <0x02024000 0x4000>; interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>; dmas = <&sdma 27 4 0>, <&sdma 28 4 0>; @@ -338,7 +338,7 @@ }; uart3: serial@02034000 { - compatible = "fsl,imx6sll-uart", "fsl,imx21-uart"; + compatible = "fsl,imx6sll-uart", "fsl,imx6q-uart", "fsl-imx21-uart"; reg = <0x02034000 0x4000>; interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; dmas = <&sdma 29 4 0>, <&sdma 30 4 0>; @@ -520,6 +520,7 @@ fsl,tempmon = <&anatop>; fsl,tempmon-data = <&ocotp>; clocks = <&clks IMX6SLL_CLK_PLL3_USB_OTG>; + status = "disabled"; }; usbphy1: usbphy@020c9000 { @@ -834,7 +835,7 @@ }; uart5: serial@021f4000 { - compatible = "fsl,imx6sll-uart", "fsl-imx21-uart"; + compatible = "fsl,imx6sll-uart", "fsl,imx6q-uart", "fsl-imx21-uart"; reg = <0x021f4000 0x4000>; interrupts =<GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; dmas = <&sdma 33 4 0>, <&sdma 34 4 0>; |