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

Commit 10f34a13 authored by Stefan Agner's avatar Stefan Agner Committed by Shawn Guo
Browse files

ARM: dts: vf610-colibri: split device tree for carrier boards 



The Colibri VF61 is a module which needs a carrier board to actually
run. Different carrier board have different hardware support, hence
we should reflect this in the device tree files. This patch adds the
Colibri Evaluation Board, which supports almost all peripherals
defined in the Colibri standard.

Also align the compatible naming, file splitting and file naming with
the scheme which was choosen for the Tegra based modules.

Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
parent 155b2fd3

arch/arm/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ 
	imx6q-tx6q-1110.dtb \

	imx6sl-evk.dtb \

	imx6sx-sdb.dtb \

	vf610-colibri.dtb \

	vf610-colibri-eval-v3.dtb \

	vf610-cosmic.dtb \

	vf610-twr.dtb

dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \

arch/arm/boot/dts/vf610-colibri-eval-v3.dts

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

 * Copyright 2014 Toradex AG

 *

 * This program 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, or

 * (at your option) any later version.

 */



/dts-v1/;

#include "vf610-colibri.dtsi"



/ {

	model = "Toradex Colibri VF61 on Colibri Evaluation Board";

	compatible = "toradex,vf610-colibri_vf61-on-eval", "toradex,vf610-colibri_vf61", "fsl,vf610";



	chosen {

		bootargs = "console=ttyLP0,115200";

	};

};



&esdhc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_esdhc1>;

	bus-width = <4>;

	status = "okay";

};



&fec1 {

	phy-mode = "rmii";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_fec1>;

	status = "okay";

};



&uart0 {

	status = "okay";

};



&uart1 {

	status = "okay";

};



&uart2 {

	status = "okay";

};

arch/arm/boot/dts/vf610-colibri.dts→arch/arm/boot/dts/vf610-colibri.dtsi

+2 −12
Original line number Diff line number Diff line
@@ -7,16 +7,11 @@ 
 * (at your option) any later version.

 */



/dts-v1/;

#include "vf610.dtsi"



/ {

	model = "Toradex Colibri VF61 COM";

	compatible = "toradex,vf610-colibri", "fsl,vf610";



	chosen {

		bootargs = "console=ttyLP0,115200";

	};

	compatible = "toradex,vf610-colibri_vf61", "fsl,vf610";



	memory {

		reg = <0x80000000 0x10000000>;
@@ -36,14 +31,12 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_esdhc1>;

	bus-width = <4>;

	status = "okay";

};



&fec1 {

	phy-mode = "rmii";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_fec1>;

	status = "okay";

};



&L2 {
@@ -54,25 +47,22 @@ 
&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart0>;

	status = "okay";

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart1>;

	status = "okay";

};



&uart2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart2>;

	status = "okay";

};



&iomuxc {

	vf610-colibri {

		pinctrl_esdhc1: esdhc1grp {

			fsl,fsl,pins = <

			fsl,pins = <

				VF610_PAD_PTA24__ESDHC1_CLK	0x31ef

				VF610_PAD_PTA25__ESDHC1_CMD	0x31ef

				VF610_PAD_PTA26__ESDHC1_DAT0	0x31ef