From c88bd796a625e54801592c360f5bf0f7d121bc5d Mon Sep 17 00:00:00 2001
From: Serhii Voloshynov <serhii.voloshynov@globallogic.com>
Date: Tue, 11 Jan 2022 10:43:46 +0200
Subject: Fix pincontrol for io controllers, rs9113, usbhub resets

---
 recipes-kernel/linux/linux-at91-4.9.87/mtcdt/mtcdt.dts | 13 ++++++-------
 recipes-kernel/linux/linux-at91_4.9.87.bb              |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'recipes-kernel')

diff --git a/recipes-kernel/linux/linux-at91-4.9.87/mtcdt/mtcdt.dts b/recipes-kernel/linux/linux-at91-4.9.87/mtcdt/mtcdt.dts
index f485baa..9cbf5fa 100644
--- a/recipes-kernel/linux/linux-at91-4.9.87/mtcdt/mtcdt.dts
+++ b/recipes-kernel/linux/linux-at91-4.9.87/mtcdt/mtcdt.dts
@@ -100,22 +100,21 @@
 		     pinctrl_mts_io_out: mts_io-0 {
                       // gpio4 and gpio5 are reset in at91bootstrap. They should not be touched in Linux.
                       atmel,pins =
-                          <AT91_PIOD 14 AT91_PERIPH_GPIO (AT91_PINCTRL_OUTPUT|AT91_PINCTRL_OUTPUT_VAL(1))    /* PD14 WiFi BT reset */
-                          AT91_PIOD 16 AT91_PERIPH_GPIO (AT91_PINCTRL_OUTPUT|AT91_PINCTRL_OUTPUT_VAL(1))     /* PD16 Secure reset or gpio4 reset */
-                          AT91_PIOD 17 AT91_PERIPH_GPIO (AT91_PINCTRL_OUTPUT|AT91_PINCTRL_OUTPUT_VAL(1))     /* PD17 MTQ reset */
-                          AT91_PIOD 18 AT91_PERIPH_GPIO (AT91_PINCTRL_OUTPUT|AT91_PINCTRL_OUTPUT_VAL(1))>;   /* PD18 USB Hub reset */
+                           <AT91_PIOD 17 AT91_PERIPH_GPIO (AT91_PINCTRL_OUTPUT|AT91_PINCTRL_OUTPUT_VAL(1))     /* PD17 MTQ reset */
+                            AT91_PIOD 20 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;   /* PD20 WiFi_BT_LPMode Output */
                       output-high; // ignored by at91_pinctrl
 		    };
 		    pinctrl_mts_io_in: mts_io-1 {
                       atmel,pins =
-                          <AT91_PIOD 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP   /* PD19 GNSS Int */
-                          AT91_PIOD 20 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;   /* PD20 WiFi_BT_LPMode Input */
+                          <AT91_PIOD 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;   /* PD19 GNSS Int */
 		    };
 		    // GNSS kept in reset to prevent EXAR from hanging
 		    pinctrl_mts_io_gnss: mts_io-2 {
                       atmel,pins =
 			<AT91_PIOC 4 AT91_PERIPH_GPIO (AT91_PINCTRL_OUTPUT|AT91_PINCTRL_OUTPUT_VAL(0))     /* PC16 ETH_NRST */
-                        AT91_PIOD 15 AT91_PERIPH_GPIO (AT91_PINCTRL_OUTPUT|AT91_PINCTRL_OUTPUT_VAL(0))>;   /* PD15 N_GNSS_RESET */
+                         AT91_PIOD 14 AT91_PERIPH_GPIO (AT91_PINCTRL_OUTPUT|AT91_PINCTRL_OUTPUT_VAL(0))    /* PD14 WiFi BT reset */
+                         AT91_PIOD 15 AT91_PERIPH_GPIO (AT91_PINCTRL_OUTPUT|AT91_PINCTRL_OUTPUT_VAL(0))  /* PD15 N_GNSS_RESET */
+                         AT91_PIOD 18 AT91_PERIPH_GPIO (AT91_PINCTRL_OUTPUT|AT91_PINCTRL_OUTPUT_VAL(0))>;   /* PD18 USB Hub reset */
                       output-low; // ignored by at91_pinctrl
 		    };
                };
diff --git a/recipes-kernel/linux/linux-at91_4.9.87.bb b/recipes-kernel/linux/linux-at91_4.9.87.bb
index 7fc0e5d..67e72ed 100644
--- a/recipes-kernel/linux/linux-at91_4.9.87.bb
+++ b/recipes-kernel/linux/linux-at91_4.9.87.bb
@@ -19,7 +19,7 @@ RDEPENDS_kernel-modules_remove = "kernel-module-softdog"
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 KERNEL_EXTRA_ARGS ="LOADADDR=0x20008000"
 
-PR = "r15"
+PR = "r16"
 PKGR_kernel-module-i2c-at91 = "${PR}a${EXTENDPRAUTO}"
 PKGR_kernel-module-atmel-mci = "${PR}a${EXTENDPRAUTO}"
 KERNEL_VERSION = "${PV}"
-- 
cgit v1.2.3