Skip to contentSkip to conversation

Patch "pinctrl: intel: merrifield: Correct UART pin lists" has been added to the 4.12-stable tree

PATCH [email protected] 1 participant 1 message Aug 14, 2017

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

pinctrl: intel: merrifield: Correct UART pin lists

to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
pinctrl-intel-merrifield-correct-uart-pin-lists.patch
and it can be found in the queue-4.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 5d996132d921c391af5f267123eca1a6a3148ecd Mon Sep 17 00:00:00 2001

From: Andy Shevchenko <[email protected]>
Date: Fri, 4 Aug 2017 19:26:34 +0300
Subject: pinctrl: intel: merrifield: Correct UART pin lists

From: Andy Shevchenko <[email protected]>

commit 5d996132d921c391af5f267123eca1a6a3148ecd upstream.

UART pin lists consist GPIO numbers which is simply wrong. Replace it by pin numbers.

Fixes 4e80c8f50574 ("pinctrl: intel: Add Intel Merrifield pin controller support")
---
 drivers/pinctrl/intel/pinctrl-merrifield.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pinctrl/intel/pinctrl-merrifield.c +3 -3
@@ -343,9 +343,9 @@ static const struct pinctrl_pin_desc mrf
 
 static const unsigned int mrfld_sdio_pins[] = { 50, 51, 52, 53, 54, 55, 56 };
 static const unsigned int mrfld_spi5_pins[] = { 90, 91, 92, 93, 94, 95, 96 };
-static const unsigned int mrfld_uart0_pins[] = { 124, 125, 126, 127 };
-static const unsigned int mrfld_uart1_pins[] = { 128, 129, 130, 131 };
-static const unsigned int mrfld_uart2_pins[] = { 132, 133, 134, 135 };
+static const unsigned int mrfld_uart0_pins[] = { 115, 116, 117, 118 };
+static const unsigned int mrfld_uart1_pins[] = { 119, 120, 121, 122 };
+static const unsigned int mrfld_uart2_pins[] = { 123, 124, 125, 126 };
 static const unsigned int mrfld_pwm0_pins[] = { 144 };
 static const unsigned int mrfld_pwm1_pins[] = { 145 };
 static const unsigned int mrfld_pwm2_pins[] = { 132 };

Patches currently in stable-queue which might be from [email protected] are

queue-4.12/pinctrl-cherryview-add-setzer-models-to-the-chromebook-dmi-quirk.patch queue-4.12/i2c-designware-some-broken-dstds-use-1mihz-instead-of-1mhz.patch queue-4.12/pinctrl-intel-merrifield-correct-uart-pin-lists.patch