[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-59-gb2079cb
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-59-gb2079cb
|
From: Sébastien S. <ss...@us...> - 2014-01-22 17:12:58
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b2079cb56ca5694f164c7251493102cd09dd081a (commit)
from 40e03e09572b671a640bed0ec5ec88a3995bbe04 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b2079cb56ca5694f164c7251493102cd09dd081a
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Jan 22 18:08:30 2014 +0100
[LINUX] 3.13: apf6q: split device tree in two file: imx6-apf6.dtsi and
imx6-apf6dev.dts
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6q_defconfig | 2 +-
.../3.13/0450-armadeus-add-apf6q-devicetree.patch | 275 +++++++++++---------
2 files changed, 151 insertions(+), 126 deletions(-)
diff --git a/buildroot/configs/apf6q_defconfig b/buildroot/configs/apf6q_defconfig
index b2e85e3..f604be2 100644
--- a/buildroot/configs/apf6q_defconfig
+++ b/buildroot/configs/apf6q_defconfig
@@ -19,7 +19,7 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_LINUX_FIRMWARE=y
diff --git a/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
index bf1fdb4..9485d08 100644
--- a/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
+++ b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
@@ -1,8 +1,20 @@
-Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
+Index: linux-3.13/arch/arm/boot/dts/Makefile
+===================================================================
+--- linux-3.13.orig/arch/arm/boot/dts/Makefile
++++ linux-3.13/arch/arm/boot/dts/Makefile
+@@ -139,6 +139,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
+ imx6dl-sabreauto.dtb \
+ imx6dl-sabresd.dtb \
+ imx6dl-wandboard.dtb \
++ imx6q-apf6dev.dtb \
+ imx6q-arm2.dtb \
+ imx6q-phytec-pbab01.dtb \
+ imx6q-sabreauto.dtb \
+Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
-@@ -0,0 +1,211 @@
++++ linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
+@@ -0,0 +1,66 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -14,36 +26,102 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
+ *
+ */
+
-+/dts-v1/;
+#include "imx6q.dtsi"
+
+/ {
-+ model = "Armadeus APF6 i.MX6 Quad Board";
-+ compatible = "armadeus,imx6q-apf6", "fsl,imx6q";
-+
-+ memory {
-+ reg = <0x10000000 0x80000000>;
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+
-+ reg_2p5v: 2p5v {
-+ compatible = "regulator-fixed";
-+ regulator-name = "2P5V";
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <2500000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_3p3v: 3p3v {
-+ compatible = "regulator-fixed";
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+ };
++ model = "Armadeus APF6 i.MX6 Quad Board";
++ compatible = "armadeus,imx6q-apf6", "fsl,imx6q";
++
++ memory {
++ reg = <0x10000000 0x80000000>;
++ };
++};
++
++&iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hog>;
++
++ hog {
++ pinctrl_hog: hoggrp {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
++ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
++ >;
++ };
++
++ pinctrl_uart2_3: uart2grp-3 {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
++ MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
++ MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
++ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
++ >;
++ };
++ };
++};
++
++/* Bluetooth */
++&uart2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart2_3>;
++ status = "okay";
++};
++
++/* Wi-Fi */
++&usdhc1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc1_2>;
++ status = "okay";
++};
++
++/* eMMC */
++&usdhc3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc3_1>;
++ //non-removable;
++ status = "okay";
++};
+Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+===================================================================
+--- /dev/null
++++ linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+@@ -0,0 +1,165 @@
++/*
++ * Copyright 2014 Armadeus Systems
++ *
++ * Author: Armadeus Systems <su...@ar...>
++ *
++ * 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.
++ *
++ */
++/dts-v1/;
++#include "imx6q-apf6.dtsi"
++
++/ {
++ model = "Armadeus APF6Dev i.MX6 Quad Board";
++ compatible = "armadeus,imx6q-apf6dev", "armadeus,imx6q-apf6", "fsl,imx6q";
++
++ regulators {
++ compatible = "simple-bus";
++
++ reg_2p5v: 2p5v {
++ compatible = "regulator-fixed";
++ regulator-name = "2P5V";
++ regulator-min-microvolt = <2500000>;
++ regulator-max-microvolt = <2500000>;
++ regulator-always-on;
++ };
++
++ reg_3p3v: 3p3v {
++ compatible = "regulator-fixed";
++ regulator-name = "3P3V";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ regulator-always-on;
++ };
++ };
+
+ leds {
+ compatible = "gpio-leds";
@@ -68,57 +146,38 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
+};
+
+&sata {
-+ status = "okay";
-+};
-+
-+/*
-+&audmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux_2>;
-+ status = "okay";
++ status = "okay";
+};
-+*/
+
+&hdmi {
-+ ddc = <&i2c1>;
-+ status = "okay";
++ ddc = <&i2c1>;
++ status = "okay";
+};
+
+&i2c1 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1_1>;
-+ status = "okay";
++ clock-frequency = <100000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c1_1>;
++ status = "okay";
+};
+
+&i2c2 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2_2>;
-+ status = "okay";
++ clock-frequency = <100000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c2_2>;
++ status = "okay";
+};
+
+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ hog {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
-+ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hog>;
++
++ hog {
++ pinctrl_hog: hoggrp {
++ fsl,pins = <
+ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
+ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
+ MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_uart2_3: uart2grp-3 {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
+ >;
+ };
+
@@ -131,20 +190,20 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
+ >;
+ };
+
-+ pinctrl_uart4_2: uart4grp-2 {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
-+ >;
-+ };
-+ };
++ pinctrl_uart4_2: uart4grp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
++ >;
++ };
++ };
+};
+
+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet_1>;
-+ phy-mode = "rgmii";
-+ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_enet_1>;
++ phy-mode = "rgmii";
++ status = "okay";
+};
+
+&pcie {
@@ -154,34 +213,27 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
+
+/* GPS */
+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1_1>;
-+ status = "okay";
-+};
-+
-+/* Bluetooth */
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2_3>;
-+ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart1_1>;
++ status = "okay";
+};
+
+/* GSM */
+&uart3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart3_3>;
-+ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart3_3>;
++ status = "okay";
+};
+
+/* console */
+&uart4 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart4_2>;
-+ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart4_2>;
++ status = "okay";
+};
+
+&usbh1 {
-+ status = "okay";
++ status = "okay";
+};
+
+&usbotg {
@@ -192,37 +244,10 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
+ status = "okay";
+};
+
-+/* Wi-Fi */
-+&usdhc1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc1_2>;
-+ status = "okay";
-+};
-+
+/* microSD */
+&usdhc2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc2_2>;
-+ cd-gpios = <&gpio1 2 0>;
-+ status = "okay";
-+};
-+
-+/* eMMC */
-+&usdhc3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3_1>;
-+ //non-removable;
-+ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc2_2>;
++ cd-gpios = <&gpio1 2 0>;
++ status = "okay";
+};
-Index: linux-3.13/arch/arm/boot/dts/Makefile
-===================================================================
---- linux-3.13.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.13/arch/arm/boot/dts/Makefile
-@@ -139,6 +139,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
- imx6dl-sabreauto.dtb \
- imx6dl-sabresd.dtb \
- imx6dl-wandboard.dtb \
-+ imx6q-apf6.dtb \
- imx6q-arm2.dtb \
- imx6q-phytec-pbab01.dtb \
- imx6q-sabreauto.dtb \
hooks/post-receive
--
armadeus
|
