From e89d4d888bb4fdd0ce621a90ceb1d17ca9111f7d Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Tue, 16 Nov 2021 23:53:49 +0800
Subject: [PATCH] update linux patch, add ISL1208 RTC support
---
bsp/kernel/patch/linux-imx-imx6ull.patch | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/bsp/kernel/patch/linux-imx-imx6ull.patch b/bsp/kernel/patch/linux-imx-imx6ull.patch
index 1b80338..0a89a2b 100644
--- a/bsp/kernel/patch/linux-imx-imx6ull.patch
+++ b/bsp/kernel/patch/linux-imx-imx6ull.patch
@@ -1,6 +1,6 @@
diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi linux-imx-imx6ull/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
--- linux-imx/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi 2021-09-08 18:41:11.000000000 +0800
-+++ linux-imx-imx6ull/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi 2021-11-16 23:10:04.218339568 +0800
++++ linux-imx-imx6ull/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi 2021-11-16 23:42:36.877241856 +0800
@@ -31,7 +31,35 @@
brightness-levels = <0 4 8 16 32 64 128 255>;
default-brightness-level = <6>;
@@ -38,7 +38,30 @@
pxp_v4l2 {
compatible = "fsl,imx6ul-pxp-v4l2", "fsl,imx6sx-pxp-v4l2", "fsl,imx6sl-pxp-v4l2";
-@@ -301,21 +329,21 @@
+@@ -184,6 +212,12 @@
+ pinctrl-0 = <&pinctrl_i2c2>;
+ status = "okay";
+
++ rtc@6f {
++ compatible = "isil,isl1208";
++ reg = <0x6f>;
++ status = "okay";
++ };
++
+ codec: wm8960@1a {
+ #sound-dai-cells = <0>;
+ compatible = "wlf,wm8960";
+@@ -192,7 +226,8 @@
+ wlf,hp-cfg = <3 2 3>;
+ wlf,gpio-cfg = <1 3>;
+ clocks = <&clks IMX6UL_CLK_SAI2>;
+- clock-names = "mclk";
++ clock-names = "mclk";
++ status = "disabled";
+ };
+
+ ov5640: ov5640@3c {
+@@ -301,21 +336,21 @@
display0: display@0 {
bits-per-pixel = <16>;
@@ -70,7 +93,7 @@
hsync-active = <0>;
vsync-active = <0>;
de-active = <1>;
-@@ -339,7 +367,7 @@
+@@ -339,7 +374,7 @@
&qspi {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_qspi>;
@@ -79,7 +102,7 @@
flash0: n25q256a@0 {
#address-cells = <1>;
-@@ -463,6 +491,18 @@
+@@ -463,6 +498,18 @@
&iomuxc {
pinctrl-names = "default";
@@ -98,9 +121,20 @@
pinctrl_csi1: csi1grp {
fsl,pins = <
MX6UL_PAD_CSI_MCLK__CSI_MCLK 0x1b088
+diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/imx6ul.dtsi linux-imx-imx6ull/arch/arm/boot/dts/imx6ul.dtsi
+--- linux-imx/arch/arm/boot/dts/imx6ul.dtsi 2021-09-08 18:41:11.000000000 +0800
++++ linux-imx-imx6ull/arch/arm/boot/dts/imx6ul.dtsi 2021-11-16 23:39:21.403317683 +0800
+@@ -727,6 +727,7 @@
+ offset = <0x34>;
+ interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
++ status = "disabled";
+ };
+
+ snvs_poweroff: snvs-poweroff {
diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/.cfg-imx6ull linux-imx-imx6ull/.cfg-imx6ull
--- linux-imx/.cfg-imx6ull 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-imx6ull/.cfg-imx6ull 2021-11-16 23:33:46.661730470 +0800
++++ linux-imx-imx6ull/.cfg-imx6ull 2021-11-16 23:51:50.690013159 +0800
@@ -0,0 +1,6910 @@
+#
+# Automatically generated file; DO NOT EDIT.
@@ -7014,7 +7048,7 @@
+# end of Kernel hacking
diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/Makefile linux-imx-imx6ull/Makefile
--- linux-imx/Makefile 2021-09-08 18:41:11.000000000 +0800
-+++ linux-imx-imx6ull/Makefile 2021-11-16 23:16:35.981472215 +0800
++++ linux-imx-imx6ull/Makefile 2021-11-16 23:48:16.644970206 +0800
@@ -367,7 +367,8 @@
# Alternatively CROSS_COMPILE can be set in the environment.
# Default value for CROSS_COMPILE is not to prefix executables
--
Gitblit v1.9.1