[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-572-g6d6a799
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-572-g6d6a799
|
From: Sébastien S. <ss...@us...> - 2015-02-06 14:32:28
|
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 6d6a799a4d0266ea730927cd269f96e67be56031 (commit)
from 86189cb4de4616c2c0ae7915e6d5332449e81381 (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 6d6a799a4d0266ea730927cd269f96e67be56031
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Feb 6 15:34:19 2015 +0100
[LINUX] APF6 (legacy): update
- bump to linux 3.10.31
- rework and update device trees
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6legacy_defconfig | 2 +-
.../armadeus/apf6/apf6legacy-linux-3.10.config | 1 +
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 692 ++++++++++++--------
3 files changed, 428 insertions(+), 267 deletions(-)
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index 6c32fcc..55bb54d 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -23,7 +23,7 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/wandboard-org/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="wandboard_imx_3.10.17_1.0.0_ga"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="wandboard_imx_3.10.31_1.1.0_beta2"
BR2_LINUX_KERNEL_PATCH="../patches/linux/3.10.mx6_legacy"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/apf6legacy-linux-3.10.config"
diff --git a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
index b27c252..2abc708 100644
--- a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
+++ b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
@@ -19,6 +19,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_ARCH_MXC=y
CONFIG_SOC_IMX6Q=y
CONFIG_SOC_IMX6SL=y
+CONFIG_SOC_IMX6SX=y
CONFIG_WAND_RFKILL=y
CONFIG_SMP=y
CONFIG_VMSPLIT_2G=y
diff --git a/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index e6d8bd4..bfb44d5 100644
--- a/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,10 +1,10 @@
-Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,30 @@
+/*
-+ * Copyright 2014 Armadeus Systems
++ * Copyright 2015 Armadeus Systems
+ *
+ * Author: Armadeus Systems <su...@ar...>
+ *
@@ -16,8 +16,8 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dts
+
+/dts-v1/;
+#include "imx6q.dtsi"
-+#include "imx6q-apf6.dtsi"
-+#include "imx6q-apf6dev.dtsi"
++#include "imx6qdl-apf6.dtsi"
++#include "imx6qdl-apf6dev.dtsi"
+
+/ {
+ model = "Armadeus APF6 i.MX6 Quad / Dual Module on APF6Dev Board";
@@ -33,13 +33,13 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dts
+ status = "okay";
+};
+*/
-Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-@@ -0,0 +1,56 @@
++++ linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -0,0 +1,132 @@
+/*
-+ * Copyright 2014 Armadeus Systems
++ * Copyright 2015 Armadeus Systems
+ *
+ * Author: Armadeus Systems <su...@ar...>
+ *
@@ -49,11 +49,13 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ *
+ */
+
++#include <dt-bindings/interrupt-controller/irq.h>
++
+/ {
+ wlan {
+ compatible = "ti,wilink6";
+ interrupt-parent = <&gpio2>;
-+ interrupts = <10 0x4>; /* gpio line 43, high level triggered */
++ interrupts = <10 IRQ_TYPE_LEVEL_HIGH>; /* gpio line 42, high level triggered */
+ clocks = <&refclock>, <&tcxoclock>;
+ clock-names = "refclock", "tcxoclock";
+
@@ -71,36 +73,110 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ };
+};
+
++&fec {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_enet>;
++ phy-mode = "rgmii";
++ //phy-reset-duration = <10>;
++ //phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
++ status = "okay";
++};
++
+/* Bluetooth */
+&uart2 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2_3>;
++ pinctrl-0 = <&pinctrl_uart2>;
+ status = "okay";
+};
+
+/* Wi-Fi */
-+/*
+&usdhc1 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc1_2>;
++ pinctrl-0 = <&pinctrl_usdhc1>;
++ non-removable;
+ status = "okay";
+};
-+*/
+
+/* eMMC */
+&usdhc3 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3_1>;
-+ //non-removable;
++ pinctrl-0 = <&pinctrl_usdhc3>;
++ bus-width = <8>;
++ no-1-8-v;
++ non-removable;
+ status = "okay";
+};
-Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
++
++&iomuxc {
++ apf6 {
++ pinctrl_enet: enetgrp {
++ fsl,pins = <
++ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
++ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
++ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b030
++ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b030
++ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b030
++ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b030
++ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b030
++ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b030
++ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
++ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b030
++ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b030
++ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b030
++ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1f030
++ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1f030
++ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030
++ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x80000000
++ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x80000000
++ >;
++ };
++
++ pinctrl_uart2: uart2grp {
++ 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
++ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
++ >;
++ };
++
++ pinctrl_usdhc1: usdhc1grp {
++ fsl,pins = <
++ MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17059
++ MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10059
++ MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17059
++ MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17059
++ MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17059
++ MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17059
++ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
++ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
++ >;
++ };
++
++ pinctrl_usdhc3: usdhc3grp {
++ 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
++ >;
++ };
++ };
++};
+Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,181 @@
++++ linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+@@ -0,0 +1,486 @@
+/*
-+ * Copyright 2014 Armadeus Systems
++ * Copyright 2015 Armadeus Systems
+ *
+ * Author: Armadeus Systems <su...@ar...>
+ *
@@ -115,9 +191,82 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dt
+ mxcfb0 = &mxcfb1;
+ };
+
++ gpio-keys {
++ compatible = "gpio-keys";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_gpio_keys>;
++
++ user-button {
++ label = "User button";
++ gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
++ linux,code = <0x100>;
++ gpio-key,wakeup;
++ };
++ };
++
++ gpio-leds {
++ compatible = "gpio-leds";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_gpio_leds>;
++
++ user-led {
++ label = "User LED";
++ gpios = <&gpio7 12 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "heartbeat";
++ default-state = "on";
++ };
++ };
++
++ mxcfb1: fb@0 {
++ compatible = "fsl,mxc_sdc_fb";
++ disp_dev = "hdmi";
++ interface_pix_fmt = "RGB24";
++ mode_str ="1920x1080M@60";
++ default_bpp = <24>;
++ int_clk = <0>;
++ late_init = <0>;
++ status = "okay";
++ };
++
++ sound {
++ compatible = "fsl,imx6-armadeus-sgtl5000",
++ "fsl,imx-audio-sgtl5000";
++ model = "imx6-armadeus-sgtl5000";
++ cpu-dai = <&ssi1>;
++ audio-codec = <&codec>;
++ audio-routing =
++ "MIC_IN", "Mic Jack",
++ "Mic Jack", "Mic Bias",
++ "Headphone Jack", "HP_OUT";
++ mux-int-port = <1>;
++ mux-ext-port = <3>;
++ };
++
++ sound-spdif {
++ compatible = "fsl,imx-audio-spdif";
++ model = "imx-spdif";
++ spdif-controller = <&spdif>;
++ spdif-out;
++ };
++
++ sound-hdmi {
++ compatible = "fsl,imx6q-audio-hdmi",
++ "fsl,imx-audio-hdmi";
++ model = "imx-audio-hdmi";
++ hdmi-controller = <&hdmi_audio>;
++ };
++
+ regulators {
+ compatible = "simple-bus";
+
++ reg_1p8v: 1p8v {
++ compatible = "regulator-fixed";
++ regulator-name = "1P8V";
++ regulator-min-microvolt = <1800000>;
++ regulator-max-microvolt = <1800000>;
++ regulator-always-on;
++ };
++
+ reg_2p5v: 2p5v {
+ compatible = "regulator-fixed";
+ regulator-name = "2P5V";
@@ -143,37 +292,44 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dt
+ };
+ };
+
-+ leds {
-+ compatible = "gpio-leds";
++ v4l2_cap_0 {
++ compatible = "fsl,imx6q-v4l2-capture";
++ ipu_id = <0>;
++ csi_id = <0>;
++ mclk_source = <0>;
++ status = "okay";
++ };
+
-+ user-led {
-+ label = "User LED";
-+ gpios = <&gpio7 12 0>;
-+ linux,default-trigger = "heartbeat";
-+ default-state = "on";
-+ };
++ v4l2_out {
++ compatible = "fsl,mxc_v4l2_output";
++ status = "okay";
+ };
++};
+
-+ keys {
-+ compatible = "gpio-keys";
++&audmux {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_audmux>;
++ status = "okay";
++};
+
-+ user-button {
-+ label = "User button";
-+ gpios = <&gpio1 9 0>;
-+ linux,code = <100>;
-+ };
-+ };
++&flexcan2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_flexcan2>;
++ status = "okay";
++};
+
-+ mxcfb1: fb@0 {
-+ compatible = "fsl,mxc_sdc_fb";
-+ disp_dev = "hdmi";
-+ interface_pix_fmt = "RGB24";
-+ mode_str ="1920x1080M@60";
-+ default_bpp = <24>;
-+ int_clk = <0>;
-+ late_init = <0>;
-+ status = "okay";
-+ };
++&ecspi1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ecspi1>;
++ fsl,spi-num-chipselects = <3>;
++ cs-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>,
++ <&gpio4 10 GPIO_ACTIVE_HIGH>,
++ <&gpio4 11 GPIO_ACTIVE_HIGH>;
++ status = "okay";
++};
++
++&hdmi_audio {
++ status = "okay";
+};
+
+&hdmi_core {
@@ -188,198 +344,278 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dt
+ status = "okay";
+};
+
-+&i2c3 {
-+ clock-frequency = <100000>;
++&i2c1 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c3_1>;
++ pinctrl-0 = <&pinctrl_i2c1>;
++ clock-frequency = <100000>;
+ status = "okay";
+
-+ hdmi: edid@50 {
-+ compatible = "fsl,imx6-hdmi-i2c";
-+ reg = <0x50>;
++ ov5640_mipi: ov5640_mipi@3c {
++ compatible = "ovti,ov5640_mipi";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_camera_ov5640>;
++ reg = <0x3c>;
++ clocks = <&clks 201>;
++ clock-names = "csi_mclk";
++ pwn-gpios = <&gpio5 20 GPIO_ACTIVE_HIGH>;
++ rst-gpios = <&gpio5 19 GPIO_ACTIVE_LOW>;
++ DOVDD-supply = <®_1p8v>;
++ AVDD-supply = <®_2p5v>;
++ DVDD-supply = <®_1p8v>;
++ ipu_id = <0>;
++ csi_id = <0>;
++ mclk = <24000000>;
++ mclk_source = <0>;
+ };
+};
+
-+/*
-+&i2c1 {
-+ clock-frequency = <100000>;
++&i2c2 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1_1>;
++ pinctrl-0 = <&pinctrl_i2c2>;
++ clock-frequency = <100000>;
+ status = "okay";
++
++ codec: sgtl5000@0a {
++ compatible = "fsl,sgtl5000";
++ reg = <0x0a>;
++ clocks = <&clks 201>;
++ VDDA-supply = <®_3p3v>;
++ VDDIO-supply = <®_3p3v>;
++ };
+};
+
-+&i2c2 {
-+ clock-frequency = <100000>;
++&i2c3 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2_2>;
++ pinctrl-0 = <&pinctrl_i2c3>;
++ clock-frequency = <400000>;
+ status = "okay";
++
++ hdmi: edid@50 {
++ compatible = "fsl,imx6-hdmi-i2c";
++ reg = <0x50>;
++ };
+};
-+*/
+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet_4>;
-+ phy-mode = "rgmii";
++&mipi_csi {
++ ipu_id = <0>;
++ csi_id = <0>;
++ v_channel = <0>;
++ lanes = <2>;
+ status = "okay";
+};
+
+/*
+&pcie {
-+ reset-gpio = <&gpio6 2 0>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pcie>;
++ reset-gpio = <&gpio6 2 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
+*/
-+/*
++
+&pwm3 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm3_1>;
++ pinctrl-0 = <&pinctrl_pwm3>;
+ status = "okay";
+};
-+*/
++
++&spdif {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_spdif>;
++ status = "okay";
++};
++
++&ssi1 {
++ fsl,mode = "i2s-slave";
++ status = "okay";
++};
++
+/* GPS */
+&uart1 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1_1>;
++ pinctrl-0 = <&pinctrl_uart1>;
+ status = "okay";
+};
+
+/* GSM */
+&uart3 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart3_3>;
++ pinctrl-0 = <&pinctrl_uart3 &pinctrl_gsm>;
++ fsl,uart-has-rtscts;
+ status = "okay";
+};
+
+/* console */
+&uart4 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart4_2>;
++ pinctrl-0 = <&pinctrl_uart4>;
+ status = "okay";
+};
+
+&usbh1 {
++ dr_mode = "host";
++ phy_type = "utmi";
+ status = "okay";
+};
+
+&usbotg {
-+ vbus-supply = <®_usb_otg_vbus>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg_1>;
-+ disable-over-current;
-+ dr_mode = "peripheral";
++ pinctrl-0 = <&pinctrl_usbotg>;
++ vbus-supply = <®_usb_otg_vbus>;
++ dr_mode = "otg";
+ status = "okay";
+};
+
+/* microSD */
+&usdhc2 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc2_2>;
++ pinctrl-0 = <&pinctrl_usdhc2>;
+ bus-width = <4>;
-+ vmmc-supply = <®_3p3v>;
-+ cd-gpios = <&gpio1 2 0>;
++ cd-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
+
-Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts
-===================================================================
---- /dev/null
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts
-@@ -0,0 +1,24 @@
-+/*
-+ * 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.
-+ *
-+ */
++&iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_gpios>;
+
-+/dts-v1/;
-+#include "imx6dl.dtsi"
-+#include "imx6dl-apf6.dtsi"
-+#include "imx6dl-apf6dev.dtsi"
++ apf6dev {
++ pinctrl_audmux: audmuxgrp {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x80000000
++ MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x80000000
++ MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x80000000
++ MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000
++ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0
++ >;
++ };
+
-+/ {
-+ model = "Armadeus APF6 i.MX6 Dual Lite Module on APF6Dev Board";
-+ compatible = "armadeus,imx6dl-apf6dev", "armadeus,imx6dl-apf6", "fsl,imx6dl";
++ pinctrl_camera_ov5640: cameragrp {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_3__XTALOSC_REF_CLK_24M 0x1b0b0 /* CSI_MCLK */
++ MX6QDL_PAD_CSI0_MCLK__GPIO5_IO19 0x80000000
++ MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20 0x80000000
++ >;
++ };
+
-+ memory {
-+ reg = <0x10000000 0x40000000>;
-+ };
-+};
-Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6.dtsi
-===================================================================
---- /dev/null
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6.dtsi
-@@ -0,0 +1,34 @@
-+/*
-+ * 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.
-+ *
-+ */
++ pinctrl_ecspi1: ecspi1grp {
++ fsl,pins = <
++ MX6QDL_PAD_KEY_COL1__ECSPI1_MISO 0x100b1
++ MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI 0x100b1
++ MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK 0x100b1
++ MX6QDL_PAD_KEY_ROW1__GPIO4_IO09 0x80000000
++ MX6QDL_PAD_KEY_ROW2__GPIO4_IO11 0x80000000
++ MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x80000000
++ >;
++ };
+
-+#include "imx6qdl-apf6.dtsi"
++ pinctrl_flexcan2: flexcan2grp {
++ fsl,pins = <
++ MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x80000000
++ MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x80000000
++ >;
++ };
+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
++ pinctrl_gpio_keys: gpiokeysgrp {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x1b0b0
++ >;
++ };
++ pinctrl_gpio_leds: gpioledsgrp {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
++ >;
++ };
+
-+ hog {
-+ pinctrl_hog: hoggrp {
++ pinctrl_gpios: gpiosgrp {
+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
++ MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12 0x80000000
++ MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13 0x80000000
++ MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14 0x80000000
++ MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15 0x80000000
++ MX6QDL_PAD_DISP0_DAT22__GPIO5_IO16 0x80000000
++ MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 0x80000000
++ MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18 0x80000000
++ MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21 0x80000000
+ >;
+ };
+
-+ pinctrl_uart2_3: uart2grp-3 {
++ pinctrl_gsm: gsmgrp {
+ 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
++ MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x80000000 /* GSM_POKIN */
++ MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x80000000 /* GSM_PWR_EN */
+ >;
+ };
-+ };
-+};
-Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dtsi
-===================================================================
---- /dev/null
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dtsi
-@@ -0,0 +1,43 @@
-+/*
-+ * 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.
-+ *
-+ */
+
-+#include "imx6qdl-apf6dev.dtsi"
++ pinctrl_i2c1: i2c1grp {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
++ MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
++ >;
++ };
+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
++ pinctrl_i2c2: i2c2grp {
++ fsl,pins = <
++ MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
++ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
++ >;
++ };
++
++ pinctrl_i2c3: i2c3grp {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
++ MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1
++ >;
++ };
++
++ pinctrl_ipu1_disp1: ipu1disp1grp {
++ fsl,pins = <
++ MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x10
++ MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15 0x10
++ MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0x10
++ MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0x10
++ MX6QDL_PAD_DI0_PIN4__IPU1_DI0_PIN04 0x80000000
++ MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00 0x10
++ MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x10
++ MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x10
++ MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0x10
++ MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0x10
++ MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0x10
++ MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0x10
++ MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0x10
++ MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0x10
++ MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0x10
++ MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0x10
++ MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0x10
++ MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0x10
++ MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0x10
++ MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0x10
++ MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0x10
++ MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0x10
++ MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17 0x10
++ >;
++ };
+
-+ hog {
-+ pinctrl_hog: hoggrp {
++ pinctrl_pcie: pciegrp {
+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
-+ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
+ MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
+ >;
+ };
+
-+ pinctrl_uart3_3: uart3grp-3 {
++ pinctrl_pwm3: pwm3grp {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
++ >;
++ };
++
++ pinctrl_uart1: uart1grp {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
++ >;
++ };
++
++ pinctrl_uart3: uart3grp {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
+ MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
@@ -388,60 +624,50 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts
+ >;
+ };
+
-+ pinctrl_uart4_2: uart4grp-2 {
++ pinctrl_uart4: uart4grp {
+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1
+ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
+ >;
+ };
-+ };
-+};
-Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6.dtsi
-===================================================================
---- /dev/null
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6.dtsi
-@@ -0,0 +1,34 @@
-+/*
-+ * 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.
-+ *
-+ */
+
-+#include "imx6qdl-apf6.dtsi"
++ pinctrl_usbotg: usbotggrp {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
++ >;
++ };
+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
++ pinctrl_usdhc2: usdhc2grp {
++ fsl,pins = <
++ MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059
++ MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059
++ MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
++ MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
++ MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
++ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059
++ >;
++ };
+
-+ hog {
-+ pinctrl_hog: hoggrp {
++ pinctrl_spdif: spdifgrp {
+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
++ MX6QDL_PAD_GPIO_19__SPDIF_OUT 0x1b0b0
+ >;
+ };
+
-+ pinctrl_uart2_3: uart2grp-3 {
++ pinctrl_touchscreen: touchscreengrp {
+ 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
++ MX6QDL_PAD_CSI0_DAT17__GPIO6_IO03 0x80000000
+ >;
+ };
+ };
+};
-Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dtsi
+Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dtsi
-@@ -0,0 +1,43 @@
++++ linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6dl-apf6dev.dts
+@@ -0,0 +1,24 @@
+/*
-+ * Copyright 2014 Armadeus Systems
++ * Copyright 2015 Armadeus Systems
+ *
+ * Author: Armadeus Systems <su...@ar...>
+ *
@@ -451,82 +677,16 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dtsi
+ *
+ */
+
++/dts-v1/;
++#include "imx6dl.dtsi"
++#include "imx6qdl-apf6.dtsi"
+#include "imx6qdl-apf6dev.dtsi"
+
-+&iomuxc {
-+ 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_uart3_3: uart3grp-3 {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
-+ MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1
-+ >;
-+ };
++/ {
++ model = "Armadeus APF6 i.MX6 Dual Lite Module on APF6Dev Board";
++ compatible = "armadeus,imx6dl-apf6dev", "armadeus,imx6dl-apf6", "fsl,imx6dl";
+
-+ pinctrl_uart4_2: uart4grp-2 {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
-+ >;
-+ };
++ memory {
++ reg = <0x10000000 0x40000000>;
+ };
+};
-Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl.dtsi
-===================================================================
---- linux-wandboard_imx_3.10.17_1.0.0_ga.orig/arch/arm/boot/dts/imx6qdl.dtsi
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl.dtsi
-@@ -1166,6 +1166,29 @@
- MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
- MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
- MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0
-+ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_enet_4: enetgrp-4 {
-+ fsl,pins = <
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b030
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b030
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b030
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b030
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b030
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b030
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b030
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b030
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b030
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1f030
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1f030
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030
-+ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x80000000
-+ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x80000000
- >;
- };
- };
-@@ -1354,6 +1377,12 @@
- MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
- >;
- };
-+ pinctrl_i2c3_5: i2c3grp-5 {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1
-+ MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
-+ >;
-+ };
- };
-
- ipu1 {
hooks/post-receive
--
armadeus
|