Skip to contentSkip to conversation

Patch "pinctrl: mvebu: armada-xp: fix functions of MPP48" has been added to the 3.10-stable tree

PATCH [email protected] 1 participant 1 message Jul 26, 2015

Subsystems (4)
Stable branch Device tree bindings Pin control Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support
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: mvebu: armada-xp: fix functions of MPP48

to the 3.10-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-mvebu-armada-xp-fix-functions-of-mpp48.patch
and it can be found in the queue-3.10 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 ea78b9511a54d0de026e04b5da86b30515072f31 Mon Sep 17 00:00:00 2001

From: Thomas Petazzoni <[email protected]>
Date: Tue, 9 Jun 2015 18:46:58 +0200
Subject: pinctrl: mvebu: armada-xp: fix functions of MPP48

From: Thomas Petazzoni <[email protected]>

commit ea78b9511a54d0de026e04b5da86b30515072f31 upstream.

There was a mistake in the definition of the functions for MPP48 on Marvell Armada XP. The second function is dev(clkout), and not tclk.

Signed-off-by Thomas Petazzoni <[email protected]>
Fixes 463e270f766a ("pinctrl: mvebu: add pinctrl driver for Armada XP")
Signed-off-by Linus Walleij <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt |    2 +-
 drivers/pinctrl/mvebu/pinctrl-armada-xp.c                               |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt +1 -1
@@ -68,7 +68,7 @@ mpp45         45       gpio, uart2(rts),
 mpp46         46       gpio, uart3(rts), uart1(rts), spi(cs6), sata0(prsnt)
 mpp47         47       gpio, uart3(cts), uart1(cts), spi(cs7), pcie(clkreq3),
                        ref(clkout)
-mpp48         48       gpio, tclk, dev(burst/last)
+mpp48         48       gpio, dev(clkout), dev(burst/last)
 
 * Marvell Armada XP (mv78260 and mv78460 only)
drivers/pinctrl/mvebu/pinctrl-armada-xp.c +1 -1
@@ -274,7 +274,7 @@ static struct mvebu_mpp_mode armada_xp_m
 		 MPP_VAR_FUNCTION(0x5, "pcie", "clkreq3",   V_MV78230_PLUS)),
 	MPP_MODE(48,
 		 MPP_VAR_FUNCTION(0x0, "gpio", NULL,        V_MV78230_PLUS),
-		 MPP_VAR_FUNCTION(0x1, "tclk", NULL,        V_MV78230_PLUS),
+		 MPP_VAR_FUNCTION(0x1, "dev", "clkout",     V_MV78230_PLUS),
 		 MPP_VAR_FUNCTION(0x2, "dev", "burst/last", V_MV78230_PLUS)),
 	MPP_MODE(49,
 		 MPP_VAR_FUNCTION(0x0, "gpio", NULL,        V_MV78260_PLUS),

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

queue-3.10/pinctrl-mvebu-armada-xp-fix-functions-of-mpp48.patch queue-3.10/pinctrl-mvebu-armada-xp-remove-non-existing-nand-pins.patch queue-3.10/pinctrl-mvebu-armada-xp-remove-non-existing-vdd-cpu_pd-functions.patch queue-3.10/pinctrl-mvebu-armada-370-fix-spi0-pin-description.patch