ENGR00303300-2 arm: dts: Add MLB50 dts support on i.MX6SX-17x17-arm2 board.

Add MLB50 devicetree support on i.MX6SX-17x17-arm2 platform. Since the MLB50 has
pin conflict with usdhc2 on i.MX6SX-17x17-arm2 board, add an extra dts file to
enable mlb and disable usdhc2.

Signed-off-by: Luwei Zhou <b45643@freescale.com>

diff --git a/arch/arm/boot/dts/imx6sx-17x17-arm2-mlb.dts b/arch/arm/boot/dts/imx6sx-17x17-arm2-mlb.dts
new file mode 100644 (file)
index 0000000..1a64bec
--- /dev/null
+++ b/arch/arm/boot/dts/imx6sx-17x17-arm2-mlb.dts
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2014 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx6sx-17x17-arm2.dts"
+
+&mlb {
+       status = "okay";
+};
+
+&usdhc2 {
+       /* pin conflict with mlb */
+       status = "disabled";
+};

diff --git a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
index 7021c39d9d1e0b1dc2bfd1f16cd2af6b98d14355..8594ff5bdc1acccae64942d295479ea08e8a85fc 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
@@ -367,6 +367,12 @@
        };
 };
 
+&mlb {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_mlb_1>;
+       status = "disabled";/* pin conflict with usdhc2*/
+};
+
 &pwm3 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pwm3_0>;

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index fd9dc35c1212e8207eef633c17b108e378dcbbf2..d2444976db5b93cba2ad01ec385371a1c6989d13 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -561,6 +561,16 @@
                                status = "disabled";
                         };
 
+                       mlb: mlb@0218c000 {
+                               compatible = "fsl,imx6sx-mlb50";
+                               reg = <0x0218c000 0x4000>;
+                               interrupts = <0 53 0x04 0 117 0x04 0 126 0x04>;
+                               clocks = <&clks IMX6SX_CLK_MLB>;
+                               clock-names = "mlb";
+                               iram = <&ocram>;
+                               status = "disabled";
+                       };
+
                        fec2: ethernet@021b4000 {
                                compatible = "fsl,imx6sx-fec";
                                reg = <0x021b4000 0x4000>;
@@ -1013,6 +1023,16 @@
                };
        };
 
+       mlb {
+               pinctrl_mlb_1: mlbgrp-1 {
+                       fsl,pins = <
+                               MX6SX_PAD_SD2_DATA3__MLB_DATA   0x31
+                               MX6SX_PAD_SD2_CLK__MLB_SIG      0x31
+                               MX6SX_PAD_SD2_CMD__MLB_CLK      0x31
+                       >;
+               };
+       };
+
        pwm3 {
                pinctrl_pwm3_0: pwm3grp-0 {
                        fsl,pins = <