[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-155-g7e741e4e2
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-155-g7e741e4e2
|
From: Sébastien S. <ss...@us...> - 2020-01-07 08:21:55
|
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 7e741e4e2d21610e970a7445fafa0e2b15845529 (commit)
from b2ec413067c86b05a4145fb3f33b3666102949d6 (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 7e741e4e2d21610e970a7445fafa0e2b15845529
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jan 7 09:17:21 2020 +0100
[BUILDROOT] opos6ul{,nano,sp} / apf6: bump kernel to 4.19.93
* Fix patch 0100
* Add device_type = "memory" to memory nodes
* Disabled patch 0112 since is now applied upstream
* eeprom on OPOS6UL_SP is on i2c4 bus
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 2 +-
...s6ul-rework-device-tree-to-support-i.MX6U.patch | 55 +++++++--------
...-Armadeus-Systems-OPOS6ULNano-and-OPOS6UL.patch | 21 +++---
...rmadeus-opos6ul_sp-opos6ul_sp_dev-support.patch | 39 ++++++-----
...e-vdd_soc-voltage-for-900MHz-op.patch.disabled} | 0
...adeus-dts-opos6ul-fix-i2c-clock-frequency.patch | 81 +++++++++++-----------
9 files changed, 101 insertions(+), 103 deletions(-)
rename patches/linux/4.19/{0112-ARM-dts-imx6ull-update-vdd_soc-voltage-for-900MHz-op.patch => 0112-ARM-dts-imx6ull-update-vdd_soc-voltage-for-900MHz-op.patch.disabled} (100%)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 233985325..8042cff7f 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -25,7 +25,7 @@ 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.84"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.93"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../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/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index daec35143..ad7b7a76a 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.84"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.93"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../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 f58795e23..5ccbf758a 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.84"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.93"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../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 e63da9ab8..5e079c6f8 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.84"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.93"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../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/patches/linux/4.19/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch b/patches/linux/4.19/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch
index 30d4741ba..692cdf3c7 100644
--- a/patches/linux/4.19/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch
+++ b/patches/linux/4.19/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch
@@ -25,11 +25,11 @@ 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
-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) += \
+Index: linux-4.19.93/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 \
imx6ull-14x14-evk.dtb \
imx6ull-colibri-eval-v3.dtb \
@@ -39,12 +39,11 @@ index 7e2424957809..eb5ed60b92a2 100644
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
+Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
+===================================================================
--- /dev/null
-+++ b/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
-@@ -0,0 +1,190 @@
++++ linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
+@@ -0,0 +1,191 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
+ *
@@ -94,6 +93,7 @@ index 000000000000..a4621f3688e3
+
+/ {
+ memory@80000000 {
++ device_type = "memory";
+ reg = <0x80000000 0>; /* will be filled by U-Boot */
+ };
+
@@ -235,11 +235,10 @@ index 000000000000..a4621f3688e3
+ >;
+ };
+};
-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
+Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+===================================================================
--- /dev/null
-+++ b/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
++++ linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
@@ -0,0 +1,406 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
@@ -647,12 +646,11 @@ index 000000000000..0b79a246a07f
+ >;
+ };
+};
-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
+Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+===================================================================
+--- linux-4.19.93.orig/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+++ /dev/null
-@@ -1,192 +0,0 @@
+@@ -1,193 +0,0 @@
-/*
- * Copyright 2017 Armadeus Systems <su...@ar...>
- *
@@ -704,6 +702,7 @@ index a031bee311df..000000000000
-
-/ {
- memory@80000000 {
+- device_type = "memory";
- reg = <0x80000000 0>; /* will be filled by U-Boot */
- };
-
@@ -845,10 +844,10 @@ index a031bee311df..000000000000
- >;
- };
-};
-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
+Index: linux-4.19.93/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
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Armadeus Systems <su...@ar...>
@@ -1228,11 +1227,10 @@ index 0e59ee57fd55..3ad25a9de4d4 100644
- >;
- };
};
-diff --git a/arch/arm/boot/dts/imx6ull-opos6uldev.dts b/arch/arm/boot/dts/imx6ull-opos6uldev.dts
-new file mode 100644
-index 000000000000..47fbe3e23489
+Index: linux-4.19.93/arch/arm/boot/dts/imx6ull-opos6uldev.dts
+===================================================================
--- /dev/null
-+++ b/arch/arm/boot/dts/imx6ull-opos6uldev.dts
++++ linux-4.19.93/arch/arm/boot/dts/imx6ull-opos6uldev.dts
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
@@ -1290,6 +1288,3 @@ index 000000000000..47fbe3e23489
+ model = "Armadeus Systems OPOS6UL SoM (i.MX6ULL) on OPOS6ULDev board";
+ compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ull";
+};
---
-2.16.1
-
diff --git a/patches/linux/4.19/0104-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6UL.patch b/patches/linux/4.19/0104-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6UL.patch
index af62b0e44..8587244de 100644
--- a/patches/linux/4.19/0104-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6UL.patch
+++ b/patches/linux/4.19/0104-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6UL.patch
@@ -19,11 +19,11 @@ OPOS6ULNanoDev is a carrier board for the OPOS6ULNano SoM.
create mode 100644 arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
create mode 100644 arch/arm/boot/dts/imx6ull-opos6ulnanodev.dts
-Index: linux-4.17.1/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnano.dtsi
+Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnano.dtsi
===================================================================
--- /dev/null
-+++ linux-4.17.1/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnano.dtsi
-@@ -0,0 +1,190 @@
++++ linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnano.dtsi
+@@ -0,0 +1,191 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
+ *
@@ -72,7 +72,8 @@ Index: linux-4.17.1/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnano.dtsi
+ */
+
+/ {
-+ memory {
++ memory@80000000 {
++ device_type = "memory";
+ reg = <0x80000000 0>; /* will be filled by U-Boot */
+ };
+
@@ -214,10 +215,10 @@ Index: linux-4.17.1/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnano.dtsi
+ >;
+ };
+};
-Index: linux-4.17.1/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
+Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
===================================================================
--- /dev/null
-+++ linux-4.17.1/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
++++ linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
@@ -0,0 +1,245 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
@@ -464,10 +465,10 @@ Index: linux-4.17.1/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
+ >;
+ };
+};
-Index: linux-4.17.1/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
===================================================================
--- /dev/null
-+++ linux-4.17.1/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
++++ linux-4.19.93/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
@@ -525,10 +526,10 @@ Index: linux-4.17.1/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+ model = "Armadeus Systems OPOS6UL Nano SoM (i.MX6UL) on OPOS6ULDev board (customized for OPOS6UL Nano)";
+ compatible = "armadeus,opos6ulnanodev", "armadeus,opos6ulnano", "fsl,imx6ul";
+};
-Index: linux-4.17.1/arch/arm/boot/dts/imx6ull-opos6ulnanodev.dts
+Index: linux-4.19.93/arch/arm/boot/dts/imx6ull-opos6ulnanodev.dts
===================================================================
--- /dev/null
-+++ linux-4.17.1/arch/arm/boot/dts/imx6ull-opos6ulnanodev.dts
++++ linux-4.19.93/arch/arm/boot/dts/imx6ull-opos6ulnanodev.dts
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
diff --git a/patches/linux/4.19/0111-armadeus-opos6ul_sp-opos6ul_sp_dev-support.patch b/patches/linux/4.19/0111-armadeus-opos6ul_sp-opos6ul_sp_dev-support.patch
index ba2faef11..23ab4e231 100644
--- a/patches/linux/4.19/0111-armadeus-opos6ul_sp-opos6ul_sp_dev-support.patch
+++ b/patches/linux/4.19/0111-armadeus-opos6ul_sp-opos6ul_sp_dev-support.patch
@@ -1,8 +1,8 @@
-Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
===================================================================
--- /dev/null
-+++ linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
-@@ -0,0 +1,234 @@
++++ linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+@@ -0,0 +1,235 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
+ *
@@ -52,6 +52,7 @@ Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+
+/ {
+ memory@80000000 {
++ device_type = "memory";
+ reg = <0x80000000 0>; /* will be filled by U-Boot */
+ };
+
@@ -93,9 +94,9 @@ Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+ };
+};
+
-+&i2c3 {
++&i2c4 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c3>;
++ pinctrl-0 = <&pinctrl_i2c4>;
+ clock_frequency = <400000>;
+ status = "okay";
+
@@ -166,10 +167,10 @@ Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+ >;
+ };
+
-+ pinctrl_i2c3: i2c3grp {
++ pinctrl_i2c4: i2c4grp {
+ fsl,pins = <
-+ MX6UL_PAD_ENET2_RX_DATA1__I2C3_SDA 0x4001b8b0
-+ MX6UL_PAD_ENET2_RX_DATA0__I2C3_SCL 0x4001b8b0
++ MX6UL_PAD_ENET2_TX_DATA0__I2C4_SDA 0x4001b8b0
++ MX6UL_PAD_ENET2_RX_EN__I2C4_SCL 0x4001b8b0
+ >;
+ };
+
@@ -237,10 +238,10 @@ Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+ >;
+ };
+};
-Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
===================================================================
--- /dev/null
-+++ linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
++++ linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
@@ -0,0 +1,279 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
@@ -337,9 +338,9 @@ Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+ };
+};
+
-+&i2c4 {
++&i2c3 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c4>;
++ pinctrl-0 = <&pinctrl_i2c3>;
+ clock_frequency = <400000>;
+ status = "okay";
+};
@@ -466,10 +467,10 @@ Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+ >;
+ };
+
-+ pinctrl_i2c4: i2c4grp {
++ pinctrl_i2c3: i2c3grp {
+ fsl,pins = <
-+ MX6UL_PAD_ENET2_RX_EN__I2C4_SCL 0x4001b8b0
-+ MX6UL_PAD_ENET2_TX_DATA0__I2C4_SDA 0x4001b8b0
++ MX6UL_PAD_ENET2_RX_DATA0__I2C3_SCL 0x4001b8b0
++ MX6UL_PAD_ENET2_RX_DATA1__I2C3_SDA 0x4001b8b0
+ >;
+ };
+
@@ -521,10 +522,10 @@ Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+ >;
+ };
+};
-Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
+Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
===================================================================
--- /dev/null
-+++ linux-4.19.46/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
++++ linux-4.19.93/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
@@ -582,10 +583,10 @@ Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
+ model = "Armadeus Systems OPOS6UL SP SoM (i.MX6UL) on OPOS6ULSPDev board";
+ compatible = "armadeus,opos6ulspdev", "armadeus,opos6ulsp", "fsl,imx6ul";
+};
-Index: linux-4.19.46/arch/arm/boot/dts/imx6ull-opos6ulspdev.dts
+Index: linux-4.19.93/arch/arm/boot/dts/imx6ull-opos6ulspdev.dts
===================================================================
--- /dev/null
-+++ linux-4.19.46/arch/arm/boot/dts/imx6ull-opos6ulspdev.dts
++++ linux-4.19.93/arch/arm/boot/dts/imx6ull-opos6ulspdev.dts
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
diff --git a/patches/linux/4.19/0112-ARM-dts-imx6ull-update-vdd_soc-voltage-for-900MHz-op.patch b/patches/linux/4.19/0112-ARM-dts-imx6ull-update-vdd_soc-voltage-for-900MHz-op.patch.disabled
similarity index 100%
rename from patches/linux/4.19/0112-ARM-dts-imx6ull-update-vdd_soc-voltage-for-900MHz-op.patch
rename to patches/linux/4.19/0112-ARM-dts-imx6ull-update-vdd_soc-voltage-for-900MHz-op.patch.disabled
diff --git a/patches/linux/4.19/0808-armadeus-dts-opos6ul-fix-i2c-clock-frequency.patch b/patches/linux/4.19/0808-armadeus-dts-opos6ul-fix-i2c-clock-frequency.patch
index ae13b82ac..2582b0d4e 100644
--- a/patches/linux/4.19/0808-armadeus-dts-opos6ul-fix-i2c-clock-frequency.patch
+++ b/patches/linux/4.19/0808-armadeus-dts-opos6ul-fix-i2c-clock-frequency.patch
@@ -1,68 +1,69 @@
-Index: linux-4.19.48/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
===================================================================
---- linux-4.19.48.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
-+++ linux-4.19.48/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+--- linux-4.19.93.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
++++ linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
@@ -199,7 +199,7 @@
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_i2c1>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c1>;
- clock_frequency = <400000>;
+ clock-frequency = <400000>;
- status = "okay";
-
- sgtl5000: codec@0a {
+ status = "okay";
+
+ sgtl5000: codec@0a {
@@ -216,7 +216,7 @@
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_i2c2>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c2>;
- clock_frequency = <400000>;
+ clock-frequency = <400000>;
- status = "okay";
+ status = "okay";
};
-
-Index: linux-4.19.48/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
+
+Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
===================================================================
---- linux-4.19.48.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
-+++ linux-4.19.48/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
+--- linux-4.19.93.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
++++ linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
@@ -86,14 +86,14 @@
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_i2c1>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c1>;
- clock_frequency = <400000>;
+ clock-frequency = <400000>;
- status = "okay";
+ status = "okay";
};
-
+
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_i2c2>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c2>;
- clock_frequency = <400000>;
+ clock-frequency = <400000>;
- status = "okay";
+ status = "okay";
};
-
-Index: linux-4.19.48/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+
+Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
===================================================================
---- linux-4.19.48.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
-+++ linux-4.19.48/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
-@@ -91,7 +91,7 @@
- &i2c3 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_i2c3>;
+--- linux-4.19.93.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
++++ linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+@@ -92,7 +92,7 @@
+ &i2c4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c4>;
- clock_frequency = <400000>;
+ clock-frequency = <400000>;
- status = "okay";
-
- eeprom@50 {
-Index: linux-4.19.48/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+ status = "okay";
+
+ eeprom@50 {
+Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
===================================================================
---- linux-4.19.48.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
-+++ linux-4.19.48/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+--- linux-4.19.93.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
++++ linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
@@ -96,7 +96,7 @@
- &i2c4 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_i2c4>;
+ &i2c3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c3>;
- clock_frequency = <400000>;
+ clock-frequency = <400000>;
- status = "okay";
+ status = "okay";
};
+
hooks/post-receive
--
armadeus
|