[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-290-g2a350605a
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-290-g2a350605a
|
From: Sébastien S. <ss...@us...> - 2021-09-20 13:15:17
|
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 2a350605aff44f255eed83338de49617a71e9b28 (commit)
from 19336e6c4527eb40d291dcf5956b3068bf1584d9 (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 2a350605aff44f255eed83338de49617a71e9b28
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Sep 20 15:13:28 2021 +0200
[LINUX]: add 5.4 config for OPOS6ULSP
-----------------------------------------------------------------------
Summary of changes:
...l-linux-4.9.config => opos6ul-linux-5.4.config} | 67 ++++++------------
.../armadeus/opos6ulsp/opos6ulsp-linux-5.4.config | 1 +
...15-armadeus-logo-add_armadeus-project_tux.patch | 0
...50-armadeus-add_custom_drivers_to_kconfig.patch | 0
...s6ul-rework-device-tree-to-support-i.MX6U.patch | 82 ++++++++++------------
...ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch | 0
...-Armadeus-Systems-OPOS6ULNano-and-OPOS6UL.patch | 0
...deus-add-opos6uldev-dual-ethernet-support.patch | 0
...rmadeus-opos6ul_sp-opos6ul_sp_dev-support.patch | 0
.../0505-armadeus-add_mcp7940x_rtc_driver.patch | 0
...s-remove-spidev-oops-warning-at-load-time.patch | 10 +--
.../0700-armadeus-pcie_clk_defined_in_uboot.patch | 8 +--
.../0701-armadeus-pcie_init_crash.patch | 0
.../0703-armadeus-mxs-uart-add-rs485-support.patch | 0
.../0704-armadeus-dts-apf6dev-add-rtc.patch | 0
...705-armadeus-dts-apf6dev-fix-dts-overload.patch | 0
.../0706-armadeus-dts-apf6-add-mdio-bus.patch | 0
.../0707-armadeus-dts-apf6-fix-wifi.patch | 0
...6qdl-apf6-apf6dev-switch-boards-to-SPDX-i.patch | 0
...9-ARM-dts-add-Armadeus-APF6v2-SoM-support.patch | 0
...ts-imx6qdl-apf6-add-flow-control-to-uart2.patch | 0
...armadeus-dts-opos6uldev-LQ043-LCD-support.patch | 0
...rmadeus-dts-opos6uldev-add-csi-pin-muxing.patch | 0
...3-armadeus-brcmfmac-increase-boot-timeout.patch | 0
...adeus-dts-opos6uldev-add-sgtl5000-support.patch | 0
...s-dts-opos6uldev-properly-mux-tampers-pin.patch | 0
...dts-opos6ulspdev-properly-mux-tampers-pin.patch | 0
...adeus-dts-opos6ul-fix-i2c-clock-frequency.patch | 0
...-armadeus-opos6ulsp-fix-eeprom-compatible.patch | 0
29 files changed, 71 insertions(+), 97 deletions(-)
copy buildroot/target/device/armadeus/opos6ul/{opos6ul-linux-4.9.config => opos6ul-linux-5.4.config} (92%)
create mode 120000 buildroot/target/device/armadeus/opos6ulsp/opos6ulsp-linux-5.4.config
copy patches/linux/{4.19 => 5.4}/0015-armadeus-logo-add_armadeus-project_tux.patch (100%)
copy patches/linux/{3.10 => 5.4}/0050-armadeus-add_custom_drivers_to_kconfig.patch (100%)
copy patches/linux/{4.19 => 5.4}/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch (95%)
copy patches/linux/{4.17 => 5.4}/0103-ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch (100%)
copy patches/linux/{4.19 => 5.4}/0104-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6UL.patch (100%)
copy patches/linux/{4.17 => 5.4}/0105-armadeus-add-opos6uldev-dual-ethernet-support.patch (100%)
copy patches/linux/{4.19 => 5.4}/0111-armadeus-opos6ul_sp-opos6ul_sp_dev-support.patch (100%)
copy patches/linux/{4.4 => 5.4}/0505-armadeus-add_mcp7940x_rtc_driver.patch (100%)
copy patches/linux/{5.10 => 5.4}/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch (76%)
copy patches/linux/{5.10 => 5.4}/0700-armadeus-pcie_clk_defined_in_uboot.patch (77%)
copy patches/linux/{4.19 => 5.4}/0701-armadeus-pcie_init_crash.patch (100%)
copy patches/linux/{4.14 => 5.4}/0703-armadeus-mxs-uart-add-rs485-support.patch (100%)
copy patches/linux/{4.19 => 5.4}/0704-armadeus-dts-apf6dev-add-rtc.patch (100%)
copy patches/linux/{4.19 => 5.4}/0705-armadeus-dts-apf6dev-fix-dts-overload.patch (100%)
copy patches/linux/{4.19 => 5.4}/0706-armadeus-dts-apf6-add-mdio-bus.patch (100%)
copy patches/linux/{4.19 => 5.4}/0707-armadeus-dts-apf6-fix-wifi.patch (100%)
copy patches/linux/{4.19 => 5.4}/0708-ARM-dts-imx6qdl-apf6-apf6dev-switch-boards-to-SPDX-i.patch (100%)
copy patches/linux/{4.19 => 5.4}/0709-ARM-dts-add-Armadeus-APF6v2-SoM-support.patch (100%)
copy patches/linux/{4.19 => 5.4}/0710-ARM-dts-imx6qdl-apf6-add-flow-control-to-uart2.patch (100%)
copy patches/linux/{4.17 => 5.4}/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch (100%)
copy patches/linux/{4.17 => 5.4}/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch (100%)
copy patches/linux/{4.14 => 5.4}/0803-armadeus-brcmfmac-increase-boot-timeout.patch (100%)
copy patches/linux/{4.17 => 5.4}/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch (100%)
copy patches/linux/{4.17 => 5.4}/0806-armadeus-dts-opos6uldev-properly-mux-tampers-pin.patch (100%)
copy patches/linux/{4.19 => 5.4}/0807-armadeus-dts-opos6ulspdev-properly-mux-tampers-pin.patch (100%)
copy patches/linux/{4.19 => 5.4}/0808-armadeus-dts-opos6ul-fix-i2c-clock-frequency.patch (100%)
copy patches/linux/{4.19 => 5.4}/0810-armadeus-opos6ulsp-fix-eeprom-compatible.patch (100%)
diff --git a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.9.config b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-5.4.config
similarity index 92%
copy from buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.9.config
copy to buildroot/target/device/armadeus/opos6ul/opos6ul-linux-5.4.config
index 19cf0fbb8..826f610bc 100644
--- a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.9.config
+++ b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-5.4.config
@@ -1,6 +1,7 @@
CONFIG_SYSVIPC=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PREEMPT=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=18
@@ -8,22 +9,15 @@ CONFIG_CGROUPS=y
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_EXPERT=y
+CONFIG_KALLSYMS_ALL=y
CONFIG_PERF_EVENTS=y
# CONFIG_SLUB_DEBUG is not set
# CONFIG_COMPAT_BRK is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_BLK_DEV_BSG is not set
CONFIG_ARCH_MXC=y
CONFIG_SOC_IMX6UL=y
CONFIG_HAVE_ARM_ARCH_TIMER=y
CONFIG_ARM_PSCI=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
CONFIG_HIGHMEM=y
-CONFIG_CMA=y
CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
CONFIG_KEXEC=y
CONFIG_CPU_FREQ=y
@@ -32,21 +26,24 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_ARM_IMX6Q_CPUFREQ=y
-CONFIG_CPU_IDLE=y
CONFIG_VFP=y
CONFIG_NEON=y
-CONFIG_BINFMT_MISC=m
CONFIG_PM_DEBUG=y
CONFIG_PM_TEST_SUSPEND=y
+# CONFIG_GCC_PLUGINS is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_CMA=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
CONFIG_NETFILTER=y
CONFIG_BRIDGE=m
CONFIG_6LOWPAN=m
@@ -61,8 +58,8 @@ CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=m
CONFIG_BT_HCIUART=y
-CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_BCM=y
CONFIG_CFG80211=y
CONFIG_CFG80211_WEXT=y
CONFIG_MAC80211=y
@@ -71,7 +68,6 @@ CONFIG_RFKILL_INPUT=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
-CONFIG_DMA_CMA=y
CONFIG_IMX_WEIM=y
CONFIG_CONNECTOR=y
CONFIG_MTD=y
@@ -82,15 +78,9 @@ CONFIG_MTD_JEDECPROBE=y
CONFIG_MTD_CFI_INTELEXT=y
CONFIG_MTD_CFI_AMDSTD=y
CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_PHYSMAP_OF=y
CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_M25P80=y
CONFIG_MTD_SST25L=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_GPMI_NAND=y
-CONFIG_MTD_NAND_MXC=y
CONFIG_MTD_SPI_NOR=y
-CONFIG_SPI_FSL_QUADSPI=y
CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_FASTMAP=y
CONFIG_MTD_UBI_BLOCK=y
@@ -108,7 +98,6 @@ CONFIG_SCSI_SCAN_ASYNC=y
# CONFIG_SCSI_LOWLEVEL is not set
CONFIG_NETDEVICES=y
# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_CIRRUS is not set
# CONFIG_NET_VENDOR_EZCHIP is not set
@@ -166,7 +155,6 @@ CONFIG_BRCMFMAC=m
# CONFIG_WLAN_VENDOR_TI is not set
# CONFIG_WLAN_VENDOR_ZYDAS is not set
CONFIG_INPUT_POLLDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_EVBUG=m
CONFIG_KEYBOARD_GPIO=y
@@ -179,11 +167,11 @@ CONFIG_INPUT_MISC=y
CONFIG_INPUT_PWM_BEEPER=m
CONFIG_SERIO_SERPORT=m
# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_SERIAL_FSL_LPUART=y
CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
+CONFIG_SERIAL_DEV_BUS=y
# CONFIG_I2C_COMPAT is not set
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_MUX_GPIO=y
@@ -193,6 +181,7 @@ CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_GPIO=y
CONFIG_I2C_IMX=y
CONFIG_SPI=y
+CONFIG_SPI_FSL_QUADSPI=y
CONFIG_SPI_IMX=y
CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=y
@@ -200,13 +189,11 @@ CONFIG_W1=y
CONFIG_W1_MASTER_GPIO=m
CONFIG_W1_SLAVE_THERM=m
CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_IMX=y
CONFIG_POWER_RESET_SYSCON=y
CONFIG_POWER_RESET_SYSCON_POWEROFF=y
CONFIG_POWER_SUPPLY=y
CONFIG_SENSORS_GPIO_FAN=y
CONFIG_SENSORS_IIO_HWMON=y
-CONFIG_SENSORS_ADS1015=m
CONFIG_THERMAL=y
CONFIG_CPU_THERMAL=y
CONFIG_IMX_THERMAL=y
@@ -220,20 +207,13 @@ CONFIG_REGULATOR_PFUZE100=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_RC_SUPPORT=y
-CONFIG_RC_DEVICES=y
-CONFIG_IR_GPIO_CIR=y
CONFIG_MEDIA_USB_SUPPORT=y
CONFIG_USB_VIDEO_CLASS=m
CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_SOC_CAMERA=y
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_CODA=y
-CONFIG_SOC_CAMERA_OV2640=y
CONFIG_FB=y
# CONFIG_FB_MX3 is not set
-CONFIG_FB_MXS=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_PLATFORM=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -257,7 +237,6 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_MXC=y
CONFIG_USB_ACM=m
-CONFIG_USB_WDM=m
CONFIG_USB_STORAGE=y
CONFIG_USB_CHIPIDEA=y
CONFIG_USB_CHIPIDEA_UDC=y
@@ -324,7 +303,7 @@ CONFIG_SENSORS_HMC5843_I2C=m
CONFIG_BMP280=m
CONFIG_PWM=y
CONFIG_PWM_FSL_FTM=y
-CONFIG_PWM_IMX=y
+CONFIG_PWM_IMX27=y
CONFIG_RAS=y
CONFIG_NVMEM_IMX_OCOTP=y
CONFIG_EXT2_FS=y
@@ -357,21 +336,21 @@ CONFIG_NLS_ASCII=y
CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_UTF8=y
-CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_FS=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_SCHED_DEBUG is not set
-CONFIG_PROVE_LOCKING=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_FTRACE is not set
-# CONFIG_ARM_UNWIND is not set
CONFIG_SECURITYFS=y
CONFIG_CRYPTO_DEV_FSL_CAAM=y
CONFIG_CRYPTO_DEV_SAHARA=y
-CONFIG_CRC_CCITT=m
CONFIG_CRC_T10DIF=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
+CONFIG_DMA_CMA=y
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_FS=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_FTRACE is not set
+# CONFIG_RUNTIME_TESTING_MENU is not set
diff --git a/buildroot/target/device/armadeus/opos6ulsp/opos6ulsp-linux-5.4.config b/buildroot/target/device/armadeus/opos6ulsp/opos6ulsp-linux-5.4.config
new file mode 120000
index 000000000..c042ba81d
--- /dev/null
+++ b/buildroot/target/device/armadeus/opos6ulsp/opos6ulsp-linux-5.4.config
@@ -0,0 +1 @@
+../opos6ul/opos6ul-linux-5.4.config
\ No newline at end of file
diff --git a/patches/linux/4.19/0015-armadeus-logo-add_armadeus-project_tux.patch b/patches/linux/5.4/0015-armadeus-logo-add_armadeus-project_tux.patch
similarity index 100%
copy from patches/linux/4.19/0015-armadeus-logo-add_armadeus-project_tux.patch
copy to patches/linux/5.4/0015-armadeus-logo-add_armadeus-project_tux.patch
diff --git a/patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/5.4/0050-armadeus-add_custom_drivers_to_kconfig.patch
similarity index 100%
copy from patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch
copy to patches/linux/5.4/0050-armadeus-add_custom_drivers_to_kconfig.patch
diff --git a/patches/linux/4.19/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch b/patches/linux/5.4/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch
similarity index 95%
copy from patches/linux/4.19/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch
copy to patches/linux/5.4/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch
index 692cdf3c7..40980775c 100644
--- a/patches/linux/4.19/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch
+++ b/patches/linux/5.4/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch
@@ -25,24 +25,22 @@ Signed-off-by: Sébastien Szymanski <seb...@ar...>
delete mode 100644 arch/arm/boot/dts/imx6ul-opos6ul.dtsi
create mode 100644 arch/arm/boot/dts/imx6ull-opos6uldev.dts
-Index: linux-4.19.93/arch/arm/boot/dts/Makefile
+Index: linux-5.4.119/arch/arm/boot/dts/Makefile
===================================================================
---- linux-4.19.93.orig/arch/arm/boot/dts/Makefile
-+++ linux-4.19.93/arch/arm/boot/dts/Makefile
-@@ -559,7 +559,8 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
- imx6ul-tx6ul-mainboard.dtb \
+--- linux-5.4.119.orig/arch/arm/boot/dts/Makefile
++++ linux-5.4.119/arch/arm/boot/dts/Makefile
+@@ -583,6 +583,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
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 \
-Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
+ imx6ull-colibri-wifi-eval-v3.dtb \
++ imx6ull-opos6uldev.dtb \
+ imx6ull-phytec-segin-ff-rdk-nand.dtb \
+ imx6ull-phytec-segin-ff-rdk-emmc.dtb \
+ imx6ull-phytec-segin-lc-rdk-nand.dtb \
+Index: linux-5.4.119/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
===================================================================
--- /dev/null
-+++ linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
++++ linux-5.4.119/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
@@ -235,10 +233,10 @@ Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
+ >;
+ };
+};
-Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+Index: linux-5.4.119/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
===================================================================
--- /dev/null
-+++ linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
++++ linux-5.4.119/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
@@ -0,0 +1,406 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
@@ -646,9 +644,9 @@ Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+ >;
+ };
+};
-Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+Index: linux-5.4.119/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
===================================================================
---- linux-4.19.93.orig/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+--- linux-5.4.119.orig/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
@@ -844,10 +842,10 @@ Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
- >;
- };
-};
-Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+Index: linux-5.4.119/arch/arm/boot/dts/imx6ul-opos6uldev.dts
===================================================================
---- linux-4.19.93.orig/arch/arm/boot/dts/imx6ul-opos6uldev.dts
-+++ linux-4.19.93/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+--- linux-5.4.119.orig/arch/arm/boot/dts/imx6ul-opos6uldev.dts
++++ linux-5.4.119/arch/arm/boot/dts/imx6ul-opos6uldev.dts
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Armadeus Systems <su...@ar...>
@@ -855,7 +853,7 @@ Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-opos6uldev.dts
*
* 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
-@@ -46,367 +46,11 @@
+@@ -46,362 +46,12 @@
*/
/dts-v1/;
@@ -863,6 +861,7 @@ Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+#include "imx6ul.dtsi"
+#include "imx6ul-imx6ull-opos6ul.dtsi"
+#include "imx6ul-imx6ull-opos6uldev.dtsi"
++
/ {
- model = "Armadeus Systems OPOS6UL SoM on OPOS6ULDev board";
@@ -873,7 +872,7 @@ Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-opos6uldev.dts
- stdout-path = &uart1;
- };
-
-- backlight {
+- backlight: backlight {
- compatible = "pwm-backlight";
- pwms = <&pwm3 0 191000>;
- brightness-levels = <0 4 8 16 32 64 128 255>;
@@ -914,6 +913,18 @@ Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-opos6uldev.dts
- gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
- };
-
+- panel: panel {
+- compatible = "armadeus,st0700-adapt";
+- power-supply = <®_3v3>;
+- backlight = <&backlight>;
+-
+- port {
+- panel_in: endpoint {
+- remote-endpoint = <&lcdif_out>;
+- };
+- };
+- };
+-
- reg_5v: regulator-5v {
- compatible = "regulator-fixed";
- regulator-name = "5V";
@@ -999,28 +1010,11 @@ Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-opos6uldev.dts
-&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>;
-- };
+- port {
+- lcdif_out: endpoint {
+- remote-endpoint = <&panel_in>;
- };
- };
-};
@@ -1227,10 +1221,10 @@ Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-opos6uldev.dts
- >;
- };
};
-Index: linux-4.19.93/arch/arm/boot/dts/imx6ull-opos6uldev.dts
+Index: linux-5.4.119/arch/arm/boot/dts/imx6ull-opos6uldev.dts
===================================================================
--- /dev/null
-+++ linux-4.19.93/arch/arm/boot/dts/imx6ull-opos6uldev.dts
++++ linux-5.4.119/arch/arm/boot/dts/imx6ull-opos6uldev.dts
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
diff --git a/patches/linux/4.17/0103-ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch b/patches/linux/5.4/0103-ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch
similarity index 100%
copy from patches/linux/4.17/0103-ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch
copy to patches/linux/5.4/0103-ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch
diff --git a/patches/linux/4.19/0104-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6UL.patch b/patches/linux/5.4/0104-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6UL.patch
similarity index 100%
copy from patches/linux/4.19/0104-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6UL.patch
copy to patches/linux/5.4/0104-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6UL.patch
diff --git a/patches/linux/4.17/0105-armadeus-add-opos6uldev-dual-ethernet-support.patch b/patches/linux/5.4/0105-armadeus-add-opos6uldev-dual-ethernet-support.patch
similarity index 100%
copy from patches/linux/4.17/0105-armadeus-add-opos6uldev-dual-ethernet-support.patch
copy to patches/linux/5.4/0105-armadeus-add-opos6uldev-dual-ethernet-support.patch
diff --git a/patches/linux/4.19/0111-armadeus-opos6ul_sp-opos6ul_sp_dev-support.patch b/patches/linux/5.4/0111-armadeus-opos6ul_sp-opos6ul_sp_dev-support.patch
similarity index 100%
copy from patches/linux/4.19/0111-armadeus-opos6ul_sp-opos6ul_sp_dev-support.patch
copy to patches/linux/5.4/0111-armadeus-opos6ul_sp-opos6ul_sp_dev-support.patch
diff --git a/patches/linux/4.4/0505-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/5.4/0505-armadeus-add_mcp7940x_rtc_driver.patch
similarity index 100%
copy from patches/linux/4.4/0505-armadeus-add_mcp7940x_rtc_driver.patch
copy to patches/linux/5.4/0505-armadeus-add_mcp7940x_rtc_driver.patch
diff --git a/patches/linux/5.10/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch b/patches/linux/5.4/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
similarity index 76%
copy from patches/linux/5.10/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
copy to patches/linux/5.4/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
index 1cacd7dca..1c154117b 100644
--- a/patches/linux/5.10/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
+++ b/patches/linux/5.4/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
@@ -4,11 +4,11 @@ kernels with device tree support.
Signed-off-by: Julien Boibessot <jul...@ar...>
Signed-off-by: Sébastien Szymanski <seb...@ar...>
-Index: linux-5.10.45/drivers/spi/spidev.c
+Index: linux-5.4.119/drivers/spi/spidev.c
===================================================================
---- linux-5.10.45.orig/drivers/spi/spidev.c
-+++ linux-5.10.45/drivers/spi/spidev.c
-@@ -682,6 +682,7 @@ static const struct of_device_id spidev_
+--- linux-5.4.119.orig/drivers/spi/spidev.c
++++ linux-5.4.119/drivers/spi/spidev.c
+@@ -678,6 +678,7 @@ static const struct of_device_id spidev_
{ .compatible = "lwn,bk4" },
{ .compatible = "dh,dhcom-board" },
{ .compatible = "menlo,m53cpld" },
@@ -16,7 +16,7 @@ Index: linux-5.10.45/drivers/spi/spidev.c
{},
};
MODULE_DEVICE_TABLE(of, spidev_dt_ids);
-@@ -737,9 +738,11 @@ static int spidev_probe(struct spi_devic
+@@ -733,9 +734,11 @@ static int spidev_probe(struct spi_devic
* compatible string, it is a Linux implementation thing
* rather than a description of the hardware.
*/
diff --git a/patches/linux/5.10/0700-armadeus-pcie_clk_defined_in_uboot.patch b/patches/linux/5.4/0700-armadeus-pcie_clk_defined_in_uboot.patch
similarity index 77%
copy from patches/linux/5.10/0700-armadeus-pcie_clk_defined_in_uboot.patch
copy to patches/linux/5.4/0700-armadeus-pcie_clk_defined_in_uboot.patch
index e40ffe28a..a6cdec57b 100644
--- a/patches/linux/5.10/0700-armadeus-pcie_clk_defined_in_uboot.patch
+++ b/patches/linux/5.4/0700-armadeus-pcie_clk_defined_in_uboot.patch
@@ -1,8 +1,8 @@
-Index: linux-5.10.45/drivers/clk/imx/clk-imx6q.c
+Index: linux-5.4.119/drivers/clk/imx/clk-imx6q.c
===================================================================
---- linux-5.10.45.orig/drivers/clk/imx/clk-imx6q.c
-+++ linux-5.10.45/drivers/clk/imx/clk-imx6q.c
-@@ -953,8 +953,13 @@ static void __init imx6q_clocks_init(str
+--- linux-5.4.119.orig/drivers/clk/imx/clk-imx6q.c
++++ linux-5.4.119/drivers/clk/imx/clk-imx6q.c
+@@ -957,8 +957,13 @@ static void __init imx6q_clocks_init(str
clk_set_parent(hws[IMX6QDL_CLK_SPDIF_SEL]->clk, hws[IMX6QDL_CLK_PLL3_PFD3_454M]->clk);
/* All existing boards with PCIe use LVDS1 */
diff --git a/patches/linux/4.19/0701-armadeus-pcie_init_crash.patch b/patches/linux/5.4/0701-armadeus-pcie_init_crash.patch
similarity index 100%
copy from patches/linux/4.19/0701-armadeus-pcie_init_crash.patch
copy to patches/linux/5.4/0701-armadeus-pcie_init_crash.patch
diff --git a/patches/linux/4.14/0703-armadeus-mxs-uart-add-rs485-support.patch b/patches/linux/5.4/0703-armadeus-mxs-uart-add-rs485-support.patch
similarity index 100%
copy from patches/linux/4.14/0703-armadeus-mxs-uart-add-rs485-support.patch
copy to patches/linux/5.4/0703-armadeus-mxs-uart-add-rs485-support.patch
diff --git a/patches/linux/4.19/0704-armadeus-dts-apf6dev-add-rtc.patch b/patches/linux/5.4/0704-armadeus-dts-apf6dev-add-rtc.patch
similarity index 100%
copy from patches/linux/4.19/0704-armadeus-dts-apf6dev-add-rtc.patch
copy to patches/linux/5.4/0704-armadeus-dts-apf6dev-add-rtc.patch
diff --git a/patches/linux/4.19/0705-armadeus-dts-apf6dev-fix-dts-overload.patch b/patches/linux/5.4/0705-armadeus-dts-apf6dev-fix-dts-overload.patch
similarity index 100%
copy from patches/linux/4.19/0705-armadeus-dts-apf6dev-fix-dts-overload.patch
copy to patches/linux/5.4/0705-armadeus-dts-apf6dev-fix-dts-overload.patch
diff --git a/patches/linux/4.19/0706-armadeus-dts-apf6-add-mdio-bus.patch b/patches/linux/5.4/0706-armadeus-dts-apf6-add-mdio-bus.patch
similarity index 100%
copy from patches/linux/4.19/0706-armadeus-dts-apf6-add-mdio-bus.patch
copy to patches/linux/5.4/0706-armadeus-dts-apf6-add-mdio-bus.patch
diff --git a/patches/linux/4.19/0707-armadeus-dts-apf6-fix-wifi.patch b/patches/linux/5.4/0707-armadeus-dts-apf6-fix-wifi.patch
similarity index 100%
copy from patches/linux/4.19/0707-armadeus-dts-apf6-fix-wifi.patch
copy to patches/linux/5.4/0707-armadeus-dts-apf6-fix-wifi.patch
diff --git a/patches/linux/4.19/0708-ARM-dts-imx6qdl-apf6-apf6dev-switch-boards-to-SPDX-i.patch b/patches/linux/5.4/0708-ARM-dts-imx6qdl-apf6-apf6dev-switch-boards-to-SPDX-i.patch
similarity index 100%
copy from patches/linux/4.19/0708-ARM-dts-imx6qdl-apf6-apf6dev-switch-boards-to-SPDX-i.patch
copy to patches/linux/5.4/0708-ARM-dts-imx6qdl-apf6-apf6dev-switch-boards-to-SPDX-i.patch
diff --git a/patches/linux/4.19/0709-ARM-dts-add-Armadeus-APF6v2-SoM-support.patch b/patches/linux/5.4/0709-ARM-dts-add-Armadeus-APF6v2-SoM-support.patch
similarity index 100%
copy from patches/linux/4.19/0709-ARM-dts-add-Armadeus-APF6v2-SoM-support.patch
copy to patches/linux/5.4/0709-ARM-dts-add-Armadeus-APF6v2-SoM-support.patch
diff --git a/patches/linux/4.19/0710-ARM-dts-imx6qdl-apf6-add-flow-control-to-uart2.patch b/patches/linux/5.4/0710-ARM-dts-imx6qdl-apf6-add-flow-control-to-uart2.patch
similarity index 100%
copy from patches/linux/4.19/0710-ARM-dts-imx6qdl-apf6-add-flow-control-to-uart2.patch
copy to patches/linux/5.4/0710-ARM-dts-imx6qdl-apf6-add-flow-control-to-uart2.patch
diff --git a/patches/linux/4.17/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch b/patches/linux/5.4/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
similarity index 100%
copy from patches/linux/4.17/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
copy to patches/linux/5.4/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
diff --git a/patches/linux/4.17/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch b/patches/linux/5.4/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
similarity index 100%
copy from patches/linux/4.17/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
copy to patches/linux/5.4/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
diff --git a/patches/linux/4.14/0803-armadeus-brcmfmac-increase-boot-timeout.patch b/patches/linux/5.4/0803-armadeus-brcmfmac-increase-boot-timeout.patch
similarity index 100%
copy from patches/linux/4.14/0803-armadeus-brcmfmac-increase-boot-timeout.patch
copy to patches/linux/5.4/0803-armadeus-brcmfmac-increase-boot-timeout.patch
diff --git a/patches/linux/4.17/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch b/patches/linux/5.4/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
similarity index 100%
copy from patches/linux/4.17/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
copy to patches/linux/5.4/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
diff --git a/patches/linux/4.17/0806-armadeus-dts-opos6uldev-properly-mux-tampers-pin.patch b/patches/linux/5.4/0806-armadeus-dts-opos6uldev-properly-mux-tampers-pin.patch
similarity index 100%
copy from patches/linux/4.17/0806-armadeus-dts-opos6uldev-properly-mux-tampers-pin.patch
copy to patches/linux/5.4/0806-armadeus-dts-opos6uldev-properly-mux-tampers-pin.patch
diff --git a/patches/linux/4.19/0807-armadeus-dts-opos6ulspdev-properly-mux-tampers-pin.patch b/patches/linux/5.4/0807-armadeus-dts-opos6ulspdev-properly-mux-tampers-pin.patch
similarity index 100%
copy from patches/linux/4.19/0807-armadeus-dts-opos6ulspdev-properly-mux-tampers-pin.patch
copy to patches/linux/5.4/0807-armadeus-dts-opos6ulspdev-properly-mux-tampers-pin.patch
diff --git a/patches/linux/4.19/0808-armadeus-dts-opos6ul-fix-i2c-clock-frequency.patch b/patches/linux/5.4/0808-armadeus-dts-opos6ul-fix-i2c-clock-frequency.patch
similarity index 100%
copy from patches/linux/4.19/0808-armadeus-dts-opos6ul-fix-i2c-clock-frequency.patch
copy to patches/linux/5.4/0808-armadeus-dts-opos6ul-fix-i2c-clock-frequency.patch
diff --git a/patches/linux/4.19/0810-armadeus-opos6ulsp-fix-eeprom-compatible.patch b/patches/linux/5.4/0810-armadeus-opos6ulsp-fix-eeprom-compatible.patch
similarity index 100%
copy from patches/linux/4.19/0810-armadeus-opos6ulsp-fix-eeprom-compatible.patch
copy to patches/linux/5.4/0810-armadeus-opos6ulsp-fix-eeprom-compatible.patch
hooks/post-receive
--
armadeus
|