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

Commit 082d33d0 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: dts: imx: make sabreauto and sabresd common 



The sabreauto and sabresd boards are common for imx6q and imx6dl.
Create imx6qdl-sabreauto.dtsi and imx6qdl-sabresd.dtsi for those
common parts.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 21e59123

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

+2 −25
Original line number Diff line number Diff line
@@ -11,15 +11,13 @@ 
 */



/dts-v1/;



#include "imx6q.dtsi"

#include "imx6qdl-sabreauto.dtsi"



/ {

	model = "Freescale i.MX6 Quad SABRE Automotive Board";

	compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";



	memory {

		reg = <0x10000000 0x80000000>;

	};

};



&iomuxc {
@@ -35,24 +33,3 @@ 
		};

	};

};
 


&uart4 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart4_1>;

	status = "okay";

};



&fec {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_enet_2>;

	phy-mode = "rgmii";

	status = "okay";

};



&usdhc3 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc3_1>;

	cd-gpios = <&gpio6 15 0>;

	wp-gpios = <&gpio1 13 0>;

	status = "okay";

};

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

+3 −75
Original line number Diff line number Diff line
@@ -11,50 +11,13 @@ 
 */



/dts-v1/;



#include "imx6q.dtsi"

#include "imx6qdl-sabresd.dtsi"



/ {

	model = "Freescale i.MX6Q SABRE Smart Device Board";

	model = "Freescale i.MX6 Quad SABRE Smart Device Board";

	compatible = "fsl,imx6q-sabresd", "fsl,imx6q";



	memory {

		reg = <0x10000000 0x40000000>;

	};



	regulators {

		compatible = "simple-bus";



		reg_usb_otg_vbus: usb_otg_vbus {

			compatible = "regulator-fixed";

			regulator-name = "usb_otg_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&gpio3 22 0>;

			enable-active-high;

		};

	};



	gpio-keys {

		compatible = "gpio-keys";



		volume-up {

			label = "Volume Up";

			gpios = <&gpio1 4 0>;

			linux,code = <115>; /* KEY_VOLUMEUP */

		};



		volume-down {

			label = "Volume Down";

			gpios = <&gpio1 5 0>;

			linux,code = <114>; /* KEY_VOLUMEDOWN */

		};

	};

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart1_1>;

	status = "okay";

};



&iomuxc {
@@ -74,38 +37,3 @@ 
		};

	};

};
 


&usbotg {

	vbus-supply = <&reg_usb_otg_vbus>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbotg_2>;

	disable-over-current;

	status = "okay";

};



&usbh1 {

	status = "okay";

};



&fec {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_enet_1>;

	phy-mode = "rgmii";

	status = "okay";

};



&usdhc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc2_1>;

	cd-gpios = <&gpio2 2 0>;

	wp-gpios = <&gpio2 3 0>;

	status = "okay";

};



&usdhc3 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc3_1>;

	cd-gpios = <&gpio2 0 0>;

	wp-gpios = <&gpio2 1 0>;

	status = "okay";

};

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

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

 * Copyright 2012 Freescale Semiconductor, Inc.

 * Copyright 2011 Linaro Ltd.

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



/ {

	memory {

		reg = <0x10000000 0x80000000>;

	};

};



&fec {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_enet_2>;

	phy-mode = "rgmii";

	status = "okay";

};



&uart4 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart4_1>;

	status = "okay";

};



&usdhc3 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc3_1>;

	cd-gpios = <&gpio6 15 0>;

	wp-gpios = <&gpio1 13 0>;

	status = "okay";

};

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

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

 * Copyright 2012 Freescale Semiconductor, Inc.

 * Copyright 2011 Linaro Ltd.

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



/ {

	memory {

		reg = <0x10000000 0x40000000>;

	};



	regulators {

		compatible = "simple-bus";



		reg_usb_otg_vbus: usb_otg_vbus {

			compatible = "regulator-fixed";

			regulator-name = "usb_otg_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&gpio3 22 0>;

			enable-active-high;

		};

	};



	gpio-keys {

		compatible = "gpio-keys";



		volume-up {

			label = "Volume Up";

			gpios = <&gpio1 4 0>;

			linux,code = <115>; /* KEY_VOLUMEUP */

		};



		volume-down {

			label = "Volume Down";

			gpios = <&gpio1 5 0>;

			linux,code = <114>; /* KEY_VOLUMEDOWN */

		};

	};

};



&fec {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_enet_1>;

	phy-mode = "rgmii";

	status = "okay";

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart1_1>;

	status = "okay";

};



&usbh1 {

	status = "okay";

};



&usbotg {

	vbus-supply = <&reg_usb_otg_vbus>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbotg_2>;

	disable-over-current;

	status = "okay";

};



&usdhc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc2_1>;

	cd-gpios = <&gpio2 2 0>;

	wp-gpios = <&gpio2 3 0>;

	status = "okay";

};



&usdhc3 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc3_1>;

	cd-gpios = <&gpio2 0 0>;

	wp-gpios = <&gpio2 1 0>;

	status = "okay";

};