[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-119-g476bd0d
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-119-g476bd0d
|
From: Julien B a. A. <ar...@us...> - 2014-02-17 13:43:40
|
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 476bd0d7e08a4f8f50fa5a5d7a77ba1c8e2fa2f9 (commit)
from db7421a851967db16a5d7c9ddd6a11b50e321d77 (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 476bd0d7e08a4f8f50fa5a5d7a77ba1c8e2fa2f9
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 17 14:42:33 2014 +0100
[LINUX] APF6: Add support for Linux 3.10.18 (for Xenomai)
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf6/apf6xenomai-linux-3.10.18.config | 1 +
...x-3.14.config => apf6xenomai-linux-3.10.config} | 68 ++---
patches/linux/{3.10.30 => 3.10.18} | 0
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 306 ++++++++++++++------
4 files changed, 242 insertions(+), 133 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf6/apf6xenomai-linux-3.10.18.config
copy buildroot/target/device/armadeus/apf6/{apf6failsafe-linux-3.14.config => apf6xenomai-linux-3.10.config} (86%)
copy patches/linux/{3.10.30 => 3.10.18} (100%)
copy patches/linux/{3.13 => 3.10}/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch (50%)
diff --git a/buildroot/target/device/armadeus/apf6/apf6xenomai-linux-3.10.18.config b/buildroot/target/device/armadeus/apf6/apf6xenomai-linux-3.10.18.config
new file mode 120000
index 0000000..2ea7785
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6/apf6xenomai-linux-3.10.18.config
@@ -0,0 +1 @@
+apf6xenomai-linux-3.10.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14.config b/buildroot/target/device/armadeus/apf6/apf6xenomai-linux-3.10.config
similarity index 86%
copy from buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14.config
copy to buildroot/target/device/armadeus/apf6/apf6xenomai-linux-3.10.config
index f330375..0aa96f1 100644
--- a/buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14.config
+++ b/buildroot/target/device/armadeus/apf6/apf6xenomai-linux-3.10.config
@@ -16,6 +16,8 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
# CONFIG_BLK_DEV_BSG is not set
+CONFIG_XENO_DRIVERS_CAN=m
+CONFIG_XENO_DRIVERS_CAN_FLEXCAN=m
CONFIG_ARCH_MULTI_V6=y
CONFIG_ARCH_MXC=y
CONFIG_MACH_MX31LILLY=y
@@ -35,17 +37,15 @@ CONFIG_MACH_IMX51_DT=y
CONFIG_MACH_EUKREA_CPUIMX51SD=y
CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_SOC_VF610=y
CONFIG_SMP=y
CONFIG_VMSPLIT_2G=y
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_AEABI=y
-CONFIG_CMDLINE="noinitrd console=ttymxc3,115200"
+# CONFIG_OABI_COMPAT is not set
+CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_BINFMT_MISC=m
-CONFIG_PM_RUNTIME=y
CONFIG_PM_DEBUG=y
CONFIG_PM_TEST_SUSPEND=y
CONFIG_NET=y
@@ -61,12 +61,9 @@ CONFIG_IP_PNP_DHCP=y
CONFIG_IPV6=y
CONFIG_NETFILTER=y
# CONFIG_WIRELESS is not set
-CONFIG_RFKILL=y
-CONFIG_RFKILL_INPUT=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
-CONFIG_IMX_WEIM=y
CONFIG_CONNECTOR=y
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
@@ -76,7 +73,6 @@ CONFIG_MTD_JEDECPROBE=y
CONFIG_MTD_CFI_INTELEXT=y
CONFIG_MTD_CFI_AMDSTD=y
CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_PHYSMAP_OF=y
CONFIG_MTD_DATAFLASH=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_SST25L=y
@@ -97,8 +93,6 @@ CONFIG_SCSI_LOGGING=y
CONFIG_SCSI_SCAN_ASYNC=y
# CONFIG_SCSI_LOWLEVEL is not set
CONFIG_ATA=y
-CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_AHCI_IMX=y
CONFIG_PATA_IMX=y
CONFIG_NETDEVICES=y
# CONFIG_NET_VENDOR_BROADCOM is not set
@@ -124,17 +118,15 @@ CONFIG_KEYBOARD_IMX=y
CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_EGALAX=y
CONFIG_TOUCHSCREEN_MC13783=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_MMA8450=y
CONFIG_SERIO_SERPORT=m
+CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_SERIAL_FSL_LPUART=y
-CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_MXC_RNGA=y
# CONFIG_I2C_COMPAT is not set
@@ -149,52 +141,55 @@ CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_MC9S08DZ60=y
# CONFIG_HWMON is not set
CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_NOWAYOUT=y
CONFIG_IMX2_WDT=y
CONFIG_MFD_DA9052_I2C=y
CONFIG_MFD_MC13XXX_SPI=y
CONFIG_MFD_MC13XXX_I2C=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_ANATOP=y
CONFIG_REGULATOR_DA9052=y
+CONFIG_REGULATOR_ANATOP=y
CONFIG_REGULATOR_MC13783=y
CONFIG_REGULATOR_MC13892=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=y
+CONFIG_VIDEO_MX3=y
+CONFIG_SOC_CAMERA_OV2640=y
CONFIG_DRM=y
-CONFIG_FB=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_L4F00242T03=y
CONFIG_LCD_PLATFORM=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
CONFIG_LOGO=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_IMX_SOC=y
+CONFIG_SND_SOC_PHYCORE_AC97=y
+CONFIG_SND_SOC_EUKREA_TLV320=y
+CONFIG_SND_SOC_IMX_SGTL5000=y
+CONFIG_SND_SOC_IMX_MC13783=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_MXC=y
CONFIG_USB_STORAGE=y
CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_NOP_USB_XCEIV=y
+CONFIG_USB_PHY=y
CONFIG_USB_MXS_PHY=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_ETH=m
-CONFIG_USB_MASS_STORAGE=m
CONFIG_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_ESDHC_IMX=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_ONESHOT=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
CONFIG_RTC_DRV_MC13XXX=y
@@ -203,6 +198,11 @@ CONFIG_RTC_DRV_SNVS=y
CONFIG_DMADEVICES=y
CONFIG_IMX_SDMA=y
CONFIG_MXS_DMA=y
+CONFIG_STAGING=y
+CONFIG_DRM_IMX=y
+CONFIG_DRM_IMX_IPUV3_CORE=y
+CONFIG_DRM_IMX_IPUV3=y
+CONFIG_COMMON_CLK_DEBUG=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
@@ -226,6 +226,7 @@ CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
+CONFIG_CONFIGFS_FS=m
CONFIG_JFFS2_FS=y
CONFIG_UBIFS_FS=y
CONFIG_NFS_FS=y
@@ -240,22 +241,13 @@ CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_UTF8=y
CONFIG_MAGIC_SYSRQ=y
# CONFIG_SCHED_DEBUG is not set
-CONFIG_PROVE_LOCKING=y
# CONFIG_DEBUG_BUGVERBOSE is not set
# CONFIG_FTRACE is not set
# CONFIG_ARM_UNWIND is not set
CONFIG_SECURITYFS=y
-CONFIG_CRYPTO_CCM=y
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_ARC4=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
# CONFIG_CRYPTO_HW is not set
CONFIG_CRC_CCITT=m
CONFIG_CRC_T10DIF=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
-CONFIG_AVERAGE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
diff --git a/patches/linux/3.10.30 b/patches/linux/3.10.18
similarity index 100%
copy from patches/linux/3.10.30
copy to patches/linux/3.10.18
diff --git a/patches/linux/3.13/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.10/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
similarity index 50%
copy from patches/linux/3.13/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
copy to patches/linux/3.10/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 97b773f..3b3b057 100644
--- a/patches/linux/3.13/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.10/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,24 +1,8 @@
-Index: linux-3.13/arch/arm/boot/dts/Makefile
+Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
---- linux-3.13.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.13/arch/arm/boot/dts/Makefile
-@@ -136,9 +136,11 @@ dtb-$(CONFIG_ARCH_MXC) += \
- imx53-mba53.dtb \
- imx53-qsb.dtb \
- imx53-smd.dtb \
-+ imx6dl-apf6dev.dtb \
- 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-apf6dev.dts
-===================================================================
---- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
-@@ -0,0 +1,28 @@
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dts 2014-02-17 11:22:26.647139601 +0100
+@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -32,11 +16,11 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+
+/dts-v1/;
+#include "imx6q.dtsi"
-+#include "imx6qdl-apf6.dtsi"
-+#include "imx6qdl-apf6dev.dtsi"
++#include "imx6q-apf6.dtsi"
++#include "imx6q-apf6dev.dtsi"
+
+/ {
-+ model = "Armadeus APF6Dev i.MX6 Quad / Dual Board";
++ model = "Armadeus APF6 i.MX6 Quad / Dual Module on APF6Dev Board";
+ compatible = "armadeus,imx6q-apf6dev", "armadeus,imx6q-apf6", "fsl,imx6q";
+
+ memory {
@@ -44,14 +28,16 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+ };
+};
+
++/*
+&sata {
+ status = "okay";
+};
-Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++*/
+Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
---- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-@@ -0,0 +1,76 @@
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6.dtsi 2014-02-17 11:42:29.341103441 +0100
+@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -85,28 +71,6 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ };
+};
+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ hog {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
-+ >;
-+ };
-+
-+ 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";
@@ -115,11 +79,13 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+};
+
+/* Wi-Fi */
++/*
+&usdhc1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc1_2>;
+ status = "okay";
+};
++*/
+
+/* eMMC */
+&usdhc3 {
@@ -128,11 +94,11 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
---- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,162 @@
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi 2014-02-17 11:45:51.374105275 +0100
+@@ -0,0 +1,138 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -187,11 +153,13 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ };
+};
+
++/*
+&hdmi {
+ ddc = <&i2c1>;
+ status = "okay";
+};
-+
++*/
++/*
+&i2c1 {
+ clock-frequency = <100000>;
+ pinctrl-names = "default";
@@ -205,56 +173,26 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ pinctrl-0 = <&pinctrl_i2c2_2>;
+ status = "okay";
+};
-+
-+&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
-+ >;
-+ };
-+
-+ 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";
+};
-+
++/*
+&pcie {
+ reset-gpio = <&gpio6 2 0>;
+ status = "okay";
+};
-+
++*/
++/*
+&pwm3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm3_1>;
+ status = "okay";
+};
-+
++*/
+/* GPS */
+&uart1 {
+ pinctrl-names = "default";
@@ -280,6 +218,7 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ status = "okay";
+};
+
++/*
+&usbotg {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usbotg_1>;
@@ -287,18 +226,21 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ dr_mode = "otg";
+ status = "okay";
+};
++*/
+
+/* microSD */
++/*
+&usdhc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc2_2>;
+ cd-gpios = <&gpio1 2 0>;
+ status = "okay";
+};
-Index: linux-3.13/arch/arm/boot/dts/imx6dl-apf6dev.dts
++*/
+Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
---- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6dl-apf6dev.dts
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dts 2014-02-17 10:58:09.335913198 +0100
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -313,14 +255,188 @@ Index: linux-3.13/arch/arm/boot/dts/imx6dl-apf6dev.dts
+
+/dts-v1/;
+#include "imx6dl.dtsi"
-+#include "imx6qdl-apf6.dtsi"
-+#include "imx6qdl-apf6dev.dtsi"
++#include "imx6dl-apf6.dtsi"
++#include "imx6dl-apf6dev.dtsi"
+
+/ {
-+ model = "Armadeus APF6Dev i.MX6 Dual Light Board";
++ model = "Armadeus APF6 i.MX6 Dual Lite Module on APF6Dev Board";
+ compatible = "armadeus,imx6dl-apf6dev", "armadeus,imx6dl-apf6", "fsl,imx6dl";
+
+ memory {
+ reg = <0x10000000 0x40000000>;
+ };
+};
+Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6.dtsi
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6.dtsi 2014-02-17 10:57:17.391655619 +0100
+@@ -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"
++
++&iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hog>;
++
++ hog {
++ pinctrl_hog: hoggrp {
++ fsl,pins = <
++ MX6DL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
++ >;
++ };
++
++ pinctrl_uart2_3: uart2grp-3 {
++ fsl,pins = <
++ MX6DL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
++ MX6DL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
++ MX6DL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
++ MX6DL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
++ >;
++ };
++ };
++};
+Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dtsi
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dtsi 2014-02-17 11:00:14.108531917 +0100
+@@ -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"
++
++&iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hog>;
++
++ hog {
++ pinctrl_hog: hoggrp {
++ fsl,pins = <
++ MX6DL_PAD_GPIO_9__GPIO1_IO09 0x80000000
++ MX6DL_PAD_GPIO_17__GPIO7_IO12 0x80000000
++ MX6DL_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
++ >;
++ };
++
++ pinctrl_uart3_3: uart3grp-3 {
++ fsl,pins = <
++ MX6DL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
++ MX6DL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
++ MX6DL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
++ MX6DL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1
++ >;
++ };
++
++ pinctrl_uart4_2: uart4grp-2 {
++ fsl,pins = <
++ MX6DL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
++ MX6DL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
++ >;
++ };
++ };
++};
+Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6.dtsi
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.18/arch/arm/boot/dts/imx6q-apf6.dtsi 2014-02-17 11:25:55.484175170 +0100
+@@ -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"
++
++&iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hog>;
++
++ hog {
++ pinctrl_hog: hoggrp {
++ fsl,pins = <
++ MX6Q_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
++ >;
++ };
++
++ pinctrl_uart2_3: uart2grp-3 {
++ fsl,pins = <
++ MX6Q_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
++ MX6Q_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
++ MX6Q_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
++ MX6Q_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
++ >;
++ };
++ };
++};
+Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dtsi
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dtsi 2014-02-17 11:33:41.270484892 +0100
+@@ -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"
++
++&iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hog>;
++
++ hog {
++ pinctrl_hog: hoggrp {
++ fsl,pins = <
++ MX6Q_PAD_GPIO_9__GPIO1_IO09 0x80000000
++ MX6Q_PAD_GPIO_17__GPIO7_IO12 0x80000000
++ MX6Q_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
++ >;
++ };
++
++ pinctrl_uart3_3: uart3grp-3 {
++ fsl,pins = <
++ MX6Q_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
++ MX6Q_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
++ MX6Q_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
++ MX6Q_PAD_EIM_D31__UART3_RTS_B 0x1b0b1
++ >;
++ };
++
++ pinctrl_uart4_2: uart4grp-2 {
++ fsl,pins = <
++ MX6Q_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
++ MX6Q_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
++ >;
++ };
++ };
++};
hooks/post-receive
--
armadeus
|
