imx: copy patches from 6.1 to 6.6

copy 6.1 patches to 6.6 and fixup:
 - removed patches already upstream
 - adapted pathnames of dts patches for new kernel

Signed-off-by: Tim Harvey <tharvey@gateworks.com>

diff --git a/target/linux/imx/patches-6.6/100-bootargs.patch b/target/linux/imx/patches-6.6/100-bootargs.patch
new file mode 100644 (file)
index 0000000..7afcebe
--- /dev/null
+++ b/target/linux/imx/patches-6.6/100-bootargs.patch
@@ -0,0 +1,11 @@
+--- a/arch/arm/boot/dts/nxp/imx/imx6dl-wandboard.dts
++++ b/arch/arm/boot/dts/nxp/imx/imx6dl-wandboard.dts
+@@ -16,4 +16,8 @@
+               device_type = "memory";
+               reg = <0x10000000 0x40000000>;
+       };
++
++      chosen {
++              bootargs = "console=ttymxc0,115200";
++      };
+ };

diff --git a/target/linux/imx/patches-6.6/300-ARM-dts-imx6q-apalis-ixora-add-status-LEDs-aliases.patch b/target/linux/imx/patches-6.6/300-ARM-dts-imx6q-apalis-ixora-add-status-LEDs-aliases.patch
new file mode 100644 (file)
index 0000000..5a8e955
--- /dev/null
+++ b/target/linux/imx/patches-6.6/300-ARM-dts-imx6q-apalis-ixora-add-status-LEDs-aliases.patch
@@ -0,0 +1,96 @@
+From 68604e89335ccb3e893b5a05b2c0d5cd2eaaf6ec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
+Date: Tue, 3 Mar 2020 15:14:40 +0100
+Subject: [PATCH] ARM: dts: imx6q-apalis: ixora: add status LEDs aliases
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Štetiar <ynezz@true.cz>
+---
+ arch/arm/boot/dts/nxp/imx/imx6q-apalis-ixora-v1.1.dts | 16 ++++++++++------
+ arch/arm/boot/dts/nxp/imx/imx6q-apalis-ixora.dts      | 12 ++++++++----
+ 2 files changed, 18 insertions(+), 10 deletions(-)
+
+--- a/arch/arm/boot/dts/nxp/imx/imx6q-apalis-ixora.dts
++++ b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-ixora.dts
+@@ -24,6 +24,10 @@
+               i2c2 = &i2c2;
+               rtc0 = &rtc_i2c;
+               rtc1 = &snvs_rtc;
++              led-boot = &led_boot;
++              led-failsafe = &led_failsafe;
++              led-running = &led_running;
++              led-upgrade = &led_upgrade;
+       };
+ 
+       chosen {
+@@ -35,22 +39,22 @@
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_leds_ixora>;
+ 
+-              led4-green {
++              led_running: led4-green {
+                       gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
+                       label = "LED_4_GREEN";
+               };
+ 
+-              led4-red {
++              led_upgrade: led4-red {
+                       gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
+                       label = "LED_4_RED";
+               };
+ 
+-              led5-green {
++              led_boot: led5-green {
+                       gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
+                       label = "LED_5_GREEN";
+               };
+ 
+-              led5-red {
++              led_failsafe: led5-red {
+                       gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
+                       label = "LED_5_RED";
+               };
+--- a/arch/arm/boot/dts/nxp/imx/imx6q-apalis-ixora-v1.2.dts
++++ b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-ixora-v1.2.dts
+@@ -24,6 +24,10 @@
+               i2c2 = &i2c2;
+               rtc0 = &rtc_i2c;
+               rtc1 = &snvs_rtc;
++              led-boot = &led_boot;
++              led-failsafe = &led_failsafe;
++              led-running = &led_running;
++              led-upgrade = &led_upgrade;
+       };
+ 
+       chosen {
+@@ -36,22 +40,22 @@
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_leds_ixora>;
+ 
+-              led4-green {
+-                      gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
++              led_running: led4-green {
++                      gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
+                       label = "LED_4_GREEN";
+               };
+ 
+-              led4-red {
+-                      gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
++              led_upgrade: led4-red {
++                      gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
+                       label = "LED_4_RED";
+               };
+ 
+-              led5-green {
++              led_boot: led5-green {
+                       gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
+                       label = "LED_5_GREEN";
+               };
+ 
+-              led5-red {
++              led_failsafe: led5-red {
+                       gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
+                       label = "LED_5_RED";
+               };

diff --git a/target/linux/imx/patches-6.6/301-ARM-dts-imx6q-apalis-ixora-make-switch3-reset-button.patch b/target/linux/imx/patches-6.6/301-ARM-dts-imx6q-apalis-ixora-make-switch3-reset-button.patch
new file mode 100644 (file)
index 0000000..4e1fdb7
--- /dev/null
+++ b/target/linux/imx/patches-6.6/301-ARM-dts-imx6q-apalis-ixora-make-switch3-reset-button.patch
@@ -0,0 +1,78 @@
+From b6764bb27c819cdcf854371db485a43d71f579f3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
+Date: Tue, 3 Mar 2020 15:15:57 +0100
+Subject: [PATCH] ARM: dts: imx6q-apalis: ixora: make switch3 reset button
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Štetiar <ynezz@true.cz>
+---
+ arch/arm/boot/dts/nxp/imx/imx6q-apalis-ixora-v1.1.dts | 15 ++++++++++++++-
+ arch/arm/boot/dts/nxp/imx/imx6q-apalis-ixora.dts      | 15 ++++++++++++++-
+ 2 files changed, 28 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/boot/dts/nxp/imx/imx6q-apalis-ixora.dts
++++ b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-ixora.dts
+@@ -59,6 +59,17 @@
+                       label = "LED_5_RED";
+               };
+       };
++
++      gpio-keys {
++              pinctrl-0 = <&pinctrl_gpio_keys &pinctrl_switch3_ixora>;
++
++              reset {
++                      label = "reset";
++                      gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
++                      linux,code = <KEY_RESTART>;
++                      debounce-interval = <10>;
++              };
++      };
+ };
+ 
+ &can1 {
+@@ -181,4 +192,10 @@
+                       MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0
+               >;
+       };
++
++      pinctrl_switch3_ixora: switch3ixora {
++              fsl,pins = <
++                      MX6QDL_PAD_SD1_DAT0__GPIO1_IO16 0x1b0b0
++              >;
++      };
+ };
+--- a/arch/arm/boot/dts/nxp/imx/imx6q-apalis-ixora-v1.2.dts
++++ b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-ixora-v1.2.dts
+@@ -61,6 +61,17 @@
+               };
+       };
+ 
++      gpio-keys {
++              pinctrl-0 = <&pinctrl_gpio_keys &pinctrl_switch3_ixora>;
++
++              reset {
++                      label = "reset";
++                      gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
++                      linux,code = <KEY_RESTART>;
++                      debounce-interval = <10>;
++              };
++      };
++
+       reg_3v3_vmmc: regulator-3v3-vmmc {
+               compatible = "regulator-fixed";
+               enable-active-high;
+@@ -262,6 +273,12 @@
+               >;
+       };
+ 
++      pinctrl_switch3_ixora: switch3ixora {
++              fsl,pins = <
++                      MX6QDL_PAD_SD1_DAT0__GPIO1_IO16 0x1b0b0
++              >;
++      };
++
+       pinctrl_mmc_cd_sleep: mmccdslpgrp {
+               fsl,pins = <
+                        /* MMC1 CD */

diff --git a/target/linux/imx/patches-6.6/310-ARM-dts-imx7d-pico-pi-set-aliases.patch b/target/linux/imx/patches-6.6/310-ARM-dts-imx7d-pico-pi-set-aliases.patch
new file mode 100644 (file)
index 0000000..d71787b
--- /dev/null
+++ b/target/linux/imx/patches-6.6/310-ARM-dts-imx7d-pico-pi-set-aliases.patch
@@ -0,0 +1,24 @@
+--- a/arch/arm/boot/dts/nxp/imx/imx7d-pico-pi.dts
++++ b/arch/arm/boot/dts/nxp/imx/imx7d-pico-pi.dts
+@@ -8,12 +8,20 @@
+       model = "TechNexion PICO-IMX7D Board and PI baseboard";
+       compatible = "technexion,imx7d-pico-pi", "fsl,imx7d";
+ 
++      aliases {
++              led-boot = &led_system;
++              led-failsafe = &led_system;
++              led-running = &led_system;
++              led-upgrade = &led_system;
++              label-mac-device = &fec1;
++      };
++
+       leds {
+               compatible = "gpio-leds";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_gpio_leds>;
+ 
+-              led {
++              led_system: led {
+                       label = "gpio-led";
+                       gpios = <&gpio2 6 GPIO_ACTIVE_HIGH>;
+               };

diff --git a/target/linux/imx/patches-6.6/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch b/target/linux/imx/patches-6.6/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch
new file mode 100644 (file)
index 0000000..244b759
--- /dev/null
+++ b/target/linux/imx/patches-6.6/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch
@@ -0,0 +1,23 @@
+From 6e8e5ccfbee7a531b035ffce3f95f3901946fa9d Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Wed, 9 Jan 2019 14:33:24 -0600
+Subject: [PATCH] ARM: imx7d-pico-pi.dts: add default stdout-path
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/nxp/imx/imx7d-pico-pi.dts | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/arch/arm/boot/dts/nxp/imx/imx7d-pico-pi.dts
++++ b/arch/arm/boot/dts/nxp/imx/imx7d-pico-pi.dts
+@@ -16,6 +16,10 @@
+               label-mac-device = &fec1;
+       };
+ 
++      chosen {
++              stdout-path = "serial4:115200n8";
++      };
++
+       leds {
+               compatible = "gpio-leds";
+               pinctrl-names = "default";