[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-134-g9919e0488
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-134-g9919e0488
|
From: Sébastien S. <ss...@us...> - 2019-10-15 14:10:51
|
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 9919e04884f59dd6db8dd05a0915972700076cd9 (commit)
via e17900b3ddc6a7141e67fa316564e2d60577173e (commit)
via 1cbcd23f8d4ca6cd33f11ec9f5d30656a9a84bb7 (commit)
from bbb397e85d72faf4703d111cedbd49765efe6e27 (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 9919e04884f59dd6db8dd05a0915972700076cd9
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Oct 14 14:02:41 2019 +0200
[BSP] add APF6v2 support (linux 4.19 only for now)
commit e17900b3ddc6a7141e67fa316564e2d60577173e
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Oct 14 13:47:11 2019 +0200
[BUILDROOT] opos6ul{,nano,sp} / apf6mainline-4.19: bump kernel to 4.19.79
commit 1cbcd23f8d4ca6cd33f11ec9f5d30656a9a84bb7
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Oct 14 13:39:05 2019 +0200
[LINUX] 4.19: fix patch 0705
Properly indent pinctrl nodes...
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6mainline-4.19_defconfig | 6 +-
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 2 +-
.../device/armadeus/apf6/apf6-linux-4.19.config | 1 +
...705-armadeus-dts-apf6dev-fix-dts-overload.patch | 491 ++++++++++++++++++++-
.../4.19/0706-armadeus-dts-apf6-add-mdio-bus.patch | 26 +-
.../4.19/0707-armadeus-dts-apf6-fix-wifi.patch | 24 +-
...6qdl-apf6-apf6dev-switch-boards-to-SPDX-i.patch | 249 +++++++++++
...9-ARM-dts-add-Armadeus-APF6v2-SoM-support.patch | 160 +++++++
...ts-imx6qdl-apf6-add-flow-control-to-uart2.patch | 32 ++
11 files changed, 941 insertions(+), 54 deletions(-)
create mode 100644 patches/linux/4.19/0708-ARM-dts-imx6qdl-apf6-apf6dev-switch-boards-to-SPDX-i.patch
create mode 100644 patches/linux/4.19/0709-ARM-dts-add-Armadeus-APF6v2-SoM-support.patch
create mode 100644 patches/linux/4.19/0710-ARM-dts-imx6qdl-apf6-add-flow-control-to-uart2.patch
diff --git a/buildroot/configs/apf6mainline-4.19_defconfig b/buildroot/configs/apf6mainline-4.19_defconfig
index 6f1505d63..c7e581201 100644
--- a/buildroot/configs/apf6mainline-4.19_defconfig
+++ b/buildroot/configs/apf6mainline-4.19_defconfig
@@ -25,12 +25,12 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.42"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.79"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev imx6q-apf6v2dev imx6dl-apf6v2dev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
@@ -105,6 +105,7 @@ BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_JPEG is not set
# BR2_PACKAGE_FBV_GIF is not set
BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_EVTEST=y
@@ -146,6 +147,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_FSCK=y
+BR2_PACKAGE_UTIL_LINUX_RFKILL=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 2895d10e4..3a72e5f3b 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.77"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.79"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 206e41020..536eb55ba 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.77"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.79"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index 7ec0f416f..1931ab991 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.77"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.79"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-4.19.config b/buildroot/target/device/armadeus/apf6/apf6-linux-4.19.config
index 473223496..9ece759ab 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-4.19.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-4.19.config
@@ -175,6 +175,7 @@ CONFIG_USB_NET_CDC_MBIM=y
# CONFIG_USB_NET_NET1080 is not set
# CONFIG_USB_NET_CDC_SUBSET is not set
# CONFIG_USB_NET_ZAURUS is not set
+CONFIG_BRCMFMAC=m
# CONFIG_RTL_CARDS is not set
CONFIG_WL12XX=m
CONFIG_WLCORE_SDIO=m
diff --git a/patches/linux/4.19/0705-armadeus-dts-apf6dev-fix-dts-overload.patch b/patches/linux/4.19/0705-armadeus-dts-apf6dev-fix-dts-overload.patch
index e3a2acd66..899547d8c 100644
--- a/patches/linux/4.19/0705-armadeus-dts-apf6dev-fix-dts-overload.patch
+++ b/patches/linux/4.19/0705-armadeus-dts-apf6dev-fix-dts-overload.patch
@@ -2,39 +2,482 @@ Without this, impossible to overload pinctrl from APF6 SOM.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-4.19.56/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
---- linux-4.19.56.orig/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-+++ linux-4.19.56/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -302,7 +302,6 @@
+--- linux-4.19.78.orig/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
++++ linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+@@ -302,178 +302,176 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpios>;
- apf6dev {
- pinctrl_audmux: audmuxgrp {
- fsl,pins = <
- MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x1b0b0
-@@ -475,5 +474,4 @@
- MX6QDL_PAD_CSI0_DAT17__GPIO6_IO03 0x1b0b0
- >;
- };
-- };
+- pinctrl_audmux: audmuxgrp {
+- fsl,pins = <
+- MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x1b0b0
+- MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x1b0b0
+- MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x1b0b0
+- MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x1b0b0
+- MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0
+- >;
+- };
+-
+- 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 0x1b0b0
+- MX6QDL_PAD_KEY_ROW2__GPIO4_IO11 0x1b0b0
+- MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x1b0b0
+- >;
+- };
+-
+- pinctrl_flexcan2: flexcan2grp {
+- fsl,pins = <
+- MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x1b0b0
+- MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x1b0b0
+- >;
+- };
+-
+- 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 0x130b0
+- >;
+- };
+-
+- pinctrl_gpios: gpiosgrp {
+- fsl,pins = <
+- MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x100b1
+- MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12 0x100b1
+- MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13 0x100b1
+- MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14 0x100b1
+- MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15 0x100b1
+- MX6QDL_PAD_DISP0_DAT22__GPIO5_IO16 0x100b1
+- MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 0x100b1
+- MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18 0x100b1
+- MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21 0x100b1
+- >;
+- };
+-
+- pinctrl_gsm: gsmgrp {
+- fsl,pins = <
+- MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x130b0 /* GSM_POKIN */
+- MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x130b0 /* GSM_PWR_EN */
+- >;
+- };
+-
+- pinctrl_i2c1: i2c1grp {
+- fsl,pins = <
+- MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
+- MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
+- >;
+- };
+-
+- 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 0x100b1
+- MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15 0x100b1
+- MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0x100b1
+- MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0x100b1
+- MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00 0x100b1
+- MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x100b1
+- MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x100b1
+- MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0x100b1
+- MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0x100b1
+- MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0x100b1
+- MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0x100b1
+- MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0x100b1
+- MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0x100b1
+- MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0x100b1
+- MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0x100b1
+- MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0x100b1
+- MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0x100b1
+- MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0x100b1
+- MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0x100b1
+- MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0x100b1
+- MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0x100b1
+- MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17 0x100b1
+- >;
+- };
+-
+- pinctrl_pcie: pciegrp {
+- fsl,pins = <
+- MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02 0x130b0
+- >;
+- };
+-
+- pinctrl_pwm3: pwm3grp {
+- fsl,pins = <
+- MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
+- >;
+- };
+-
+- pinctrl_uart1: uart1grp {
+- fsl,pins = <
+- MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b0
+- MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b0
+- >;
+- };
+-
+- pinctrl_uart3: uart3grp {
+- fsl,pins = <
+- MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b0
+- MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b0
+- MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b0
+- MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b0
+- >;
+- };
+-
+- pinctrl_uart4: uart4grp {
+- fsl,pins = <
+- MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b0
+- MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b0
+- >;
+- };
+-
+- pinctrl_usbotg: usbotggrp {
+- fsl,pins = <
+- MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x1b0b0
+- >;
+- };
+-
+- 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
+- >;
+- };
+-
+- pinctrl_spdif: spdifgrp {
+- fsl,pins = <
+- MX6QDL_PAD_GPIO_19__SPDIF_OUT 0x1b0b0
+- >;
+- };
+-
+- pinctrl_touchscreen: touchscreengrp {
+- fsl,pins = <
+- MX6QDL_PAD_CSI0_DAT17__GPIO6_IO03 0x1b0b0
+- >;
+- };
++ pinctrl_audmux: audmuxgrp {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x1b0b0
++ MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x1b0b0
++ MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x1b0b0
++ MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x1b0b0
++ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0
++ >;
++ };
++
++ 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 0x1b0b0
++ MX6QDL_PAD_KEY_ROW2__GPIO4_IO11 0x1b0b0
++ MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x1b0b0
++ >;
++ };
++
++ pinctrl_flexcan2: flexcan2grp {
++ fsl,pins = <
++ MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x1b0b0
++ MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x1b0b0
++ >;
++ };
++
++ 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 0x130b0
++ >;
++ };
++
++ pinctrl_gpios: gpiosgrp {
++ fsl,pins = <
++ MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x100b1
++ MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12 0x100b1
++ MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13 0x100b1
++ MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14 0x100b1
++ MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15 0x100b1
++ MX6QDL_PAD_DISP0_DAT22__GPIO5_IO16 0x100b1
++ MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 0x100b1
++ MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18 0x100b1
++ MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21 0x100b1
++ >;
++ };
++
++ pinctrl_gsm: gsmgrp {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x130b0 /* GSM_POKIN */
++ MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x130b0 /* GSM_PWR_EN */
++ >;
++ };
++
++ pinctrl_i2c1: i2c1grp {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
++ MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
++ >;
++ };
++
++ 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 0x100b1
++ MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15 0x100b1
++ MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0x100b1
++ MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0x100b1
++ MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00 0x100b1
++ MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x100b1
++ MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x100b1
++ MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0x100b1
++ MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0x100b1
++ MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0x100b1
++ MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0x100b1
++ MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0x100b1
++ MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0x100b1
++ MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0x100b1
++ MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0x100b1
++ MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0x100b1
++ MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0x100b1
++ MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0x100b1
++ MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0x100b1
++ MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0x100b1
++ MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0x100b1
++ MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17 0x100b1
++ >;
++ };
++
++ pinctrl_pcie: pciegrp {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02 0x130b0
++ >;
++ };
++
++ pinctrl_pwm3: pwm3grp {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
++ >;
++ };
++
++ pinctrl_uart1: uart1grp {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b0
++ MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b0
++ >;
++ };
++
++ pinctrl_uart3: uart3grp {
++ fsl,pins = <
++ MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b0
++ MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b0
++ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b0
++ MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b0
++ >;
++ };
++
++ pinctrl_uart4: uart4grp {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b0
++ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b0
++ >;
++ };
++
++ pinctrl_usbotg: usbotggrp {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x1b0b0
++ >;
++ };
++
++ 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
++ >;
++ };
++
++ pinctrl_spdif: spdifgrp {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_19__SPDIF_OUT 0x1b0b0
++ >;
++ };
++
++ pinctrl_touchscreen: touchscreengrp {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT17__GPIO6_IO03 0x1b0b0
++ >;
+ };
};
-Index: linux-4.19.56/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
---- linux-4.19.56.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-+++ linux-4.19.56/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-@@ -94,7 +94,6 @@
+--- linux-4.19.78.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -94,65 +94,63 @@
};
&iomuxc {
- apf6 {
- pinctrl_enet: enetgrp {
- fsl,pins = <
- MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b8b0
-@@ -154,5 +153,4 @@
- MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
- >;
- };
-- };
+- pinctrl_enet: enetgrp {
+- fsl,pins = <
+- MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b8b0
+- MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
+- MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
+- MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x130b0
+- MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x130b0
+- 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_RGMII_RXC__RGMII_RXC 0x13030
+- MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b030
+- MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x13030
+- MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1f030
+- MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1f030
+- MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x13030
+- >;
+- };
++ pinctrl_enet: enetgrp {
++ fsl,pins = <
++ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b8b0
++ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
++ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
++ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x130b0
++ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x130b0
++ 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_RGMII_RXC__RGMII_RXC 0x13030
++ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b030
++ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x13030
++ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1f030
++ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1f030
++ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x13030
++ >;
++ };
+
+- pinctrl_uart2: uart2grp {
+- fsl,pins = <
+- MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b0
+- MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b0
+- MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b0
+- MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b0
+- MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x130b0 /* BT_EN */
+- >;
+- };
++ pinctrl_uart2: uart2grp {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b0
++ MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b0
++ MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b0
++ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b0
++ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x130b0 /* 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 0x1b0b0 /* WL_EN */
+- MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x1b0b0 /* WL_IRQ */
+- >;
+- };
++ 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 0x1b0b0 /* WL_EN */
++ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x1b0b0 /* 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
+- >;
+- };
++ 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
++ >;
+ };
};
diff --git a/patches/linux/4.19/0706-armadeus-dts-apf6-add-mdio-bus.patch b/patches/linux/4.19/0706-armadeus-dts-apf6-add-mdio-bus.patch
index 1dd6f41dc..9d57a6bb1 100644
--- a/patches/linux/4.19/0706-armadeus-dts-apf6-add-mdio-bus.patch
+++ b/patches/linux/4.19/0706-armadeus-dts-apf6-add-mdio-bus.patch
@@ -1,7 +1,7 @@
-Index: linux-4.19.56/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
---- linux-4.19.56.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-+++ linux-4.19.56/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+--- linux-4.19.78.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
@@ -54,7 +54,21 @@
phy-mode = "rgmii";
phy-reset-duration = <10>;
@@ -25,13 +25,13 @@ Index: linux-4.19.56/arch/arm/boot/dts/imx6qdl-apf6.dtsi
/* Bluetooth */
@@ -99,8 +113,8 @@
- MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b8b0
- MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
- MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-- MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x130b0
-- MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x130b0
-+ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x1b0b0
-+ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x1b0b0
- MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b030
- MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b030
- MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b030
+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b8b0
+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
+- MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x130b0
+- MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x130b0
++ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x1b0b0
++ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x1b0b0
+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b030
+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b030
+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b030
diff --git a/patches/linux/4.19/0707-armadeus-dts-apf6-fix-wifi.patch b/patches/linux/4.19/0707-armadeus-dts-apf6-fix-wifi.patch
index a4687344f..615369e82 100644
--- a/patches/linux/4.19/0707-armadeus-dts-apf6-fix-wifi.patch
+++ b/patches/linux/4.19/0707-armadeus-dts-apf6-fix-wifi.patch
@@ -1,7 +1,7 @@
-Index: linux-4.19.60/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
---- linux-4.19.60.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-+++ linux-4.19.60/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+--- linux-4.19.78.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
@@ -48,6 +48,24 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
@@ -42,13 +42,13 @@ Index: linux-4.19.60/arch/arm/boot/dts/imx6qdl-apf6.dtsi
#address-cells = <1>;
@@ -148,8 +172,8 @@
- 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 0x1b0b0 /* WL_EN */
-- MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x1b0b0 /* WL_IRQ */
-+ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x130b0 /* WL_EN */
-+ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x13000 /* WL_IRQ */
- >;
- };
+ 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 0x1b0b0 /* WL_EN */
+- MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x1b0b0 /* WL_IRQ */
++ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x130b0 /* WL_EN */
++ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x130b0 /* WL_IRQ */
+ >;
+ };
diff --git a/patches/linux/4.19/0708-ARM-dts-imx6qdl-apf6-apf6dev-switch-boards-to-SPDX-i.patch b/patches/linux/4.19/0708-ARM-dts-imx6qdl-apf6-apf6dev-switch-boards-to-SPDX-i.patch
new file mode 100644
index 000000000..e59f822c0
--- /dev/null
+++ b/patches/linux/4.19/0708-ARM-dts-imx6qdl-apf6-apf6dev-switch-boards-to-SPDX-i.patch
@@ -0,0 +1,249 @@
+From 35beaea7e210c426abf389731b86b966de4207c7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Tue, 24 Sep 2019 10:04:51 +0200
+Subject: [PATCH 1/1] ARM: dts: imx6qdl-{apf6,apf6dev}: switch boards to SPDX
+ identifier
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Adopt the SPDX license identifier headers to ease license compliance
+management.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/imx6dl-apf6dev.dts | 49 ++------------------------
+ arch/arm/boot/dts/imx6q-apf6dev.dts | 49 ++------------------------
+ arch/arm/boot/dts/imx6qdl-apf6.dtsi | 49 ++------------------------
+ arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 49 ++------------------------
+ 4 files changed, 12 insertions(+), 184 deletions(-)
+
+Index: linux-4.19.78/arch/arm/boot/dts/imx6dl-apf6dev.dts
+===================================================================
+--- linux-4.19.78.orig/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-4.19.78/arch/arm/boot/dts/imx6dl-apf6dev.dts
+@@ -1,49 +1,6 @@
+-/*
+- * Copyright 2015 Armadeus Systems
+- *
+- * 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.
+- */
++// SPDX-License-Identifier: GPL-2.0 OR X11
++//
++// Copyright 2015 Armadeus Systems
+
+ /dts-v1/;
+ #include "imx6dl.dtsi"
+Index: linux-4.19.78/arch/arm/boot/dts/imx6q-apf6dev.dts
+===================================================================
+--- linux-4.19.78.orig/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-4.19.78/arch/arm/boot/dts/imx6q-apf6dev.dts
+@@ -1,49 +1,6 @@
+-/*
+- * Copyright 2015 Armadeus Systems
+- *
+- * 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.
+- */
++// SPDX-License-Identifier: GPL-2.0 OR X11
++//
++// Copyright 2015 Armadeus Systems
+
+ /dts-v1/;
+ #include "imx6q.dtsi"
+Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+===================================================================
+--- linux-4.19.78.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -1,49 +1,6 @@
+-/*
+- * Copyright 2015 Armadeus Systems
+- *
+- * 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.
+- */
++// SPDX-License-Identifier: GPL-2.0 OR X11
++//
++// Copyright 2015 Armadeus Systems
+
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/interrupt-controller/irq.h>
+Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+===================================================================
+--- linux-4.19.78.orig/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
++++ linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+@@ -1,49 +1,6 @@
+-/*
+- * Copyright 2015 Armadeus Systems
+- *
+- * 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.
+- */
++// SPDX-License-Identifier: GPL-2.0 OR X11
++//
++// Copyright 2015 Armadeus Systems
+
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/input/input.h>
diff --git a/patches/linux/4.19/0709-ARM-dts-add-Armadeus-APF6v2-SoM-support.patch b/patches/linux/4.19/0709-ARM-dts-add-Armadeus-APF6v2-SoM-support.patch
new file mode 100644
index 000000000..b05db80c6
--- /dev/null
+++ b/patches/linux/4.19/0709-ARM-dts-add-Armadeus-APF6v2-SoM-support.patch
@@ -0,0 +1,160 @@
+From 7487ad14a61ffb15ba4145437306ab0ce1207f9c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 11 Oct 2019 13:46:19 +0200
+Subject: [PATCH 1/1] ARM: dts: add Armadeus APF6v2 SoM support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+APF6v2 has a different WiFi / Bluetooth chip than APF6 so add new dts
+files to support APF6v2.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/Makefile | 2 ++
+ arch/arm/boot/dts/imx6dl-apf6v2dev.dts | 18 +++++++++++++++++
+ arch/arm/boot/dts/imx6q-apf6v2dev.dts | 22 +++++++++++++++++++++
+ arch/arm/boot/dts/imx6qdl-apf6.dtsi | 11 +++++++++--
+ arch/arm/boot/dts/imx6qdl-apf6v2.dtsi | 27 ++++++++++++++++++++++++++
+ 5 files changed, 78 insertions(+), 2 deletions(-)
+ create mode 100644 arch/arm/boot/dts/imx6dl-apf6v2dev.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-apf6v2dev.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-apf6v2.dtsi
+
+Index: linux-4.19.78/arch/arm/boot/dts/Makefile
+===================================================================
+--- linux-4.19.78.orig/arch/arm/boot/dts/Makefile
++++ linux-4.19.78/arch/arm/boot/dts/Makefile
+@@ -385,6 +385,7 @@ dtb-$(CONFIG_SOC_IMX53) += \
+ imx53-voipac-bsb.dtb
+ dtb-$(CONFIG_SOC_IMX6Q) += \
+ imx6dl-apf6dev.dtb \
++ imx6dl-apf6v2dev.dtb \
+ imx6dl-aristainetos_4.dtb \
+ imx6dl-aristainetos_7.dtb \
+ imx6dl-aristainetos2_4.dtb \
+@@ -445,6 +446,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
+ imx6q-apalis-ixora.dtb \
+ imx6q-apalis-ixora-v1.1.dtb \
+ imx6q-apf6dev.dtb \
++ imx6q-apf6v2dev.dtb \
+ imx6q-arm2.dtb \
+ imx6q-b450v3.dtb \
+ imx6q-b650v3.dtb \
+Index: linux-4.19.78/arch/arm/boot/dts/imx6dl-apf6v2dev.dts
+===================================================================
+--- /dev/null
++++ linux-4.19.78/arch/arm/boot/dts/imx6dl-apf6v2dev.dts
+@@ -0,0 +1,18 @@
++// SPDX-License-Identifier: GPL-2.0 OR X11
++//
++// Copyright 2019 Armadeus Systems
++
++/dts-v1/;
++#include "imx6dl.dtsi"
++#include "imx6qdl-apf6v2.dtsi"
++#include "imx6qdl-apf6dev.dtsi"
++
++/ {
++ model = "Armadeus APF6v2 Solo Module on APF6Dev Board";
++ compatible = "armadeus,imx6dl-apf6dev", "armadeus,imx6dl-apf6", "fsl,imx6dl";
++
++ memory@10000000 {
++ device_type = "memory";
++ reg = <0x10000000 0x20000000>;
++ };
++};
+Index: linux-4.19.78/arch/arm/boot/dts/imx6q-apf6v2dev.dts
+===================================================================
+--- /dev/null
++++ linux-4.19.78/arch/arm/boot/dts/imx6q-apf6v2dev.dts
+@@ -0,0 +1,22 @@
++// SPDX-License-Identifier: GPL-2.0 OR X11
++//
++// Copyright 2019 Armadeus Systems
++
++/dts-v1/;
++#include "imx6q.dtsi"
++#include "imx6qdl-apf6v2.dtsi"
++#include "imx6qdl-apf6dev.dtsi"
++
++/ {
++ model = "Armadeus APF6v2 Quad / Dual Module on APF6Dev Board";
++ compatible = "armadeus,imx6q-apf6dev", "armadeus,imx6q-apf6", "fsl,imx6q";
++
++ memory@10000000 {
++ device_type = "memory";
++ reg = <0x10000000 0x40000000>;
++ };
++};
++
++&sata {
++ status = "okay";
++};
+Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+===================================================================
+--- linux-4.19.78.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -71,6 +71,8 @@
+ wlcore: wlcore@2 {
+ compatible = "ti,wl1271";
+ reg = <2>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_wifi>;
+ interrupt-parent = <&gpio2>;
+ interrupts = <10 IRQ_TYPE_LEVEL_HIGH>;
+ ref-clock-frequency = <38400000>;
+@@ -129,8 +131,6 @@
+ 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 0x130b0 /* WL_EN */
+- MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x130b0 /* WL_IRQ */
+ >;
+ };
+
+@@ -148,4 +148,11 @@
+ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
+ >;
+ };
++
++ pinctrl_wifi: wifigrp {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x130b0 /* WL_EN */
++ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x130b0 /* WL_IRQ */
++ >;
++ };
+ };
+Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6v2.dtsi
+===================================================================
+--- /dev/null
++++ linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6v2.dtsi
+@@ -0,0 +1,27 @@
++// SPDX-License-Identifier: GPL-2.0 OR X11
++//
++// Copyright 2019 Armadeus Systems <su...@ar...>
++
++#include "imx6qdl-apf6.dtsi"
++
++/* Wi-Fi */
++&usdhc1 {
++ /delete-node/ wlcore@2;
++
++ brcmf@1 {
++ compatible = "brcm,bcm4329-fmac";
++ reg = <1>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_wifi>;
++ interrupt-parent = <&gpio2>;
++ interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
++ interrupt-names = "host-wake";
++ };
++};
++
++&pinctrl_wifi {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x130b0 /* WL_EN */
++ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x1b000 /* WL_IRQ */
++ >;
++};
diff --git a/patches/linux/4.19/0710-ARM-dts-imx6qdl-apf6-add-flow-control-to-uart2.patch b/patches/linux/4.19/0710-ARM-dts-imx6qdl-apf6-add-flow-control-to-uart2.patch
new file mode 100644
index 000000000..5bacee5ad
--- /dev/null
+++ b/patches/linux/4.19/0710-ARM-dts-imx6qdl-apf6-add-flow-control-to-uart2.patch
@@ -0,0 +1,32 @@
+From 0cc8392818bf5848ce47d64937ff7501feeaf2c9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Tue, 24 Sep 2019 12:48:07 +0200
+Subject: [PATCH 1/1] ARM: dts: imx6qdl-apf6: add flow control to uart2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+RTS/CTS lines are wired to the Bluetooth chip so add uart-has-rtscts
+property to uart2.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/imx6qdl-apf6.dtsi | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/boot/dts/imx6qdl-apf6.dtsi b/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+index a97f9766c361..f38421b6ea99 100644
+--- a/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -32,6 +32,7 @@
+ &uart2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart2>;
++ uart-has-rtscts;
+ status = "okay";
+ };
+
+--
+2.21.0
+
hooks/post-receive
--
armadeus
|