aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2022-03-30 09:42:31 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2022-04-09 19:31:46 +0200
commit5a09eb17c2ca3a8fea09509b09edb30c54e9316e (patch)
tree089f490a215b4dba2ef10cb921bac121ce15d83b /target/linux/imx
parenta98ded6c5c1891087fb43499829928b3bc17702f (diff)
downloadupstream-5a09eb17c2ca3a8fea09509b09edb30c54e9316e.tar.gz
upstream-5a09eb17c2ca3a8fea09509b09edb30c54e9316e.tar.bz2
upstream-5a09eb17c2ca3a8fea09509b09edb30c54e9316e.zip
kernel: bump 5.15 to 5.15.32
Patches automatically rebased. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/imx')
-rw-r--r--target/linux/imx/patches-5.15/300-ARM-dts-imx6q-apalis-ixora-add-status-LEDs-aliases.patch8
-rw-r--r--target/linux/imx/patches-5.15/301-ARM-dts-imx6q-apalis-ixora-make-switch3-reset-button.patch12
2 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/imx/patches-5.15/300-ARM-dts-imx6q-apalis-ixora-add-status-LEDs-aliases.patch b/target/linux/imx/patches-5.15/300-ARM-dts-imx6q-apalis-ixora-add-status-LEDs-aliases.patch
index 0a27e7854d..e14dc484b0 100644
--- a/target/linux/imx/patches-5.15/300-ARM-dts-imx6q-apalis-ixora-add-status-LEDs-aliases.patch
+++ b/target/linux/imx/patches-5.15/300-ARM-dts-imx6q-apalis-ixora-add-status-LEDs-aliases.patch
@@ -14,7 +14,7 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
-@@ -61,6 +61,10 @@
+@@ -25,6 +25,10 @@
i2c2 = &i2c2;
rtc0 = &rtc_i2c;
rtc1 = &snvs_rtc;
@@ -25,7 +25,7 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
};
chosen {
-@@ -128,22 +132,22 @@
+@@ -92,22 +96,22 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_leds_ixora>;
@@ -56,7 +56,7 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
};
--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
-@@ -60,6 +60,10 @@
+@@ -24,6 +24,10 @@
i2c2 = &i2c2;
rtc0 = &rtc_i2c;
rtc1 = &snvs_rtc;
@@ -67,7 +67,7 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
};
chosen {
-@@ -127,22 +131,22 @@
+@@ -91,22 +95,22 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_leds_ixora>;
diff --git a/target/linux/imx/patches-5.15/301-ARM-dts-imx6q-apalis-ixora-make-switch3-reset-button.patch b/target/linux/imx/patches-5.15/301-ARM-dts-imx6q-apalis-ixora-make-switch3-reset-button.patch
index 2bb1a16468..8f07f0b1a5 100644
--- a/target/linux/imx/patches-5.15/301-ARM-dts-imx6q-apalis-ixora-make-switch3-reset-button.patch
+++ b/target/linux/imx/patches-5.15/301-ARM-dts-imx6q-apalis-ixora-make-switch3-reset-button.patch
@@ -14,7 +14,7 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
-@@ -74,7 +74,7 @@
+@@ -38,7 +38,7 @@
gpio-keys {
compatible = "gpio-keys";
pinctrl-names = "default";
@@ -23,7 +23,7 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
wakeup {
label = "Wake-Up";
-@@ -83,6 +83,13 @@
+@@ -47,6 +47,13 @@
debounce-interval = <10>;
wakeup-source;
};
@@ -37,7 +37,7 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
};
lcd_display: disp0 {
-@@ -298,4 +305,10 @@
+@@ -275,4 +282,10 @@
MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0
>;
};
@@ -50,7 +50,7 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
};
--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
-@@ -73,7 +73,7 @@
+@@ -37,7 +37,7 @@
gpio-keys {
compatible = "gpio-keys";
pinctrl-names = "default";
@@ -59,7 +59,7 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
wakeup {
label = "Wake-Up";
-@@ -82,6 +82,13 @@
+@@ -46,6 +46,13 @@
debounce-interval = <10>;
wakeup-source;
};
@@ -73,7 +73,7 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
};
lcd_display: disp0 {
-@@ -299,4 +306,10 @@
+@@ -276,4 +283,10 @@
MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0
>;
};