[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-43-gbf945b5f9
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-43-gbf945b5f9
|
From: Sébastien S. <ss...@us...> - 2019-04-08 16:54:36
|
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 bf945b5f9ff13f96bc7745cb94178e5818d300d6 (commit)
from 50eb5485431b031ce24ab638208452f15c390a01 (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 bf945b5f9ff13f96bc7745cb94178e5818d300d6
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Apr 8 18:54:12 2019 +0200
[BSP] add opos6ullegacy-4.14_defconfig
-----------------------------------------------------------------------
Summary of changes:
...-4.9_defconfig => opos6ullegacy-4.14_defconfig} | 8 +-
...15-armadeus-logo-add_armadeus-project_tux.patch | 0
...50-armadeus-add_custom_drivers_to_kconfig.patch | 0
..._star_completion_for_source_in_menuconfig.patch | 10 +-
...s-add-apf6q-and-apf6dl-device-trees.patch.tofix | 0
...0452-Input-sx8654-support-inverted-y-prop.patch | 0
...500-mxc_ipuv3_fb-unblank-displays-at-init.patch | 0
..._fb-move-fb_blank-call-after-registration.patch | 0
...able-overflow-interrupt-after-initializat.patch | 0
.../0503-Add-support-for-DVI-monitors.patch | 0
...s-remove-spidev-oops-warning-at-load-time.patch | 8 +-
.../0515-armadeus-imx6ull-include-input-h.patch | 0
...516-armadeus-imx6ull-rename-flexcan-nodes.patch | 0
...dia-ov7670-Add-entity-pads-initialization.patch | 0
...524-media-ov7670-Add-the-get_fmt-callback.patch | 0
...ia-ov7670-Add-the-ov7670_s_power-function.patch | 0
...a-ov7670-use-v4l2_async_unregister_subdev.patch | 0
...-ov7670-add-V4L2_CID_TEST_PATTERN-control.patch | 0
...-media-replace-all-spaces-tab-occurrences.patch | 0
...y-Add-a-nop-variant-of-media_entity_clean.patch | 0
...rt-g-s_parm-to-g-s_frame_interval-in-subd.patch | 0
...adv7180-don-t-clear-V4L2_SUBDEV_FL_IS_I2C.patch | 0
...v7180-tvp514x-tvp7002-fix-entity-function.patch | 0
...80-fix-field-type-to-V4L2_FIELD_ALTERNATE.patch | 0
...edia-adv7180-add-g_frame_interval-support.patch | 0
.../0700-armadeus-pcie_clk_defined_in_uboot.patch | 0
...os6ul-and-opos6uldev-add-initial-support.patch} | 2136 ++++++++++----------
...s-dts-fixes-imx6ul-pwm-clocks-declaration.patch | 0
...xsfb-fixes-multi-display-timings-handling.patch | 64 +
...mx6s_caputre-add-subdev-complete-callback.patch | 10 +-
...rmadeus-media-mx6s_capture-define-tvnorms.patch | 13 +
...adeus-dts-opos6uldev-add-sgtl5000-support.patch | 0
...media-mx6s_capture-check-format-by-return.patch | 10 +-
...6s_capture-fix-vidioc_enum_input-callback.patch | 6 +-
...adeus-media-adv7180-add-reset-pin-control.patch | 0
...-armadeus-imx6ull-add-sai-alias-and-cells.patch | 14 +-
36 files changed, 1216 insertions(+), 1063 deletions(-)
copy buildroot/configs/{opos6ullegacy-4.9_defconfig => opos6ullegacy-4.14_defconfig} (95%)
copy patches/linux/{3.14.mx6_legacy => 4.14.mx6_legacy}/0015-armadeus-logo-add_armadeus-project_tux.patch (100%)
copy patches/linux/{3.14.mx6_legacy => 4.14.mx6_legacy}/0050-armadeus-add_custom_drivers_to_kconfig.patch (100%)
copy patches/linux/{4.10 => 4.14.mx6_legacy}/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch (83%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch.tofix (100%)
copy patches/linux/{3.14.mx6_legacy => 4.14.mx6_legacy}/0452-Input-sx8654-support-inverted-y-prop.patch (100%)
copy patches/linux/{4.1.mx6_legacy => 4.14.mx6_legacy}/0500-mxc_ipuv3_fb-unblank-displays-at-init.patch (100%)
copy patches/linux/{4.1.mx6_legacy => 4.14.mx6_legacy}/0501-mxc_ipuv3_fb-move-fb_blank-call-after-registration.patch (100%)
copy patches/linux/{4.1.mx6_legacy => 4.14.mx6_legacy}/0502-mxc_hdmi-enable-overflow-interrupt-after-initializat.patch (100%)
copy patches/linux/{4.1.mx6_legacy => 4.14.mx6_legacy}/0503-Add-support-for-DVI-monitors.patch (100%)
copy patches/linux/{4.14 => 4.14.mx6_legacy}/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch (60%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0515-armadeus-imx6ull-include-input-h.patch (100%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0516-armadeus-imx6ull-rename-flexcan-nodes.patch (100%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0523-media-ov7670-Add-entity-pads-initialization.patch (100%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0524-media-ov7670-Add-the-get_fmt-callback.patch (100%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0525-media-ov7670-Add-the-ov7670_s_power-function.patch (100%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0526-media-ov7670-use-v4l2_async_unregister_subdev.patch (100%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0527-media-ov7670-add-V4L2_CID_TEST_PATTERN-control.patch (100%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0528-media-replace-all-spaces-tab-occurrences.patch (100%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0529-media-entity-Add-a-nop-variant-of-media_entity_clean.patch (100%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0530-media-convert-g-s_parm-to-g-s_frame_interval-in-subd.patch (100%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0531-media-adv7180-don-t-clear-V4L2_SUBDEV_FL_IS_I2C.patch (100%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0532-media-adv7180-tvp514x-tvp7002-fix-entity-function.patch (100%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0533-media-adv7180-fix-field-type-to-V4L2_FIELD_ALTERNATE.patch (100%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0534-media-adv7180-add-g_frame_interval-support.patch (100%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0700-armadeus-pcie_clk_defined_in_uboot.patch (100%)
copy patches/linux/{4.17/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch => 4.14.mx6_legacy/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch} (84%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0805-armadeus-dts-fixes-imx6ul-pwm-clocks-declaration.patch (100%)
create mode 100644 patches/linux/4.14.mx6_legacy/0806-armadeus-mxsfb-fixes-multi-display-timings-handling.patch
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0807-armadeus-media-mx6s_caputre-add-subdev-complete-callback.patch (65%)
create mode 100644 patches/linux/4.14.mx6_legacy/0808-armadeus-media-mx6s_capture-define-tvnorms.patch
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0809-armadeus-dts-opos6uldev-add-sgtl5000-support.patch (100%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0810-armadeus-media-mx6s_capture-check-format-by-return.patch (66%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0811-armadeus-media-mx6s_capture-fix-vidioc_enum_input-callback.patch (60%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0812-armadeus-media-adv7180-add-reset-pin-control.patch (100%)
copy patches/linux/{4.9.mx6_legacy => 4.14.mx6_legacy}/0813-armadeus-imx6ull-add-sai-alias-and-cells.patch (68%)
diff --git a/buildroot/configs/opos6ullegacy-4.9_defconfig b/buildroot/configs/opos6ullegacy-4.14_defconfig
similarity index 95%
copy from buildroot/configs/opos6ullegacy-4.9_defconfig
copy to buildroot/configs/opos6ullegacy-4.14_defconfig
index 2a4edb4e9..039a7966f 100644
--- a/buildroot/configs/opos6ullegacy-4.9_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.14_defconfig
@@ -6,7 +6,7 @@ BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
# For BR 2017.02:
BR2_GCC_VERSION_6_X=y
#
@@ -30,9 +30,9 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="imx_4.9.11_1.0.0_ga"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/4.9.mx6_legacy"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="94da7bdc489ba686d868bcf80678a37cae22673e"
+BR2_LINUX_KERNEL_PATCH="../patches/linux/4.14.mx6_legacy"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="target/device/armadeus/opos6ul/opos6ul-linux-4.1.legacy.config.fragment"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/patches/linux/3.14.mx6_legacy/0015-armadeus-logo-add_armadeus-project_tux.patch b/patches/linux/4.14.mx6_legacy/0015-armadeus-logo-add_armadeus-project_tux.patch
similarity index 100%
copy from patches/linux/3.14.mx6_legacy/0015-armadeus-logo-add_armadeus-project_tux.patch
copy to patches/linux/4.14.mx6_legacy/0015-armadeus-logo-add_armadeus-project_tux.patch
diff --git a/patches/linux/3.14.mx6_legacy/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/4.14.mx6_legacy/0050-armadeus-add_custom_drivers_to_kconfig.patch
similarity index 100%
copy from patches/linux/3.14.mx6_legacy/0050-armadeus-add_custom_drivers_to_kconfig.patch
copy to patches/linux/4.14.mx6_legacy/0050-armadeus-add_custom_drivers_to_kconfig.patch
diff --git a/patches/linux/4.10/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/4.14.mx6_legacy/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
similarity index 83%
copy from patches/linux/4.10/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
copy to patches/linux/4.14.mx6_legacy/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
index 0e97eb29e..6c997c8d6 100644
--- a/patches/linux/4.10/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
+++ b/patches/linux/4.14.mx6_legacy/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
@@ -1,7 +1,7 @@
-Index: linux-4.10.13/scripts/kconfig/zconf.tab.c_shipped
+Index: linux-94da7bdc489ba686d868bcf80678a37cae22673e/scripts/kconfig/zconf.tab.c_shipped
===================================================================
---- linux-4.10.13.orig/scripts/kconfig/zconf.tab.c_shipped
-+++ linux-4.10.13/scripts/kconfig/zconf.tab.c_shipped
+--- linux-94da7bdc489ba686d868bcf80678a37cae22673e.orig/scripts/kconfig/zconf.tab.c_shipped
++++ linux-94da7bdc489ba686d868bcf80678a37cae22673e/scripts/kconfig/zconf.tab.c_shipped
@@ -83,6 +83,8 @@
#include <stdlib.h>
#include <string.h>
@@ -58,7 +58,7 @@ Index: linux-4.10.13/scripts/kconfig/zconf.tab.c_shipped
+
printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[-1].string));
- zconf_nextfile((yyvsp[-1].string));
-+ name = (yyvsp[(2) -(3)].string);
++ name = (yyvsp[-1].string);
+ ptr = strchr(name, '*');
+ if(ptr != NULL) {
+ *ptr = '\0';
@@ -73,7 +73,7 @@ Index: linux-4.10.13/scripts/kconfig/zconf.tab.c_shipped
+ }
+ }
+ } else {
-+ zconf_nextfile((yyvsp[(2) - (3)].string));
++ zconf_nextfile((yyvsp[-1].string));
+ }
}
diff --git a/patches/linux/4.9.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch.tofix b/patches/linux/4.14.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch.tofix
similarity index 100%
copy from patches/linux/4.9.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch.tofix
copy to patches/linux/4.14.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch.tofix
diff --git a/patches/linux/3.14.mx6_legacy/0452-Input-sx8654-support-inverted-y-prop.patch b/patches/linux/4.14.mx6_legacy/0452-Input-sx8654-support-inverted-y-prop.patch
similarity index 100%
copy from patches/linux/3.14.mx6_legacy/0452-Input-sx8654-support-inverted-y-prop.patch
copy to patches/linux/4.14.mx6_legacy/0452-Input-sx8654-support-inverted-y-prop.patch
diff --git a/patches/linux/4.1.mx6_legacy/0500-mxc_ipuv3_fb-unblank-displays-at-init.patch b/patches/linux/4.14.mx6_legacy/0500-mxc_ipuv3_fb-unblank-displays-at-init.patch
similarity index 100%
copy from patches/linux/4.1.mx6_legacy/0500-mxc_ipuv3_fb-unblank-displays-at-init.patch
copy to patches/linux/4.14.mx6_legacy/0500-mxc_ipuv3_fb-unblank-displays-at-init.patch
diff --git a/patches/linux/4.1.mx6_legacy/0501-mxc_ipuv3_fb-move-fb_blank-call-after-registration.patch b/patches/linux/4.14.mx6_legacy/0501-mxc_ipuv3_fb-move-fb_blank-call-after-registration.patch
similarity index 100%
copy from patches/linux/4.1.mx6_legacy/0501-mxc_ipuv3_fb-move-fb_blank-call-after-registration.patch
copy to patches/linux/4.14.mx6_legacy/0501-mxc_ipuv3_fb-move-fb_blank-call-after-registration.patch
diff --git a/patches/linux/4.1.mx6_legacy/0502-mxc_hdmi-enable-overflow-interrupt-after-initializat.patch b/patches/linux/4.14.mx6_legacy/0502-mxc_hdmi-enable-overflow-interrupt-after-initializat.patch
similarity index 100%
copy from patches/linux/4.1.mx6_legacy/0502-mxc_hdmi-enable-overflow-interrupt-after-initializat.patch
copy to patches/linux/4.14.mx6_legacy/0502-mxc_hdmi-enable-overflow-interrupt-after-initializat.patch
diff --git a/patches/linux/4.1.mx6_legacy/0503-Add-support-for-DVI-monitors.patch b/patches/linux/4.14.mx6_legacy/0503-Add-support-for-DVI-monitors.patch
similarity index 100%
copy from patches/linux/4.1.mx6_legacy/0503-Add-support-for-DVI-monitors.patch
copy to patches/linux/4.14.mx6_legacy/0503-Add-support-for-DVI-monitors.patch
diff --git a/patches/linux/4.14/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch b/patches/linux/4.14.mx6_legacy/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
similarity index 60%
copy from patches/linux/4.14/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
copy to patches/linux/4.14.mx6_legacy/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
index aec21e419..5aa8e75ae 100644
--- a/patches/linux/4.14/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
+++ b/patches/linux/4.14.mx6_legacy/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
@@ -3,11 +3,11 @@ kernels with device tree support.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux/drivers/spi/spidev.c
+Index: linux-94da7bdc489ba686d868bcf80678a37cae22673e/drivers/spi/spidev.c
===================================================================
---- linux.orig/drivers/spi/spidev.c
-+++ linux/drivers/spi/spidev.c
-@@ -669,6 +669,7 @@ static struct class *spidev_class;
+--- linux-94da7bdc489ba686d868bcf80678a37cae22673e.orig/drivers/spi/spidev.c
++++ linux-94da7bdc489ba686d868bcf80678a37cae22673e/drivers/spi/spidev.c
+@@ -669,6 +669,7 @@ static const struct of_device_id spidev_
{ .compatible = "lineartechnology,ltc2488" },
{ .compatible = "ge,achc" },
{ .compatible = "semtech,sx1301" },
diff --git a/patches/linux/4.9.mx6_legacy/0515-armadeus-imx6ull-include-input-h.patch b/patches/linux/4.14.mx6_legacy/0515-armadeus-imx6ull-include-input-h.patch
similarity index 100%
copy from patches/linux/4.9.mx6_legacy/0515-armadeus-imx6ull-include-input-h.patch
copy to patches/linux/4.14.mx6_legacy/0515-armadeus-imx6ull-include-input-h.patch
diff --git a/patches/linux/4.9.mx6_legacy/0516-armadeus-imx6ull-rename-flexcan-nodes.patch b/patches/linux/4.14.mx6_legacy/0516-armadeus-imx6ull-rename-flexcan-nodes.patch
similarity index 100%
copy from patches/linux/4.9.mx6_legacy/0516-armadeus-imx6ull-rename-flexcan-nodes.patch
copy to patches/linux/4.14.mx6_legacy/0516-armadeus-imx6ull-rename-flexcan-nodes.patch
diff --git a/patches/linux/4.9.mx6_legacy/0523-media-ov7670-Add-entity-pads-initialization.patch b/patches/linux/4.14.mx6_legacy/0523-media-ov7670-Add-entity-pads-initialization.patch
similarity index 100%
copy from patches/linux/4.9.mx6_legacy/0523-media-ov7670-Add-entity-pads-initialization.patch
copy to patches/linux/4.14.mx6_legacy/0523-media-ov7670-Add-entity-pads-initialization.patch
diff --git a/patches/linux/4.9.mx6_legacy/0524-media-ov7670-Add-the-get_fmt-callback.patch b/patches/linux/4.14.mx6_legacy/0524-media-ov7670-Add-the-get_fmt-callback.patch
similarity index 100%
copy from patches/linux/4.9.mx6_legacy/0524-media-ov7670-Add-the-get_fmt-callback.patch
copy to patches/linux/4.14.mx6_legacy/0524-media-ov7670-Add-the-get_fmt-callback.patch
diff --git a/patches/linux/4.9.mx6_legacy/0525-media-ov7670-Add-the-ov7670_s_power-function.patch b/patches/linux/4.14.mx6_legacy/0525-media-ov7670-Add-the-ov7670_s_power-function.patch
similarity index 100%
copy from patches/linux/4.9.mx6_legacy/0525-media-ov7670-Add-the-ov7670_s_power-function.patch
copy to patches/linux/4.14.mx6_legacy/0525-media-ov7670-Add-the-ov7670_s_power-function.patch
diff --git a/patches/linux/4.9.mx6_legacy/0526-media-ov7670-use-v4l2_async_unregister_subdev.patch b/patches/linux/4.14.mx6_legacy/0526-media-ov7670-use-v4l2_async_unregister_subdev.patch
similarity index 100%
copy from patches/linux/4.9.mx6_legacy/0526-media-ov7670-use-v4l2_async_unregister_subdev.patch
copy to patches/linux/4.14.mx6_legacy/0526-media-ov7670-use-v4l2_async_unregister_subdev.patch
diff --git a/patches/linux/4.9.mx6_legacy/0527-media-ov7670-add-V4L2_CID_TEST_PATTERN-control.patch b/patches/linux/4.14.mx6_legacy/0527-media-ov7670-add-V4L2_CID_TEST_PATTERN-control.patch
similarity index 100%
copy from patches/linux/4.9.mx6_legacy/0527-media-ov7670-add-V4L2_CID_TEST_PATTERN-control.patch
copy to patches/linux/4.14.mx6_legacy/0527-media-ov7670-add-V4L2_CID_TEST_PATTERN-control.patch
diff --git a/patches/linux/4.9.mx6_legacy/0528-media-replace-all-spaces-tab-occurrences.patch b/patches/linux/4.14.mx6_legacy/0528-media-replace-all-spaces-tab-occurrences.patch
similarity index 100%
copy from patches/linux/4.9.mx6_legacy/0528-media-replace-all-spaces-tab-occurrences.patch
copy to patches/linux/4.14.mx6_legacy/0528-media-replace-all-spaces-tab-occurrences.patch
diff --git a/patches/linux/4.9.mx6_legacy/0529-media-entity-Add-a-nop-variant-of-media_entity_clean.patch b/patches/linux/4.14.mx6_legacy/0529-media-entity-Add-a-nop-variant-of-media_entity_clean.patch
similarity index 100%
copy from patches/linux/4.9.mx6_legacy/0529-media-entity-Add-a-nop-variant-of-media_entity_clean.patch
copy to patches/linux/4.14.mx6_legacy/0529-media-entity-Add-a-nop-variant-of-media_entity_clean.patch
diff --git a/patches/linux/4.9.mx6_legacy/0530-media-convert-g-s_parm-to-g-s_frame_interval-in-subd.patch b/patches/linux/4.14.mx6_legacy/0530-media-convert-g-s_parm-to-g-s_frame_interval-in-subd.patch
similarity index 100%
copy from patches/linux/4.9.mx6_legacy/0530-media-convert-g-s_parm-to-g-s_frame_interval-in-subd.patch
copy to patches/linux/4.14.mx6_legacy/0530-media-convert-g-s_parm-to-g-s_frame_interval-in-subd.patch
diff --git a/patches/linux/4.9.mx6_legacy/0531-media-adv7180-don-t-clear-V4L2_SUBDEV_FL_IS_I2C.patch b/patches/linux/4.14.mx6_legacy/0531-media-adv7180-don-t-clear-V4L2_SUBDEV_FL_IS_I2C.patch
similarity index 100%
copy from patches/linux/4.9.mx6_legacy/0531-media-adv7180-don-t-clear-V4L2_SUBDEV_FL_IS_I2C.patch
copy to patches/linux/4.14.mx6_legacy/0531-media-adv7180-don-t-clear-V4L2_SUBDEV_FL_IS_I2C.patch
diff --git a/patches/linux/4.9.mx6_legacy/0532-media-adv7180-tvp514x-tvp7002-fix-entity-function.patch b/patches/linux/4.14.mx6_legacy/0532-media-adv7180-tvp514x-tvp7002-fix-entity-function.patch
similarity index 100%
copy from patches/linux/4.9.mx6_legacy/0532-media-adv7180-tvp514x-tvp7002-fix-entity-function.patch
copy to patches/linux/4.14.mx6_legacy/0532-media-adv7180-tvp514x-tvp7002-fix-entity-function.patch
diff --git a/patches/linux/4.9.mx6_legacy/0533-media-adv7180-fix-field-type-to-V4L2_FIELD_ALTERNATE.patch b/patches/linux/4.14.mx6_legacy/0533-media-adv7180-fix-field-type-to-V4L2_FIELD_ALTERNATE.patch
similarity index 100%
copy from patches/linux/4.9.mx6_legacy/0533-media-adv7180-fix-field-type-to-V4L2_FIELD_ALTERNATE.patch
copy to patches/linux/4.14.mx6_legacy/0533-media-adv7180-fix-field-type-to-V4L2_FIELD_ALTERNATE.patch
diff --git a/patches/linux/4.9.mx6_legacy/0534-media-adv7180-add-g_frame_interval-support.patch b/patches/linux/4.14.mx6_legacy/0534-media-adv7180-add-g_frame_interval-support.patch
similarity index 100%
copy from patches/linux/4.9.mx6_legacy/0534-media-adv7180-add-g_frame_interval-support.patch
copy to patches/linux/4.14.mx6_legacy/0534-media-adv7180-add-g_frame_interval-support.patch
diff --git a/patches/linux/4.9.mx6_legacy/0700-armadeus-pcie_clk_defined_in_uboot.patch b/patches/linux/4.14.mx6_legacy/0700-armadeus-pcie_clk_defined_in_uboot.patch
similarity index 100%
copy from patches/linux/4.9.mx6_legacy/0700-armadeus-pcie_clk_defined_in_uboot.patch
copy to patches/linux/4.14.mx6_legacy/0700-armadeus-pcie_clk_defined_in_uboot.patch
diff --git a/patches/linux/4.17/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch b/patches/linux/4.14.mx6_legacy/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
similarity index 84%
copy from patches/linux/4.17/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch
copy to patches/linux/4.14.mx6_legacy/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
index 30d4741ba..4da604cf8 100644
--- a/patches/linux/4.17/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch
+++ b/patches/linux/4.14.mx6_legacy/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
@@ -1,861 +1,45 @@
-From b48b0dd7ec2af0ce79b99986bf41a5e5ae0955cb Mon Sep 17 00:00:00 2001
+From c753be8ed1438150ad427c5d8c84e86f9c70109f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
<seb...@ar...>
-Date: Wed, 18 Apr 2018 13:48:53 +0200
-Subject: [PATCH 100/103] ARM: dts: opos6ul: rework device tree to support
- i.MX6ULL
+Date: Thu, 2 Jun 2016 18:53:59 +0200
+Subject: [PATCH 1/1] ARM: dts: opos6ul and opos6uldev add initial support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
-Rework the device tree of the OPOS6ULDEV board to support the OPOS6UL
-SoM with an i.MX6ULL SoC.
-
Signed-off-by: Sébastien Szymanski <seb...@ar...>
---
- arch/arm/boot/dts/Makefile | 3 +-
- arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi | 190 +++++++++++
- arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi | 406 +++++++++++++++++++++++
- arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 192 -----------
- arch/arm/boot/dts/imx6ul-opos6uldev.dts | 366 +-------------------
- arch/arm/boot/dts/imx6ull-opos6uldev.dts | 56 ++++
- 6 files changed, 659 insertions(+), 554 deletions(-)
- create mode 100644 arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
- create mode 100644 arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
- delete mode 100644 arch/arm/boot/dts/imx6ul-opos6ul.dtsi
- create mode 100644 arch/arm/boot/dts/imx6ull-opos6uldev.dts
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 181 ++++++++++++++
+ arch/arm/boot/dts/imx6ul-opos6uldev.dts | 407 ++++++++++++++++++++++++++++++++
+ 3 files changed, 589 insertions(+)
+ create mode 100644 arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-opos6uldev.dts
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 7e2424957809..eb5ed60b92a2 100644
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -538,7 +538,8 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
- imx6ul-tx6ul-mainboard.dtb \
+Index: linux-94da7bdc489ba686d868bcf80678a37cae22673e/arch/arm/boot/dts/Makefile
+===================================================================
+--- linux-94da7bdc489ba686d868bcf80678a37cae22673e.orig/arch/arm/boot/dts/Makefile
++++ linux-94da7bdc489ba686d868bcf80678a37cae22673e/arch/arm/boot/dts/Makefile
+@@ -536,6 +536,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
+ imx6sxscm-epop-evb-m4-ldo.dtb
+ dtb-$(CONFIG_SOC_IMX6UL) += \
+ imx6ul-14x14-evk.dtb \
++ imx6ul-opos6uldev.dtb \
+ imx6ul-14x14-evk-btwifi.dtb \
+ imx6ul-14x14-evk-btwifi-oob.dtb \
+ imx6ul-14x14-evk-csi.dtb \
+@@ -585,6 +586,7 @@ dtb-$(CONFIG_SOC_IMX6ULL) += \
+ imx6ull-14x14-ddr3-arm2-usb.dtb \
+ imx6ull-14x14-ddr3-arm2-wm8958.dtb \
imx6ull-14x14-evk.dtb \
- imx6ull-colibri-eval-v3.dtb \
-- imx6ull-colibri-wifi-eval-v3.dtb
-+ imx6ull-colibri-wifi-eval-v3.dtb \
-+ imx6ull-opos6uldev.dtb
- dtb-$(CONFIG_SOC_IMX7D) += \
- imx7d-cl-som-imx7.dtb \
- imx7d-colibri-emmc-eval-v3.dtb \
-diff --git a/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi b/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
-new file mode 100644
-index 000000000000..a4621f3688e3
---- /dev/null
-+++ b/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
-@@ -0,0 +1,190 @@
-+/*
-+ * Copyright 2018 Armadeus Systems <su...@ar...>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ * a) This file 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.
-+ *
-+ * This file is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public
-+ * License along with this file; if not, write to the Free
-+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ *
-+ * Or, alternatively,
-+ *
-+ * b) Permission is hereby granted, free of charge, to any person
-+ * obtaining a copy of this software and associated documentation
-+ * files (the "Software"), to deal in the Software without
-+ * restriction, including without limitation the rights to use,
-+ * copy, modify, merge, publish, distribute, sublicense, and/or
-+ * sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following
-+ * conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be
-+ * included in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ * OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/ {
-+ memory@80000000 {
-+ reg = <0x80000000 0>; /* will be filled by U-Boot */
-+ };
-+
-+ reg_3v3: regulator-3v3 {
-+ compatible = "regulator-fixed";
-+ regulator-name = "3V3";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ };
-+
-+ usdhc3_pwrseq: usdhc3-pwrseq {
-+ compatible = "mmc-pwrseq-simple";
-+ reset-gpios = <&gpio2 9 GPIO_ACTIVE_LOW>;
-+ };
-+};
-+
-+&fec1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet1>;
-+ phy-mode = "rmii";
-+ phy-reset-duration = <1>;
-+ phy-reset-gpios = <&gpio4 2 GPIO_ACTIVE_LOW>;
-+ phy-handle = <ðphy1>;
-+ phy-supply = <®_3v3>;
-+ status = "okay";
-+
-+ mdio: mdio {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ ethphy1: ethernet-phy@1 {
-+ compatible = "ethernet-phy-ieee802.3-c22";
-+ reg = <1>;
-+ interrupt-parent = <&gpio4>;
-+ interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
-+ status = "okay";
-+ };
-+ };
-+};
-+
-+/* Bluetooth */
-+&uart8 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart8>;
-+ uart-has-rtscts;
-+ status = "okay";
-+};
-+
-+/* eMMC */
-+&usdhc1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc1>;
-+ bus-width = <8>;
-+ no-1-8-v;
-+ non-removable;
-+ status = "okay";
-+};
-+
-+/* WiFi */
-+&usdhc2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc2>;
-+ bus-width = <4>;
-+ no-1-8-v;
-+ non-removable;
-+ mmc-pwrseq = <&usdhc3_pwrseq>;
-+ status = "okay";
-+
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ brcmf: wifi@1 {
-+ compatible = "brcm,bcm4329-fmac";
-+ reg = <1>;
-+ interrupt-parent = <&gpio2>;
-+ interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
-+ interrupt-names = "host-wake";
-+ };
-+};
-+
-+&iomuxc {
-+ pinctrl_enet1: enet1grp {
-+ fsl,pins = <
-+ MX6UL_PAD_GPIO1_IO06__ENET1_MDIO 0x1b0b0
-+ MX6UL_PAD_GPIO1_IO07__ENET1_MDC 0x1b0b0
-+ MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER 0x130b0
-+ MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN 0x130b0
-+ MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x130b0
-+ MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x130b0
-+ MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0
-+ MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0
-+ MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN 0x1b0b0
-+ /* INT# */
-+ MX6UL_PAD_NAND_DQS__GPIO4_IO16 0x1b0b0
-+ /* RST# */
-+ MX6UL_PAD_NAND_DATA00__GPIO4_IO02 0x130b0
-+ MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x4001b031
-+ >;
-+ };
-+
-+ pinctrl_uart8: uart8grp {
-+ fsl,pins = <
-+ MX6UL_PAD_ENET2_TX_EN__UART8_DCE_RX 0x1b0b0
-+ MX6UL_PAD_ENET2_TX_DATA1__UART8_DCE_TX 0x1b0b0
-+ MX6UL_PAD_ENET2_RX_ER__UART8_DCE_RTS 0x1b0b0
-+ MX6UL_PAD_ENET2_TX_CLK__UART8_DCE_CTS 0x1b0b0
-+ /* BT_REG_ON */
-+ MX6UL_PAD_ENET2_RX_EN__GPIO2_IO10 0x130b0
-+ >;
-+ };
-+
-+ pinctrl_usdhc1: usdhc1grp {
-+ fsl,pins = <
-+ MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059
-+ MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10059
-+ MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x17059
-+ MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059
-+ MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059
-+ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059
-+ MX6UL_PAD_NAND_READY_B__USDHC1_DATA4 0x17059
-+ MX6UL_PAD_NAND_CE0_B__USDHC1_DATA5 0x17059
-+ MX6UL_PAD_NAND_CE1_B__USDHC1_DATA6 0x17059
-+ MX6UL_PAD_NAND_CLE__USDHC1_DATA7 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc2: usdhc2grp {
-+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA18__USDHC2_CMD 0x1b0b0
-+ MX6UL_PAD_LCD_DATA19__USDHC2_CLK 0x100b0
-+ MX6UL_PAD_LCD_DATA20__USDHC2_DATA0 0x1b0b0
-+ MX6UL_PAD_LCD_DATA21__USDHC2_DATA1 0x1b0b0
-+ MX6UL_PAD_LCD_DATA22__USDHC2_DATA2 0x1b0b0
-+ MX6UL_PAD_LCD_DATA23__USDHC2_DATA3 0x1b0b0
-+ /* WL_REG_ON */
-+ MX6UL_PAD_ENET2_RX_DATA1__GPIO2_IO09 0x130b0
-+ /* WL_IRQ */
-+ MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08 0x1b0b0
-+ >;
-+ };
-+};
-diff --git a/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi b/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
-new file mode 100644
-index 000000000000..0b79a246a07f
---- /dev/null
-+++ b/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
-@@ -0,0 +1,406 @@
-+/*
-+ * Copyright 2018 Armadeus Systems <su...@ar...>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ * a) This file 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.
-+ *
-+ * This file is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public
-+ * License along with this file; if not, write to the Free
-+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ *
-+ * Or, alternatively,
-+ *
-+ * b) Permission is hereby granted, free of charge, to any person
-+ * obtaining a copy of this software and associated documentation
-+ * files (the "Software"), to deal in the Software without
-+ * restriction, including without limitation the rights to use,
-+ * copy, modify, merge, publish, distribute, sublicense, and/or
-+ * sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following
-+ * conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be
-+ * included in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ * OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/ {
-+ chosen {
-+ stdout-path = &uart1;
-+ };
-+
-+ backlight {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm3 0 191000>;
-+ brightness-levels = <0 4 8 16 32 64 128 255>;
-+ default-brightness-level = <7>;
-+ power-supply = <®_5v>;
-+ status = "okay";
-+ };
-+
-+ gpio-keys {
-+ compatible = "gpio-keys";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpio_keys>;
-+
-+ user-button {
-+ label = "User button";
-+ gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
-+ linux,code = <BTN_MISC>;
-+ wakeup-source;
-+ };
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+
-+ user-led {
-+ label = "User";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_led>;
-+ gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
-+ linux,default-trigger = "heartbeat";
-+ };
-+ };
-+
-+ onewire {
-+ compatible = "w1-gpio";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_w1>;
-+ gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
-+ };
-+
-+ reg_5v: regulator-5v {
-+ compatible = "regulator-fixed";
-+ regulator-name = "5V";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ };
-+
-+ reg_usbotg1_vbus: regulator-usbotg1vbus {
-+ compatible = "regulator-fixed";
-+ regulator-name = "usbotg1vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg1_vbus>;
-+ gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
-+ enable-active-high;
-+ };
-+
-+ reg_usbotg2_vbus: regulator-usbotg2vbus {
-+ compatible = "regulator-fixed";
-+ regulator-name = "usbotg2vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg2_vbus>;
-+ gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
-+ enable-active-high;
-+ };
-+};
-+
-+&adc1 {
-+ vref-supply = <®_3v3>;
-+ status = "okay";
-+};
-+
-+&can1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_flexcan1>;
-+ xceiver-supply = <®_5v>;
-+ status = "okay";
-+};
-+
-+&can2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_flexcan2>;
-+ xceiver-supply = <®_5v>;
-+ status = "okay";
-+};
-+
-+&ecspi4 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi4>;
-+ cs-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>, <&gpio4 3 GPIO_ACTIVE_LOW>;
-+ status = "okay";
-+
-+ spidev0: spi@0 {
-+ compatible = "spidev";
-+ reg = <0>;
-+ spi-max-frequency = <5000000>;
-+ };
-+
-+ spidev1: spi@1 {
-+ compatible = "spidev";
-+ reg = <1>;
-+ spi-max-frequency = <5000000>;
-+ };
-+};
-+
-+&i2c1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ clock_frequency = <400000>;
-+ status = "okay";
-+};
-+
-+&i2c2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
-+ clock_frequency = <400000>;
-+ status = "okay";
-+};
-+
-+&lcdif {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_lcdif>;
-+ display = <&display0>;
-+ lcd-supply = <®_3v3>;
-+ status = "okay";
-+
-+ display0: display0 {
-+ bits-per-pixel = <32>;
-+ bus-width = <18>;
-+
-+ display-timings {
-+ timing0: timing0 {
-+ clock-frequency = <33000033>;
-+ hactive = <800>;
-+ vactive = <480>;
-+ hback-porch = <96>;
-+ hfront-porch = <96>;
-+ vback-porch = <20>;
-+ vfront-porch = <21>;
-+ hsync-len = <64>;
-+ vsync-len = <4>;
-+ de-active = <1>;
-+ pixelclk-active = <0>;
-+ };
-+ };
-+ };
-+};
-+
-+&pwm3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm3>;
-+ status = "okay";
-+};
-+
-+&snvs_pwrkey {
-+ status = "disabled";
-+};
-+
-+&tsc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_tsc>;
-+ xnur-gpio = <&gpio1 3 GPIO_ACTIVE_LOW>;
-+ measure-delay-time = <0xffff>;
-+ pre-charge-time = <0xffff>;
-+ status = "okay";
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ status = "okay";
-+};
-+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
-+ status = "okay";
-+};
-+
-+&usbotg1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg1_id>;
-+ vbus-supply = <®_usbotg1_vbus>;
-+ dr_mode = "otg";
-+ disable-over-current;
-+ status = "okay";
-+};
-+
-+&usbotg2 {
-+ vbus-supply = <®_usbotg2_vbus>;
-+ dr_mode = "host";
-+ disable-over-current;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpios>;
-+
-+ pinctrl_ecspi4: ecspi4grp {
-+ fsl,pins = <
-+ MX6UL_PAD_NAND_DATA04__ECSPI4_SCLK 0x1b0b0
-+ MX6UL_PAD_NAND_DATA05__ECSPI4_MOSI 0x1b0b0
-+ MX6UL_PAD_NAND_DATA06__ECSPI4_MISO 0x1b0b0
-+ MX6UL_PAD_NAND_DATA01__GPIO4_IO03 0x1b0b0
-+ MX6UL_PAD_NAND_DATA07__GPIO4_IO09 0x1b0b0
-+ >;
-+ };
-+
-+ pinctrl_flexcan1: flexcan1grp {
-+ fsl,pins = <
-+ MX6UL_PAD_UART3_CTS_B__FLEXCAN1_TX 0x0b0b0
-+ MX6UL_PAD_UART3_RTS_B__FLEXCAN1_RX 0x0b0b0
-+ >;
-+ };
-+
-+ pinctrl_flexcan2: flexcan2grp {
-+ fsl,pins = <
-+ MX6UL_PAD_UART2_CTS_B__FLEXCAN2_TX 0x0b0b0
-+ MX6UL_PAD_UART2_RTS_B__FLEXCAN2_RX 0x0b0b0
-+ >;
-+ };
-+
-+ pinctrl_gpios: gpiosgrp {
-+ fsl,pins = <
-+ MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x0b0b0
-+ MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x0b0b0
-+ MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x0b0b0
-+ MX6UL_PAD_NAND_RE_B__GPIO4_IO00 0x0b0b0
-+ MX6UL_PAD_GPIO1_IO08__GPIO1_IO08 0x0b0b0
-+ MX6UL_PAD_UART1_CTS_B__GPIO1_IO18 0x0b0b0
-+ MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x0b0b0
-+ MX6UL_PAD_NAND_WE_B__GPIO4_IO01 0x0b0b0
-+ MX6UL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x0b0b0
-+ MX6UL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x0b0b0
-+ MX6UL_PAD_SNVS_TAMPER3__GPIO5_IO03 0x0b0b0
-+ MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04 0x0b0b0
-+ MX6UL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x0b0b0
-+ MX6UL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x0b0b0
-+ MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x0b0b0
-+ MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x0b0b0
-+ >;
-+ };
-+
-+ pinctrl_gpio_keys: gpiokeysgrp {
-+ fsl,pins = <
-+ MX6UL_PAD_ENET2_TX_DATA0__GPIO2_IO11 0x0b0b0
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0
-+ MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
-+ MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
-+ >;
-+ };
-+
-+ pinctrl_lcdif: lcdifgrp {
-+ fsl,pins = <
-+ MX6UL_PAD_LCD_CLK__LCDIF_CLK 0x100b1
-+ MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE 0x100b1
-+ MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC 0x100b1
-+ MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC 0x100b1
-+ MX6UL_PAD_LCD_DATA00__LCDIF_DATA00 0x100b1
-+ MX6UL_PAD_LCD_DATA01__LCDIF_DATA01 0x100b1
-+ MX6UL_PAD_LCD_DATA02__LCDIF_DATA02 0x100b1
-+ MX6UL_PAD_LCD_DATA03__LCDIF_DATA03 0x100b1
-+ MX6UL_PAD_LCD_DATA04__LCDIF_DATA04 0x100b1
-+ MX6UL_PAD_LCD_DATA05__LCDIF_DATA05 0x100b1
-+ MX6UL_PAD_LCD_DATA06__LCDIF_DATA06 0x100b1
-+ MX6UL_PAD_LCD_DATA07__LCDIF_DATA07 0x100b1
-+ MX6UL_PAD_LCD_DATA08__LCDIF_DATA08 0x100b1
-+ MX6UL_PAD_LCD_DATA09__LCDIF_DATA09 0x100b1
-+ MX6UL_PAD_LCD_DATA10__LCDIF_DATA10 0x100b1
-+ MX6UL_PAD_LCD_DATA11__LCDIF_DATA11 0x100b1
-+ MX6UL_PAD_LCD_DATA12__LCDIF_DATA12 0x100b1
-+ MX6UL_PAD_LCD_DATA13__LCDIF_DATA13 0x100b1
-+ MX6UL_PAD_LCD_DATA14__LCDIF_DATA14 0x100b1
-+ MX6UL_PAD_LCD_DATA15__LCDIF_DATA15 0x100b1
-+ MX6UL_PAD_LCD_DATA16__LCDIF_DATA16 0x100b1
-+ MX6UL_PAD_LCD_DATA17__LCDIF_DATA17 0x100b1
-+ >;
-+ };
-+
-+ pinctrl_led: ledgrp {
-+ fsl,pins = <
-+ MX6UL_PAD_LCD_RESET__GPIO3_IO04 0x0b0b0
-+ >;
-+ };
-+
-+ pinctrl_pwm3: pwm3grp {
-+ fsl,pins = <
-+ MX6UL_PAD_NAND_ALE__PWM3_OUT 0x1b0b0
-+ >;
-+ };
-+
-+ pinctrl_tsc: tscgrp {
-+ fsl,pins = <
-+ MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0xb0
-+ MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0xb0
-+ MX6UL_PAD_GPIO1_IO03__GPIO1_IO03 0xb0
-+ MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0xb0
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1
-+ MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1
-+ MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_usbotg1_id: usbotg1idgrp {
-+ fsl,pins = <
-+ MX6UL_PAD_GPIO1_IO00__ANATOP_OTG1_ID 0x1b0b0
-+ >;
-+ };
-+
-+ pinctrl_usbotg1_vbus: usbotg1vbusgrp {
-+ fsl,pins = <
-+ MX6UL_PAD_GPIO1_IO05__GPIO1_IO05 0x1b0b0
-+ >;
-+ };
-+
-+ pinctrl_usbotg2_vbus: usbotg2vbusgrp {
-+ fsl,pins = <
-+ MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x1b0b0
-+ >;
-+ };
-+
-+ pinctrl_w1: w1grp {
-+ fsl,pins = <
-+ MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x0b0b0
-+ >;
-+ };
-+};
-diff --git a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
-deleted file mode 100644
-index a031bee311df..000000000000
---- a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
-+++ /dev/null
-@@ -1,192 +0,0 @@
--/*
-- * Copyright 2017 Armadeus Systems <su...@ar...>
-- *
-- * This file is dual-licensed: you can use it either under the terms
-- * of the GPL or the X11 license, at your option. Note that this dual
-- * licensing only applies to this file, and not this project as a
-- * whole.
-- *
-- * a) This file 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.
-- *
-- * This file is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public
-- * License along with this file; if not, write to the Free
-- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-- * MA 02110-1301 USA
-- *
-- * Or, alternatively,
-- *
-- * b) Permission is hereby granted, free of charge, to any person
-- * obtaining a copy of this software and associated documentation
-- * files (the "Software"), to deal in the Software without
-- * restriction, including without limitation the rights to use,
-- * copy, modify, merge, publish, distribute, sublicense, and/or
-- * sell copies of the Software, and to permit persons to whom the
-- * Software is furnished to do so, subject to the following
-- * conditions:
-- *
-- * The above copyright notice and this permission notice shall be
-- * included in all copies or substantial portions of the Software.
-- *
-- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-- * OTHER DEALINGS IN THE SOFTWARE.
-- */
--
--#include "imx6ul.dtsi"
--
--/ {
-- memory@80000000 {
-- reg = <0x80000000 0>; /* will be filled by U-Boot */
-- };
--
-- reg_3v3: regulator-3v3 {
-- compatible = "regulator-fixed";
-- regulator-name = "3V3";
-- regulator-min-microvolt = <3300000>;
-- regulator-max-microvolt = <3300000>;
-- };
--
-- usdhc3_pwrseq: usdhc3-pwrseq {
-- compatible = "mmc-pwrseq-simple";
-- reset-gpios = <&gpio2 9 GPIO_ACTIVE_LOW>;
-- };
--};
--
--&fec1 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_enet1>;
-- phy-mode = "rmii";
-- phy-reset-duration = <1>;
-- phy-reset-gpios = <&gpio4 2 GPIO_ACTIVE_LOW>;
-- phy-handle = <ðphy1>;
-- phy-supply = <®_3v3>;
-- status = "okay";
--
-- mdio: mdio {
-- #address-cells = <1>;
-- #size-cells = <0>;
--
-- ethphy1: ethernet-phy@1 {
-- compatible = "ethernet-phy-ieee802.3-c22";
-- reg = <1>;
-- interrupt-parent = <&gpio4>;
-- interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
-- status = "okay";
-- };
-- };
--};
--
--/* Bluetooth */
--&uart8 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart8>;
-- uart-has-rtscts;
-- status = "okay";
--};
--
--/* eMMC */
--&usdhc1 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_usdhc1>;
-- bus-width = <8>;
-- no-1-8-v;
-- non-removable;
-- status = "okay";
--};
--
--/* WiFi */
--&usdhc2 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_usdhc2>;
-- bus-width = <4>;
-- no-1-8-v;
-- non-removable;
-- mmc-pwrseq = <&usdhc3_pwrseq>;
-- status = "okay";
--
-- #address-cells = <1>;
-- #size-cells = <0>;
--
-- brcmf: wifi@1 {
-- compatible = "brcm,bcm4329-fmac";
-- reg = <1>;
-- interrupt-parent = <&gpio2>;
-- interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
-- interrupt-names = "host-wake";
-- };
--};
--
--&iomuxc {
-- pinctrl_enet1: enet1grp {
-- fsl,pins = <
-- MX6UL_PAD_GPIO1_IO06__ENET1_MDIO 0x1b0b0
-- MX6UL_PAD_GPIO1_IO07__ENET1_MDC 0x1b0b0
-- MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER 0x130b0
-- MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN 0x130b0
-- MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x130b0
-- MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x130b0
-- MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0
-- MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0
-- MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN 0x1b0b0
-- /* INT# */
-- MX6UL_PAD_NAND_DQS__GPIO4_IO16 0x1b0b0
-- /* RST# */
-- MX6UL_PAD_NAND_DATA00__GPIO4_IO02 0x130b0
-- MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x4001b031
-- >;
-- };
--
-- pinctrl_uart8: uart8grp {
-- fsl,pins = <
-- MX6UL_PAD_ENET2_TX_EN__UART8_DCE_RX 0x1b0b0
-- MX6UL_PAD_ENET2_TX_DATA1__UART8_DCE_TX 0x1b0b0
-- MX6UL_PAD_ENET2_RX_ER__UART8_DCE_RTS 0x1b0b0
-- MX6UL_PAD_ENET2_TX_CLK__UART8_DCE_CTS 0x1b0b0
-- /* BT_REG_ON */
-- MX6UL_PAD_ENET2_RX_EN__GPIO2_IO10 0x130b0
-- >;
-- };
--
-- pinctrl_usdhc1: usdhc1grp {
-- fsl,pins = <
-- MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059
-- MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10059
-- MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x17059
-- MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059
-- MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059
-- MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059
-- MX6UL_PAD_NAND_READY_B__USDHC1_DATA4 0x17059
-- MX6UL_PAD_NAND_CE0_B__USDHC1_DATA5 0x17059
-- MX6UL_PAD_NAND_CE1_B__USDHC1_DATA6 0x17059
-- MX6UL_PAD_NAND_CLE__USDHC1_DATA7 0x17059
-- >;
-- };
--
-- pinctrl_usdhc2: usdhc2grp {
-- fsl,pins = <
-- MX6UL_PAD_LCD_DATA18__USDHC2_CMD 0x1b0b0
-- MX6UL_PAD_LCD_DATA19__USDHC2_CLK 0x100b0
-- MX6UL_PAD_LCD_DATA20__USDHC2_DATA0 0x1b0b0
-- MX6UL_PAD_LCD_DATA21__USDHC2_DATA1 0x1b0b0
-- MX6UL_PAD_LCD_DATA22__USDHC2_DATA2 0x1b0b0
-- MX6UL_PAD_LCD_DATA23__USDHC2_DATA3 0x1b0b0
-- /* WL_REG_ON */
-- MX6UL_PAD_ENET2_RX_DATA1__GPIO2_IO09 0x130b0
-- /* WL_IRQ */
-- MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08 0x1b0b0
-- >;
-- };
--};
-diff --git a/arch/arm/boot/dts/imx6ul-opos6uldev.dts b/arch/arm/boot/dts/imx6ul-opos6uldev.dts
-index 0e59ee57fd55..3ad25a9de4d4 100644
---- a/arch/arm/boot/dts/imx6ul-opos6uldev.dts
-+++ b/arch/arm/boot/dts/imx6ul-opos6uldev.dts
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2017 Armadeus Systems <su...@ar...>
-+ * Copyright 2018 Armadeus Systems <su...@ar...>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
++ imx6ull-opos6uldev.dtb \
+ imx6ull-14x14-evk-btwifi.dtb \
+ imx6ull-14x14-evk-btwifi-oob.dtb \
+ imx6ull-14x14-evk-emmc.dtb \
+Index: linux-94da7bdc489ba686d868bcf80678a37cae22673e/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+===================================================================
+--- linux-94da7bdc489ba686d868bcf80678a37cae22673e.orig/arch/arm/boot/dts/imx6ul-opos6uldev.dts
++++ linux-94da7bdc489ba686d868bcf80678a37cae22673e/arch/arm/boot/dts/imx6ul-opos6uldev.dts
@@ -46,367 +46,11 @@
*/
@@ -867,8 +51,7 @@ index 0e59ee57fd55..3ad25a9de4d4 100644
/ {
- model = "Armadeus Systems OPOS6UL SoM on OPOS6ULDev board";
-+ model = "Armadeus Systems OPOS6UL SoM (i.MX6UL) on OPOS6ULDev board";
- compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ul";
+- compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ul";
-
- chosen {
- stdout-path = &uart1;
@@ -1066,230 +249,1123 @@ index 0e59ee57fd55..3ad25a9de4d4 100644
- status = "okay";
-};
-
--&usbotg2 {
-- vbus-supply = <®_usbotg2_vbus>;
-- dr_mode = "host";
-- disable-over-current;
-- status = "okay";
--};
+-&usbotg2 {
+- vbus-supply = <®_usbotg2_vbus>;
+- dr_mode = "host";
+- disable-over-current;
+- status = "okay";
+-};
+-
+-&iomuxc {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_gpios>;
+-
+- pinctrl_ecspi4: ecspi4grp {
+- fsl,pins = <
+- MX6UL_PAD_NAND_DATA04__ECSPI4_SCLK 0x1b0b0
+- MX6UL_PAD_NAND_DATA05__ECSPI4_MOSI 0x1b0b0
+- MX6UL_PAD_NAND_DATA06__ECSPI4_MISO 0x1b0b0
+- MX6UL_PAD_NAND_DATA01__GPIO4_IO03 0x1b0b0
+- MX6UL_PAD_NAND_DATA07__GPIO4_IO09 0x1b0b0
+- >;
+- };
+-
+- pinctrl_flexcan1: flexcan1grp {
+- fsl,pins = <
+- MX6UL_PAD_UART3_CTS_B__FLEXCAN1_TX 0x0b0b0
+- MX6UL_PAD_UART3_RTS_B__FLEXCAN1_RX 0x0b0b0
+- >;
+- };
+-
+- pinctrl_flexcan2: flexcan2grp {
+- fsl,pins = <
+- MX6UL_PAD_UART2_CTS_B__FLEXCAN2_TX 0x0b0b0
+- MX6UL_PAD_UART2_RTS_B__FLEXCAN2_RX 0x0b0b0
+- >;
+- };
+-
+- pinctrl_gpios: gpiosgrp {
+- fsl,pins = <
+- MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x0b0b0
+- MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x0b0b0
+- MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x0b0b0
+- MX6UL_PAD_NAND_RE_B__GPIO4_IO00 0x0b0b0
+- MX6UL_PAD_GPIO1_IO08__GPIO1_IO08 0x0b0b0
+- MX6UL_PAD_UART1_CTS_B__GPIO1_IO18 0x0b0b0
+- MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x0b0b0
+- MX6UL_PAD_NAND_WE_B__GPIO4_IO01 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER3__GPIO5_IO03 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x0b0b0
+- >;
+- };
+-
+- pinctrl_gpio_keys: gpiokeysgrp {
+- fsl,pins = <
+- MX6UL_PAD_ENET2_TX_DATA0__GPIO2_IO11 0x0b0b0
+- >;
+- };
+-
+- pinctrl_i2c1: i2c1grp {
+- fsl,pins = <
+- MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0
+- MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0
+- >;
+- };
+-
+- pinctrl_i2c2: i2c2grp {
+- fsl,pins = <
+- MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
+- MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
+- >;
+- };
+-
+- pinctrl_lcdif: lcdifgrp {
+- fsl,pins = <
+- MX6UL_PAD_LCD_CLK__LCDIF_CLK 0x100b1
+- MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE 0x100b1
+- MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC 0x100b1
+- MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC 0x100b1
+- MX6UL_PAD_LCD_DATA00__LCDIF_DATA00 0x100b1
+- MX6UL_PAD_LCD_DATA01__LCDIF_DATA01 0x100b1
+- MX6UL_PAD_LCD_DATA02__LCDIF_DATA02 0x100b1
+- MX6UL_PAD_LCD_DATA03__LCDIF_DATA03 0x100b1
+- MX6UL_PAD_LCD_DATA04__LCDIF_DATA04 0x100b1
+- MX6UL_PAD_LCD_DATA05__LCDIF_DATA05 0x100b1
+- MX6UL_PAD_LCD_DATA06__LCDIF_DATA06 0x100b1
+- MX6UL_PAD_LCD_DATA07__LCDIF_DATA07 0x100b1
+- MX6UL_PAD_LCD_DATA08__LCDIF_DATA08 0x100b1
+- MX6UL_PAD_LCD_DATA09__LCDIF_DATA09 0x100b1
+- MX6UL_PAD_LCD_DATA10__LCDIF_DATA10 0x100b1
+- MX6UL_PAD_LCD_DATA11__LCDIF_DATA11 0x100b1
+- MX6UL_PAD_LCD_DATA12__LCDIF_DATA12 0x100b1
+- MX6UL_PAD_LCD_DATA13__LCDIF_DATA13 0x100b1
+- MX6UL_PAD_LCD_DATA14__LCDIF_DATA14 0x100b1
+- MX6UL_PAD_LCD_DATA15__LCDIF_DATA15 0x100b1
+- MX6UL_PAD_LCD_DATA16__LCDIF_DATA16 0x100b1
+- MX6UL_PAD_LCD_DATA17__LCDIF_DATA17 0x100b1
+- >;
+- };
+-
+- pinctrl_led: ledgrp {
+- fsl,pins = <
+- MX6UL_PAD_LCD_RESET__GPIO3_IO04 0x0b0b0
+- >;
+- };
+-
+- pinctrl_pwm3: pwm3grp {
+- fsl,pins = <
+- MX6UL_PAD_NAND_ALE__PWM3_OUT 0x1b0b0
+- >;
+- };
+-
+- pinctrl_tsc: tscgrp {
+- fsl,pins = <
+- MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0xb0
+- MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0xb0
+- MX6UL_PAD_GPIO1_IO03__GPIO1_IO03 0xb0
+- MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0xb0
+- >;
+- };
+-
+- pinctrl_uart1: uart1grp {
+- fsl,pins = <
+- MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1
+- MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1
+- >;
+- };
-
--&iomuxc {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_gpios>;
+- pinctrl_uart2: uart2grp {
+- fsl,pins = <
+- MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1
+- MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1
+- >;
+- };
-
-- pinctrl_ecspi4: ecspi4grp {
+- pinctrl_usbotg1_id: usbotg1idgrp {
- fsl,pins = <
-- MX6UL_PAD_NAND_DATA04__ECSPI4_SCLK 0x1b0b0
-- MX6UL_PAD_NAND_DATA05__ECSPI4_MOSI 0x1b0b0
-- MX6UL_PAD_NAND_DATA06__ECSPI4_MISO 0x1b0b0
-- MX6UL_PAD_NAND_DATA01__GPIO4_IO03 0x1b0b0
-- MX6UL_PAD_NAND_DATA07__GPIO4_IO09 0x1b0b0
+- MX6UL_PAD_GPIO1_IO00__ANATOP_OTG1_ID 0x1b0b0
- >;
- };
-
-- pinctrl_flexcan1: flexcan1grp {
+- pinctrl_usbotg1_vbus: usbotg1vbusgrp {
- fsl,pins = <
-- MX6UL_PAD_UART3_CTS_B__FLEXCAN1_TX 0x0b0b0
-- MX6UL_PAD_UART3_RTS_B__FLEXCAN1_RX 0x0b0b0
+- MX6UL_PAD_GPIO1_IO05__GPIO1_IO05 0x1b0b0
- >;
- };
-
-- pinctrl_flexcan2: flexcan2grp {
+- pinctrl_usbotg2_vbus: usbotg2vbusgrp {
- fsl,pins = <
-- MX6UL_PAD_UART2_CTS_B__FLEXCAN2_TX 0x0b0b0
-- MX6UL_PAD_UART2_RTS_B__FLEXCAN2_RX 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x1b0b0
- >;
- };
-
-- pinctrl_gpios: gpiosgrp {
+- pinctrl_w1: w1grp {
- fsl,pins = <
-- MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x0b0b0
-- MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x0b0b0
-- MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x0b0b0
-- MX6UL_PAD_NAND_RE_B__GPIO4_IO00 0x0b0b0
-- MX6UL_PAD_GPIO1_IO08__GPIO1_IO08 0x0b0b0
-- MX6UL_PAD_UART1_CTS_B__GPIO1_IO18 0x0b0b0
-- MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x0b0b0
-- MX6UL_PAD_NAND_WE_B__GPIO4_IO01 0x0b0b0
-- MX6UL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x0b0b0
-- MX6UL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x0b0b0
-- MX6UL_PAD_SNVS_TAMPER3__GPIO5_IO03 0x0b0b0
-- MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04 0x0b0b0
-- MX6UL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x0b0b0
-- MX6UL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x0b0b0
-- MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x0b0b0
-- MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x0b0b0
- >;
- };
++ model = "Armadeus Systems OPOS6UL SoM (i.MX6UL) on OPOS6ULDev board";
++ compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ul";
+ };
+Index: linux-94da7bdc489ba686d868bcf80678a37cae22673e/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
+===================================================================
+--- /dev/null
++++ linux-94da7bdc489ba686d868bcf80678a37cae22673e/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
+@@ -0,0 +1,199 @@
++/*
++ * Copyright 2018 Armadeus Systems <su...@ar...>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ * a) This file 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.
++ *
++ * This file is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this file; if not, write to the Free
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301 USA
++ *
++ * Or, alternatively,
++ *
++ * b) Permission is hereby granted, free of charge, to any person
++ * obtaining a copy of this software and associated documentation
++ * files (the "Software"), to deal in the Software without
++ * restriction, including without limitation the rights to use,
++ * copy, modify, merge, publish, distribute, sublicense, and/or
++ * sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following
++ * conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/ {
++ memory {
++ reg = <0x80000000 0>; /* will be filled by U-Boot */
++ };
++
++ pxp_v4l2 {
++ compatible = "fsl,imx6ul-pxp-v4l2", "fsl,imx6sx-pxp-v4l2", "fsl,imx6sl-pxp-v4l2";
++ status = "okay";
++ };
++
++ reg_3v3: regulator-3v3 {
++ compatible = "regulator-fixed";
++ regulator-name = "3V3";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ };
++
++ usdhc3_pwrseq: usdhc3_pwrseq {
++ compatible = "mmc-pwrseq-simple";
++ reset-gpios = <&gpio2 9 GPIO_ACTIVE_LOW>;
++ };
++};
++
++&fec1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_enet1>;
++ phy-mode = "rmii";
++ phy-reset-duration = <1>;
++ phy-reset-gpios = <&gpio4 2 GPIO_ACTIVE_LOW>;
++ phy-handle = <ðphy1>;
++ phy-supply = <®_3v3>;
++ status = "okay";
++
++ mdio: mdio {
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ ethphy1: ethernet-phy@1 {
++ compatible = "ethernet-phy-ieee802.3-c22";
++ reg = <1>;
++ interrupt-parent = <&gpio4>;
++ interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
++ status = "okay";
++ };
++ };
++};
++
++&pxp {
++ status = "okay";
++};
++
++/* Bluetooth */
++&uart8 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart8>;
++ fsl,uart-has-rtscts;
++ status = "okay";
++};
++
++/* eMMC */
++&usdhc1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc1>;
++ bus-width = <8>;
++ no-1-8-v;
++ non-removable;
++ status = "okay";
++};
++
++/* WiFi */
++&usdhc2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc2>;
++ bus-width = <4>;
++ no-1-8-v;
++ non-removable;
++ mmc-pwrseq = <&usdhc3_pwrseq>;
++ status = "okay";
++
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ brcmf: bcrmf@1 {
++ compatible = "brcm,bcm4329-fmac";
++ reg = <1>;
++ interrupt-parent = <&gpio2>;
++ interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
++ interrupt-names = "host-wake";
++ };
++};
++
++&iomuxc {
++ pinctrl_enet1: enet1grp {
++ fsl,pins ...
[truncated message content] |