Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f26a393 authored by Russell King's avatar Russell King Committed by Shawn Guo
Browse files

ARM: dts: imx6*-hummingboard2: split out eMMC support 



eMMC is optional on HB2 boards, and may be implemented by the SOM.  Move
it out of the base HB2 include file.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 99af1804

arch/arm/boot/dts/imx6dl-hummingboard2.dts

+1 −0
Original line number Diff line number Diff line
@@ -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";

arch/arm/boot/dts/imx6q-hummingboard2.dts

+1 −0
Original line number Diff line number Diff line
@@ -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";

arch/arm/boot/dts/imx6qdl-hummingboard2-emmc.dtsi

0 → 100644
+72 −0
Original line number Diff line number Diff line 
/*

 * 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 = <&reg_3p3v>;

	vqmmc-supply = <&reg_3p3v>;

	bus-width = <8>;

	non-removable;

	status = "okay";

};

arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi

+0 −26
Original line number Diff line number Diff line
@@ -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 = <&reg_3p3v>;

	vqmmc-supply = <&reg_3p3v>;

	bus-width = <8>;

	non-removable;

	status = "okay";

};



&uart3 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_hummingboard2_uart3>;