147 lines
5.2 KiB
Diff
147 lines
5.2 KiB
Diff
diff --git a/arch/arm/boot/dts/imx6dl-hummingboard2.dts b/arch/arm/boot/dts/imx6dl-hummingboard2.dts
|
|
index 99b6cce13175..b12cd87f3f94 100644
|
|
--- a/arch/arm/boot/dts/imx6dl-hummingboard2.dts
|
|
+++ b/arch/arm/boot/dts/imx6dl-hummingboard2.dts
|
|
@@ -45,6 +45,7 @@
|
|
#include "imx6qdl-sr-som.dtsi"
|
|
#include "imx6qdl-sr-som-brcm.dtsi"
|
|
#include "imx6qdl-hummingboard2.dtsi"
|
|
+#include "imx6qdl-hummingboard2-emmc.dtsi"
|
|
|
|
/ {
|
|
model = "SolidRun HummingBoard2 Solo/DualLite";
|
|
diff --git a/arch/arm/boot/dts/imx6q-hummingboard2.dts b/arch/arm/boot/dts/imx6q-hummingboard2.dts
|
|
index fab388a0f673..5249f53dcdbc 100644
|
|
--- a/arch/arm/boot/dts/imx6q-hummingboard2.dts
|
|
+++ b/arch/arm/boot/dts/imx6q-hummingboard2.dts
|
|
@@ -45,6 +45,7 @@
|
|
#include "imx6qdl-sr-som.dtsi"
|
|
#include "imx6qdl-sr-som-brcm.dtsi"
|
|
#include "imx6qdl-hummingboard2.dtsi"
|
|
+#include "imx6qdl-hummingboard2-emmc.dtsi"
|
|
|
|
/ {
|
|
model = "SolidRun HummingBoard2 Dual/Quad";
|
|
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2-emmc.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2-emmc.dtsi
|
|
new file mode 100644
|
|
index 000000000000..1aa97817e751
|
|
--- /dev/null
|
|
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard2-emmc.dtsi
|
|
@@ -0,0 +1,72 @@
|
|
+/*
|
|
+ * Device Tree file for SolidRun HummingBoard2
|
|
+ * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com>
|
|
+ *
|
|
+ * This file is dual-licensed: you can use it either under the terms
|
|
+ * of the GPL or the X11 license, at your option. Note that this dual
|
|
+ * licensing only applies to this file, and not this project as a
|
|
+ * whole.
|
|
+ *
|
|
+ * a) This file is free software; you can redistribute it and/or
|
|
+ * modify it under the terms of the GNU General Public License as
|
|
+ * published by the Free Software Foundation; either version 2 of the
|
|
+ * License.
|
|
+ *
|
|
+ * This file is distributed in the hope that it will be useful,
|
|
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
+ * GNU General Public License for more details.
|
|
+ *
|
|
+ * Or, alternatively,
|
|
+ *
|
|
+ * b) Permission is hereby granted, free of charge, to any person
|
|
+ * obtaining a copy of this software and associated documentation
|
|
+ * files (the "Software"), to deal in the Software without
|
|
+ * restriction, including without limitation the rights to use
|
|
+ * copy, modify, merge, publish, distribute, sublicense, and/or
|
|
+ * sell copies of the Software, and to permit persons to whom the
|
|
+ * Software is furnished to do so, subject to the following
|
|
+ * conditions:
|
|
+ *
|
|
+ * The above copyright notice and this permission notice shall be
|
|
+ * included in all copies or substantial portions of the Software.
|
|
+ *
|
|
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
+ * OTHER DEALINGS IN THE SOFTWARE.
|
|
+ */
|
|
+
|
|
+&iomuxc {
|
|
+ hummingboard2 {
|
|
+ pinctrl_hummingboard2_usdhc3: hummingboard2-usdhc3 {
|
|
+ fsl,pins = <
|
|
+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
|
|
+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
|
|
+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
|
|
+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
|
|
+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
|
|
+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
|
|
+ MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059
|
|
+ MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059
|
|
+ MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059
|
|
+ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
|
|
+ MX6QDL_PAD_SD3_RST__SD3_RESET 0x17059
|
|
+ >;
|
|
+ };
|
|
+ };
|
|
+};
|
|
+
|
|
+&usdhc3 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pinctrl_hummingboard2_usdhc3>;
|
|
+ vmmc-supply = <®_3p3v>;
|
|
+ vqmmc-supply = <®_3p3v>;
|
|
+ bus-width = <8>;
|
|
+ non-removable;
|
|
+ status = "okay";
|
|
+};
|
|
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
|
|
index 52ed580cf64a..6954d4875cd8 100644
|
|
--- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
|
|
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
|
|
@@ -441,22 +441,6 @@
|
|
>;
|
|
};
|
|
|
|
- pinctrl_hummingboard2_usdhc3: hummingboard2-usdhc3 {
|
|
- fsl,pins = <
|
|
- MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
|
|
- MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
|
|
- MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
|
|
- MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
|
|
- MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
|
|
- MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
|
|
- MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059
|
|
- MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059
|
|
- MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059
|
|
- MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
|
|
- MX6QDL_PAD_SD3_RST__SD3_RESET 0x17059
|
|
- >;
|
|
- };
|
|
-
|
|
pinctrl_hummingboard2_uart3: hummingboard2-uart3 {
|
|
fsl,pins = <
|
|
MX6QDL_PAD_EIM_D25__UART3_TX_DATA 0x1b0b1
|
|
@@ -515,16 +499,6 @@
|
|
status = "okay";
|
|
};
|
|
|
|
-&usdhc3 {
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&pinctrl_hummingboard2_usdhc3>;
|
|
- vmmc-supply = <®_3p3v>;
|
|
- vqmmc-supply = <®_3p3v>;
|
|
- bus-width = <8>;
|
|
- non-removable;
|
|
- status = "okay";
|
|
-};
|
|
-
|
|
&uart3 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_hummingboard2_uart3>;
|