Skip to contentSkip to conversation

Patch "gpio: pxa: fix legacy non pinctrl aware builds" has been added to the 4.5-stable tree

PATCH [email protected] 1 participant 1 message Apr 17, 2016

Subsystems (3)
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

gpio: pxa: fix legacy non pinctrl aware builds

to the 4.5-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:
gpio-pxa-fix-legacy-non-pinctrl-aware-builds.patch
and it can be found in the queue-4.5 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 c4e5ffb6f224c1a4a9eaad82b19645ec22d1b24f Mon Sep 17 00:00:00 2001

From: Robert Jarzmik <[email protected]>
Date: Tue, 29 Mar 2016 10:04:00 +0200
Subject: gpio: pxa: fix legacy non pinctrl aware builds

From: Robert Jarzmik <[email protected]>

commit c4e5ffb6f224c1a4a9eaad82b19645ec22d1b24f upstream.

In legacy pxa builds, ie. non device-tree and platform-data only builds, pinctrl is not yet available. As a consequence, the pinctrl gpio direction change function is a stub, returning always success.

In the current state, the gpio driver direction function believes the pinctrl direction change was successful, and exits without actually changing the gpio direction.

This patch changes the logic :
- if the pinctrl direction function fails, gpio direction will report that failure
- if the pinctrl direction function succeeds, gpio direction is changed by the gpio driver anyway.
This is sub optimal in the pinctrl aware case, as the gpio direction will be changed twice: once by pinctrl function and another time by the gpio direction function.

Yet it should be acceptable in this form, as this is functional for all pxa platforms (device-tree and platform-data), and moreover changing a gpio direction is very very seldom, usually in machine initialization, seldom in drivers probe, and an exception for ac97 reset bug.

Fixes a770d946371e ("gpio: pxa: add pin control gpio direction and request")
---
 drivers/gpio/gpio-pxa.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpio/gpio-pxa.c +2 -2
@@ -283,8 +283,8 @@ static int pxa_gpio_direction_output(str
 	writel_relaxed(mask, base + (value ? GPSR_OFFSET : GPCR_OFFSET));
 
 	ret = pinctrl_gpio_direction_output(chip->base + offset);
-	if (!ret)
-		return 0;
+	if (ret)
+		return ret;
 
 	spin_lock_irqsave(&gpio_lock, flags);
 

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

queue-4.5/gpio-pxa-fix-legacy-non-pinctrl-aware-builds.patch